diff --git a/.gitmodules b/.gitmodules
index 772d8f2..48221da 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,15 +4,18 @@
 [submodule ".config/nvim"]
 	path = .config/nvim
 	url = git@github.com:DustVoice/nvim.git
-[submodule ".zsh/plugins/zsh-vim-mode"]
-	path = .zsh/plugins/zsh-vim-mode
-	url = https://github.com/softmoth/zsh-vim-mode
-[submodule ".zsh/plugins/zsh-autosuggestions"]
-	path = .zsh/plugins/zsh-autosuggestions
-	url = https://github.com/zsh-users/zsh-autosuggestions
-[submodule ".zsh/plugins/zsh-syntax-highlighting"]
-	path = .zsh/plugins/zsh-syntax-highlighting
-	url = https://github.com/zsh-users/zsh-syntax-highlighting
 [submodule ".oh-my-zsh"]
 	path = .oh-my-zsh
 	url = https://github.com/ohmyzsh/ohmyzsh.git
+[submodule ".zsh/plugins/zsh-vim-mode"]
+	path = .zsh/plugins/zsh-vim-mode
+	url = https://github.com/softmoth/zsh-vim-mode.git
+[submodule ".zsh/plugins/zsh-autosuggestions"]
+	path = .zsh/plugins/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions.git
+[submodule ".zsh/plugins/zsh-syntax-highlighting"]
+	path = .zsh/plugins/zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule ".zsh/plugins/zsh-completions"]
+	path = .zsh/plugins/zsh-completions
+	url = https://github.com/zsh-users/zsh-completions
diff --git a/.zsh/plugins/zsh-completions b/.zsh/plugins/zsh-completions
new file mode 160000
index 0000000..a6e641b
--- /dev/null
+++ b/.zsh/plugins/zsh-completions
@@ -0,0 +1 @@
+Subproject commit a6e641b977373740e9744182e6fad9af9ff39bc5
diff --git a/.zshrc b/.zshrc
index e2362a5..0e46fa2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -84,16 +84,13 @@ MODE_CURSOR_VISUAL="magenta steady block"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 # plugins=(git)
-plugins=(colored-man-pages colorize command-not-found git zsh-autosuggestions zsh-syntax-highlighting history-substring-search zsh-vim-mode)
+plugins=(colored-man-pages colorize command-not-found git zsh-completions zsh-autosuggestions zsh-syntax-highlighting history-substring-search zsh-vim-mode)
+
+autoload -U compinit && compinit
 
 source $ZSH/oh-my-zsh.sh
 
-bindkey -M vicmd 'K' history-substring-search-up
-bindkey -M vicmd 'J' history-substring-search-down
-
-bindkey -M vicmd 'L' autosuggest-accept
-bindkey -M vicmd 'H' autosuggest-clear
-bindkey -M vicmd '$' autosuggest-accept
-bindkey -M vicmd '0' autosuggest-clear
+bindkey -M vicmd '^K' history-substring-search-up
+bindkey -M vicmd '^J' history-substring-search-down
 
 gpg-connect-agent updatestartuptty /bye