diff --git a/git/gitconfig b/git/gitconfig
index 0df469a..9f558c0 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -11,7 +11,6 @@
 	tool = nvim -d
 	conflictstyle = zdiff3
 [core]
-	editor = nvim
 	eol = native
 	pager = delta || (diff-so-fancy | less --tabs=4 -RFX)
 	quotepath = false
diff --git a/shell/vars.sh b/shell/vars.sh
index 9e82738..49180d9 100755
--- a/shell/vars.sh
+++ b/shell/vars.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
-export EDITOR=nvim
-export VISUAL=nvim
+if [ -n "$(type nvim 2>/dev/null)" ]; then
+  export EDITOR=nvim
+  export VISUAL=nvim
+else
+  export EDITOR=vim
+  export VISUAL=vim
+fi
 export BROWSER=firefox