From 8fb9150d01263671f5c4105164e27da97f0b6858 Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sun, 17 Jan 2021 20:15:52 +0000
Subject: [PATCH] Fix zsh plugins

---
 .config/zsh/.zshrc | 29 +++++++++++++++++++++++++----
 install.sh         | 12 +++++++++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 278f549..c7d12da 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -3,11 +3,13 @@ setopt autocd
 setopt nobgnice # Run bg jobs at normal priority
 setopt nonotify # Don't notify when bg jobs complete
 setopt nobeep
+setopt interactive_comments
+stty stop undef
 
 # History config
 HISTFILE="${XDG_CACHE_HOME:-${HOME}/.cache}/zsh/history"
-HISTSIZE=10000
-SAVEHIST=10000
+HISTSIZE=10000000
+SAVEHIST=10000000
 [[ !( -f "${HISTFILE}" ) ]] && mkdir -p $(dirname ${HISTFILE})
 setopt HIST_IGNORE_DUPS
 
@@ -24,14 +26,33 @@ autoload -U colors && colors
 # Prompt
 PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
 
+bindkey -v
+export KEYTIMEOUT=1
+
 # Aliases
 source "${XDG_CONFIG_HOME:-${HOME}/.config}/.aliasrc"
 
 # Autosuggest
 source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null
 
+# History substring search
+source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh 2>/dev/null
+bindkey -M vicmd 'k' history-substring-search-up
+bindkey -M vicmd 'j' history-substring-search-down
+
 # Highlighting
 source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null
 
-# History substring search
-source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh 2>/dev/null
+# Enhanced vim mode
+MODE_INDICATOR=""
+MODE_CURSOR_VIINS="#b77ee0 blinking bar"
+MODE_CURSOR_REPLACE="$MODE_CURSOR_VIINS #ff3334"
+MODE_CURSOR_VICMD="#b77ee0 block"
+MODE_CURSOR_SEARCH="#e7c547 steady underline"
+MODE_CURSOR_VISUAL="$MODE_CURSOR_VICMD steady bar"
+MODE_CURSOR_VLINE="$MODE_CURSOR_VISUAL #54ced6"
+source /usr/share/zsh/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh 2>/dev/null
+
+# Generic keybindings
+bindkey -s '^f' 'cd "$(dirname "$(fzf)")"\n'
+
diff --git a/install.sh b/install.sh
index 4de8c06..a6cdfd1 100755
--- a/install.sh
+++ b/install.sh
@@ -23,4 +23,14 @@ sudo pacman -Sy \
   ttf-ubuntu-font-family \
   youtube-dl \
   zathura \
-  zsh
+  zsh \
+  zsh-autosuggestions \
+  zsh-history-substring-search
+
+[ -d "/usr/share/zsh/plugins/fast-syntax-highlighting" ] || sudo git clone \
+  https://github.com/zdharma/fast-syntax-highlighting \
+  /usr/share/zsh/plugins/fast-syntax-highlighting
+
+[ -d "/usr/share/zsh/plugins/zsh-vim-mode" ] || sudo git clone \
+  https://github.com/softmoth/zsh-vim-mode \
+  /usr/share/zsh/plugins/zsh-vim-mode