diff --git a/site-modules/core/templates/git/gitconfig.erb b/site-modules/core/templates/git/gitconfig.erb
index 4ab1f43..bb7332c 100644
--- a/site-modules/core/templates/git/gitconfig.erb
+++ b/site-modules/core/templates/git/gitconfig.erb
@@ -7,7 +7,7 @@
   name = <%= scope.call_function('lookup', ["user_name"]) %>
 
 [core]
-  editor = vim
+  editor = nvim
   autocrlf = input
 
 [merge]