diff --git a/.config/git/config b/.config/git/config
index 97462c0a..c2879966 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -26,7 +26,7 @@
   helper = libsecret
 
 [core]
-  editor = nvim
+  editor = vim
   pager = delta
   excludesfile = ~/.config/git/ignore
 
@@ -42,7 +42,7 @@
   line-numbers = true
 
 [merge]
-  tool = nvimdiff
+  tool = vimdiff
   conflictstyle = diff3
 
 [diff]