diff --git a/.config/nvim b/.config/nvim
index 5a81321..d5b1da9 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 5a813210b289d92bbf24c82d154f6e06b5acf16b
+Subproject commit d5b1da9397038dbf42c285c51aa55a99b6b59aa8
diff --git a/.zsh/config.sh b/.zsh/config.sh
index c55710c..9b227fc 100644
--- a/.zsh/config.sh
+++ b/.zsh/config.sh
@@ -9,7 +9,7 @@ source $HOME/.zsh/go-binaries.sh
 export PATH=$PATH:$HOME/.local/bin
 
 ## Some default settings
-export EDITOR=/usr/bin/vim
+export EDITOR=/usr/bin/nvim
 export BROWSER=/bin/echo # enable usage of `hub browse` on remote machines
 export AUTOGOPATH_DEFAULT=$HOME/gocode
 export ANSIBLE_NOCOWS=1