diff --git a/.gitmodules b/.gitmodules
index 9b9646d..4272994 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule "zsh/modules/wd"]
 	path = zsh/modules/wd
 	url = https://github.com/mfaerevaag/wd.git
-[submodule "zsh/modules/zsh-vi-mode"]
-	path = zsh/modules/zsh-vi-mode
-	url = https://github.com/jeffreytse/zsh-vi-mode.git
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a1e7636..63981b6 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,17 +1,5 @@
 # key mode
-bindkey -v
-bindkey '^?' backward-delete-char
-bindkey "^A" vi-beginning-of-line
-bindkey "^E" vi-end-of-line
-bindkey "^P" up-line-or-history
-bindkey "^N" down-line-or-history
-bindkey "^K" forward-char
-bindkey "^U" kill-whole-line
-bindkey -r "^[[A"
-bindkey -r "^[[B"
-bindkey -r "^[[D"
-bindkey -r "^[[C"
-mkdir -p $XDG_DATA_HOME/zsh
+bindkey -e
 
 # global exports and options
 setopt share_history
@@ -21,6 +9,7 @@ export SAVEHIST=$HISTSIZE
 export HISTFILE=$XDG_DATA_HOME/zsh/history
 export LESSHISTFILE='/dev/null'
 
+mkdir -p $XDG_DATA_HOME/zsh
 autoload -U compinit && compinit -d $XDG_DATA_HOME/zsh/zcompdump
 zstyle ':completion:*' menu select
 zstyle ':completion:*' list-colors ''
@@ -29,13 +18,12 @@ zstyle ':completion:*' list-colors ''
 source $ZDOTDIR/aliases.zsh
 
 # plugins & addons
+[ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ] && source $ZDOTDIR/fzf.zsh
 source $ZDOTDIR/modules/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-source $ZDOTDIR/modules/zsh-vi-mode/zsh-vi-mode.plugin.zsh
 export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
 wd () {
   . $ZDOTDIR/modules/wd/wd.sh
 }
-zvm_after_init_commands+=('[ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ] && source $ZDOTDIR/fzf.zsh')
 
 # theme
 source $ZDOTDIR/p10k.zsh
diff --git a/zsh/modules/zsh-vi-mode b/zsh/modules/zsh-vi-mode
deleted file mode 160000
index 196bf1b..0000000
--- a/zsh/modules/zsh-vi-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 196bf1bc17c1b06d7ec0814b06067741512e6d0a