From 7e8b544cd3e75ad087a45d0cfbccb86b791fa6fa Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Thu, 3 Sep 2020 11:09:53 +0200
Subject: [PATCH] Add vim mode plugin

---
 dotfiles/zsh/zshrc | 95 ++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 66 deletions(-)

diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc
index 087aa91..58ae9d0 100644
--- a/dotfiles/zsh/zshrc
+++ b/dotfiles/zsh/zshrc
@@ -6,67 +6,29 @@
 
 
 # On Arch Linux, source pkgfile "command not found" hook
-if [ -e /usr/share/doc/pkgfile/command-not-found.zsh ]; then
-    source /usr/share/doc/pkgfile/command-not-found.zsh
-fi
+[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
+
+
+# HISTORY SEARCH
+HISTSIZE=10000
+SAVEHIST=10000
+HISTFILE=~/.zhistory
+# Make history search only start with what is typed
+autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search
+bindkey -M vicmd "k" up-line-or-beginning-search
+bindkey -M vicmd "j" down-line-or-beginning-search
 
 
 # COMPLETION
 autoload -Uz compinit
-compinit
 zstyle ':completion:*' menu select
+zmodload zsh/complist
+compinit
 setopt COMPLETE_ALIASES
 
-
-# KEY BINDINGS
-# create a zkbd compatible hash;
-# to add other keys to this hash, see: man 5 terminfo
-typeset -g -A key
-
-key[Home]="${terminfo[khome]}"
-key[End]="${terminfo[kend]}"
-key[Insert]="${terminfo[kich1]}"
-key[Backspace]="${terminfo[kbs]}"
-key[Delete]="${terminfo[kdch1]}"
-key[Up]="${terminfo[kcuu1]}"
-key[Down]="${terminfo[kcud1]}"
-key[Left]="${terminfo[kcub1]}"
-key[Right]="${terminfo[kcuf1]}"
-key[PageUp]="${terminfo[kpp]}"
-key[PageDown]="${terminfo[knp]}"
-key[Shift-Tab]="${terminfo[kcbt]}"
-
-# setup key accordingly
-[[ -n "${key[Home]}"      ]] && bindkey -- "${key[Home]}"      beginning-of-line
-[[ -n "${key[End]}"       ]] && bindkey -- "${key[End]}"       end-of-line
-[[ -n "${key[Insert]}"    ]] && bindkey -- "${key[Insert]}"    overwrite-mode
-[[ -n "${key[Backspace]}" ]] && bindkey -- "${key[Backspace]}" backward-delete-char
-[[ -n "${key[Delete]}"    ]] && bindkey -- "${key[Delete]}"    delete-char
-[[ -n "${key[Up]}"        ]] && bindkey -- "${key[Up]}"        up-line-or-history
-[[ -n "${key[Down]}"      ]] && bindkey -- "${key[Down]}"      down-line-or-history
-[[ -n "${key[Left]}"      ]] && bindkey -- "${key[Left]}"      backward-char
-[[ -n "${key[Right]}"     ]] && bindkey -- "${key[Right]}"     forward-char
-[[ -n "${key[PageUp]}"    ]] && bindkey -- "${key[PageUp]}"    beginning-of-buffer-or-history
-[[ -n "${key[PageDown]}"  ]] && bindkey -- "${key[PageDown]}"  end-of-buffer-or-history
-[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}" reverse-menu-complete
-
-# Finally, make sure the terminal is in application mode, when zle is
-# active. Only then are the values from $terminfo valid.
-if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
-	autoload -Uz add-zle-hook-widget
-	function zle_application_mode_start { echoti smkx }
-	function zle_application_mode_stop { echoti rmkx }
-	add-zle-hook-widget -Uz zle-line-init zle_application_mode_start
-	add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop
-fi
-
-
-# VI MODE
-bindkey -v
-# Match ESC to ~/.vimrc
-bindkey -M viins "jk" "${key[Esc]}"
-# Switch mode faster
-export KEYTIMEOUT=1
+# Use vim keys in tab complete menu
 bindkey -M menuselect 'h' vi-backward-char
 bindkey -M menuselect 'j' vi-down-line-or-history
 bindkey -M menuselect 'k' vi-up-line-or-history
@@ -74,18 +36,19 @@ bindkey -M menuselect 'l' vi-forward-char
 bindkey -v '^?' backward-delete-char
 
 
-# HISTORY SEARCH
-HISTSIZE=10000
-SAVEHIST=10000
-HISTFILE=~/.zhistory
-autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-[[ -n "${key[Up]}"   ]] && bindkey -- "${key[Up]}"   up-line-or-beginning-search
-[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search
-# and for jk
-bindkey -M vicmd "k" up-line-or-beginning-search
-bindkey -M vicmd "j" down-line-or-beginning-search
+
+
+# VI MODE
+# Use 'jk' instead of Escape to switch to NORMAL mode:
+VIM_MODE_VICMD_KEY='jk'
+# Mode-sensitive cursor styling:
+MODE_CURSOR_VIINS="#cccccc blinking bar"
+MODE_CURSOR_VICMD="#cccccc block"
+MODE_CURSOR_REPLACE="#cccccc steady underline"
+MODE_CURSOR_VISUAL="$MODE_CURSOR_VICMD steady bar"
+MODE_CURSOR_VLINE="$MODE_CURSOR_VISUAL #00ffff"
+# Finally load the vim plugin:
+source "$HOME/github_dotfiles/zsh-vim-mode/zsh-vim-mode.plugin.zsh"
 
 
 # HELP COMMAND