summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--user/settings/satoshipay.nix7
-rw-r--r--user/zsh/zshrc35
2 files changed, 19 insertions, 23 deletions
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix
index 1645df29..a5910a84 100644
--- a/user/settings/satoshipay.nix
+++ b/user/settings/satoshipay.nix
@@ -69,6 +69,13 @@ in
       kx = "kubectx";
       klot = "kubetail";
     };
+    initExtra = ''
+      if [[ -n $commands[helm] ]]
+      then
+        autoload _helm
+        compdef _helm helm
+      fi
+    '';
   };
 
   accounts.email.accounts.satoshipay = let
diff --git a/user/zsh/zshrc b/user/zsh/zshrc
index 3ec35c65..771e96db 100644
--- a/user/zsh/zshrc
+++ b/user/zsh/zshrc
@@ -67,14 +67,6 @@ bindkey '\e ' hist-complete
 zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|=*' 'l:|=* r:|=*'
 zstyle ':completion:*' completer _expand _complete _match
 
-# Plugins
-
-if [[ -n $commands[helm] ]]
-then
-  autoload _helm
-  compdef _helm helm
-fi
-
 # General configuration
 
 if [[ $TERM == "dumb" ]]
@@ -116,23 +108,20 @@ else
   AGKOZAK_CUSTOM_RPROMPT='${prompt_context}%(3V.%F{${AGKOZAK_COLORS_BRANCH_STATUS}%3v%f.)'
 fi
 
-if [[ -n $commands[fzf] ]]
-then
-  export FZF_CTRL_T_COMMAND='
-    (git ls-tree -r --name-only HEAD ||
-	       fd --hidden --follow --exclude ".git" . |
-	             sed s/^..//) 2> /dev/null'
-  export FZF_ALT_C_COMMAND='fd --type d --hidden --follow --exclude ".git" .'
-  export FZF_DEFAULT_COMMAND=$FZF_CTRL_T_COMMAND
+export FZF_CTRL_T_COMMAND='
+  (git ls-tree -r --name-only HEAD ||
+        fd --hidden --follow --exclude ".git" . |
+              sed s/^..//) 2> /dev/null'
+export FZF_ALT_C_COMMAND='fd --type d --hidden --follow --exclude ".git" .'
+export FZF_DEFAULT_COMMAND=$FZF_CTRL_T_COMMAND
 
-  bindkey '^t' transpose-chars
-  bindkey '^x^f' fzf-file-widget
+bindkey '^t' transpose-chars
+bindkey '^x^f' fzf-file-widget
 
-  zstyle ":anyframe:selector:fzf:" command "fzf --height 40%"
+zstyle ":anyframe:selector:fzf:" command "fzf --height 40%"
 
-  bindkey '\es' anyframe-widget-cd-ghq-repository
-  bindkey '\ej' anyframe-widget-cd-ghq-repository
-  bindkey '^x^k' anyframe-widget-kill
-fi
+bindkey '\es' anyframe-widget-cd-ghq-repository
+bindkey '\ej' anyframe-widget-cd-ghq-repository
+bindkey '^x^k' anyframe-widget-kill
 
 unsetopt flow_control       # Let me use ^S and ^Q