diff --git a/.gitconfig b/.gitconfig
index 2ef3c89..59293e0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,7 +11,7 @@
   signingkey = 1D0FA4387C5873294D5863980F9FE41723A8A297
 
 [core]
-  editor = vim
+  editor = nvim
 
 [alias]
   st = status -sb
diff --git a/.zshrc b/.zshrc
index 8a84091..6bc3d11 100644
--- a/.zshrc
+++ b/.zshrc
@@ -52,6 +52,8 @@ alias ls="exa --color=always --group-directories-first"
 # Alias to nvim instead of vim
 alias vim="nvim"
 
+export EDITOR=nvim
+
 # This loads nvm
 export PATH="$HOME/.nvm/versions/node/$(/bin/cat $HOME/.nvm/alias/default)/bin:$PATH"
 nvm() {