Shell aliases go to bash too

just in case something really wants to run bash (kubie?)
This commit is contained in:
Griffin Smith 2020-05-04 13:14:27 -04:00
parent a7e9637171
commit 73e59d225a

View file

@ -1,22 +1,5 @@
{ config, lib, pkgs, ... }:
{
home.packages = with pkgs; [
zsh
autojump
];
home.sessionVariables = {
EDITOR = "vim";
LS_COLORS = "no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:";
TWITTER_WHOAMI = "glittershark1";
BROWSER = "firefox";
};
programs.zsh = {
enable = true;
enableAutosuggestions = true;
autocd = true;
let
shellAliases = rec {
# NixOS stuff
hms = "home-manager switch";
@ -33,21 +16,6 @@
nb = "nix build -f .";
"nc." = "nix copy -f . --to https://nix.urbinternal.com";
# Kubernetes
"kc" = "kubectl";
"kg" = "kc get";
"kga" = "kc get --all-namespaces";
"kpd" = "kubectl get pods";
"kpa" = "kubectl get pods --all-namespaces";
"klf" = "kubectl logs -f";
"kdep" = "kubectl get deployments";
"ked" = "kubectl edit deployment";
"kpw" = "kubectl get pods -w";
"kew" = "kubectl get events -w";
"kdel" = "kubectl delete";
"knw" = "kubectl get nodes -w";
"arsy" = "argocd app sync --prune";
# Docker and friends
"dcu" = "docker-compose up";
"dcud" = "docker-compose up -d";
@ -100,7 +68,9 @@
"gnp" = "git --no-pager";
"g" = "git";
"git" = "hub";
"grim" = " git fetch && git rebase -i origin/master";
"grim" = "git fetch && git rebase -i origin/master";
"grc" = "git rebase --continue";
"gcan" = "git commit --amend --no-edit";
# Aliases from old config
stck = "dirs -v";
@ -117,18 +87,11 @@
"asdf" = "asdfghjkl";
"asdfghjkl" = "echo \"Having some trouble?\"";
"ift" = "sudo iftop -i wlp3s0";
"rvpn" = "sudo systemctl restart openvpn@bldr-dev openvpn@lsvl-dev";
"gne" = "gn edit";
"gnf" = "gn find";
"gnt" = "gn tag-list";
"gnn" = "gn notebook-list";
"mytl" = "t tl $TWITTER_WHOAMI";
"first" = "awk '{print \$$1}'";
"cmt" = "git log --oneline | fzf-tmux | awk '{print \$$1}'";
"workmon" = "xrandr --output DP-2 --pos 1440x900 --primary";
"vi" = "vim";
"awa" = "ssh aw2-admin.nomi.host";
"dtf" = "cd ~/.dotfiles";
"adbdev" = "adb devices";
"adbcon" = "adb connect $GNEX_IP";
"mpalb" = "mpc search album";
@ -143,6 +106,30 @@
"ll" = "ls -al";
"la" = "ls -a";
};
in {
home.packages = with pkgs; [
zsh
autojump
];
home.sessionVariables = {
EDITOR = "vim";
LS_COLORS = "no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:";
TWITTER_WHOAMI = "glittershark1";
BROWSER = "firefox";
};
programs.bash = {
enable = true;
inherit shellAliases;
};
programs.zsh = {
enable = true;
enableAutosuggestions = true;
autocd = true;
inherit shellAliases;
oh-my-zsh = {
enable = true;
@ -209,6 +196,7 @@
sha256 = "0l41ac5b7p8yyjvpfp438kw7zl9dblrpd7icjg1v3ig3xy87zv0n";
}}/nix-shell.plugin.zsh
export RPS1=""
autoload -U promptinit; promptinit
prompt pure