diff options
| -rw-r--r-- | user/settings/satoshipay.nix | 24 | ||||
| -rw-r--r-- | user/settings/zsh.nix | 12 |
2 files changed, 20 insertions, 16 deletions
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix index e5631e79..371e4fc2 100644 --- a/user/settings/satoshipay.nix +++ b/user/settings/satoshipay.nix @@ -41,10 +41,6 @@ in robo3t ])); - programs.zsh.shellAliases = { - "klot" = "kubetail"; - }; - programs.git.includes = [ { condition = "gitdir:~/projects/github.com/satoshipay/"; @@ -56,6 +52,26 @@ in } ]; + programs.zsh = { + plugins = [ + { + name = "kubectl-aliases"; + src = pkgs.fetchFromGitHub { + owner = "alanpearce"; + repo = "kubectl-aliases"; + rev = "cec7c637e0cd17e17b8b036ad5108cd650fac4c8"; + # date = 2019-11-15T14:35:38+01:00; + sha256 = "1l4cwdypxwz0qlwab14in6d6zi81sqmbhj7ninsngpvhx4ldy313"; + }; + } + ]; + shellAliases = { + kns = "kubens"; + kx = "kubectx"; + klot = "kubetail"; + }; + }; + accounts.email.accounts.satoshipay = let address = "alan@satoshipay.io"; in diff --git a/user/settings/zsh.nix b/user/settings/zsh.nix index ed1b75e9..175fd956 100644 --- a/user/settings/zsh.nix +++ b/user/settings/zsh.nix @@ -47,16 +47,6 @@ in plugins = [ { - name = "kubectl-aliases"; - src = pkgs.fetchFromGitHub { - owner = "alanpearce"; - repo = "kubectl-aliases"; - rev = "cec7c637e0cd17e17b8b036ad5108cd650fac4c8"; - # date = 2019-11-15T14:35:38+01:00; - sha256 = "1l4cwdypxwz0qlwab14in6d6zi81sqmbhj7ninsngpvhx4ldy313"; - }; - } - { name = "cd-gitroot"; src = pkgs.fetchFromGitHub { owner = "mollifier"; @@ -163,8 +153,6 @@ in cdg = "cd-gitroot"; https = "http --default-scheme https"; - kns = "kubens"; - kx = "kubectx"; history = "fc -l $(( $LINES - 2 ))"; hist-freq-lines = "fc -l -10000 | cut -d' ' -f4- | sort | uniq -c | sort -g | tail -n100 | less"; |