fix: zsh fzf integration

teddywaweru · Jun 9, 2024 · 442bd8d · 442bd8d
1 parent 5a8654e
commit 442bd8d
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -12,29 +12,34 @@ fi
 ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
 [ ! -d $ZINIT_HOME ] && mkdir -p "$(dirname $ZINIT_HOME)"
 [ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
+
 source "${ZINIT_HOME}/zinit.zsh"
 
 if [[ -e $HOME/.config/zsh/zshconfig ]]; then
   source $HOME/.config/zsh/zshconfig
 fi
 
+# TODO Separate file for plugin configuration
 zinit ice depth=1; zinit light romkatv/powerlevel10k
 zinit light zsh-users/zsh-syntax-highlighting
 zinit light zsh-users/zsh-completions
 zinit light zsh-users/zsh-autosuggestions
-zinit light zsh-users/zsh-history-substring-search
 zinit light Aloxaf/fzf-tab
 zinit ice depth=1; zinit light jeffreytse/zsh-vi-mode
+function zvm_after_init() {
+	# Shell Integrations for fzf, which conflict with vi-mode keybindings
+	# TODO Looks very misplaced here.... May be better to have as blanket implementation
+	# of tasks to run after all plugins have been loaded?
+	source <(fzf --zsh)
+}
+zvm_after_init_commands+=( zvm_after_init )
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 # source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
 # source $HOME/.config/zsh/p10k/powerlevel10k.zsh-theme
 # [[ ! -f $HOME/.config/zsh/p10k/.p10k.zsh ]] || source $HOME/.config/zsh/p10k/.p10k.zsh
 
-# Shell Integrations
-eval "$(fzf --zsh)"
-
-
-
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+