Update zsh and zsh plugins

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "zsh/custom/plugins/zsh-completions"]
 	path = zsh/custom/plugins/zsh-completions
 	url = https://github.com/zsh-users/zsh-completions.git
+[submodule "zsh/custom/plugins/zsh-vi-mode"]
+	path = zsh/custom/plugins/zsh-vi-mode
+	url = https://github.com/jeffreytse/zsh-vi-mode

zsh/.stow-local-ignore

@@ -1,2 +1,3 @@
 ohmyzsh
 custom
+fzf-git.sh

zsh/dot-zshrc

@@ -15,17 +15,19 @@ zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 # ENABLE_CORRECTION="true"
 COMPLETION_WAITING_DOTS="true"
 ZSH_DISABLE_COMPFIX="true"
+ZOXIDE_CMD_OVERRIDE="cd"
 
 plugins=(
 	git
 	zsh-autosuggestions
 	# Disabled because the highlighting conflicts with autosuggestions
 	# history-substring-search
-	vi-mode
+	zsh-vi-mode
 	colored-man-pages
 	command-not-found
 	zsh-autopair
 	fast-syntax-highlighting
+	zoxide
 )
 
 bindkey -M vicmd "k" up-line-or-beginning-search
@@ -37,8 +39,21 @@ HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT=3
 
 ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
-VI_MODE_RESET_PROMPT_ON_MODE_CHANGE=true
-VI_MODE_SET_CURSOR=true
+# Enable system clipboard
+ZVM_SYSTEM_CLIPBOARD_ENABLED=true
+# Make p and P use the system clipboard, instead of CUTBUFFER,
+# without this you need gp and gP
+function zvm_after_lazy_keybindings() {
+  bindkey -M vicmd 'p' zvm_paste_clipboard_after
+  bindkey -M vicmd 'P' zvm_paste_clipboard_before
+  bindkey -M visual 'p' zvm_visual_paste_clipboard
+  bindkey -M visual 'P' zvm_visual_paste_clipboard
+}
+
+# Fix autopair and zsh-vi-mode compatibility
+AUTOPAIR_INHIBIT_INIT=1
+zvm_after_init_commands+=('autopair-init')
+
 # Might cause issues?
 KEYTIMEOUT=1
 
@@ -111,9 +126,8 @@ if (( $+commands[fd] )); then
 	export FZF_DEFAULT_COMMAND="fd --type f --strip-cwd-prefix"
 	export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 fi
-if (( $+commands[fzf] )); then
-	source <(fzf --zsh)
 
+if (( $+commands[fzf] )); then
 	if (( $+commands[paru] )); then
 		function pi {
 			paru -Slq | fzf -q "$1" --border-label=" Install package " --multi --preview 'paru -Si {1} --color=always' | xargs -ro paru -S
@@ -121,25 +135,6 @@ if (( $+commands[fzf] )); then
 	fi
 fi
 
-export _ZO_FZF_OPTS="--tmux"
-if (( $+commands[zoxide] )); then
-	eval "$(zoxide init zsh --cmd cd)"
-fi
-
-# Generate missing text objects
-autoload -Uz select-bracketed select-quoted
-zle -N select-quoted
-zle -N select-bracketed
-for km in viopp visual; do
-  bindkey -M $km -- '-' vi-up-line-or-history
-  for c in {a,i}${(s..)^:-\'\"\`\|,./:;=+@}; do
-    bindkey -M $km $c select-quoted
-  done
-  for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do
-    bindkey -M $km $c select-bracketed
-  done
-done
-
 ZSH_TMUX_AUTOSTART=true
 if (( $+commands[tmux] )); then
 	if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" && -z "$INTELLIJ_ENVIRONMENT_READER" && -z "$ZED_TERM" ]]; then