diff --git a/git/.gitconfig b/git/.gitconfig
index aaec6b6..9cc1dce 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -14,7 +14,7 @@
   status = auto
 
 [core]
-  editor = nvim
+  editor = vim
 
 [diff]
   compactionHeuristic = true
diff --git a/zsh/.env b/zsh/.env
index 92f1920..232b24e 100644
--- a/zsh/.env
+++ b/zsh/.env
@@ -1,5 +1,5 @@
 export CLICOLOR=1
-export EDITOR=nvim
+export EDITOR=vim
 export KEYTIMEOUT=1
 export QUOTING_STYLE=literal
 export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gcr/ssh