diff --git a/fish/config.fish b/fish/config.fish
index 6662d7a..349c114 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -2,4 +2,7 @@ if status is-interactive
     if type -q fzf
         fzf --fish | source
     end
+
+    set -Ux EDITOR nvim
+    set -Ux VISUAL nvim
 end
diff --git a/fish/fish_variables b/fish/fish_variables
index d418b7a..8eb91cb 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -1,5 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
+SETUVAR --export EDITOR:nvim
+SETUVAR --export VISUAL:nvim
 SETUVAR __fish_initialized:3800
 SETUVAR fish_color_autosuggestion:brblack
 SETUVAR fish_color_cancel:\x2dr
diff --git a/git/gitconfig b/git/gitconfig
index e775af4..1e9211e 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -6,6 +6,6 @@
 	template = /home/nicholasmello/.gitmessage
 	gpgsign = true
 [merge]
-	tool = vimdiff
+	tool = nvimdiff
 [gpg]
 	program = gpg