diff --git a/gitconfig b/gitconfig
index 1c2636b..325a233 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,13 +8,12 @@
 	# Sign commits by default
 	gpgSign = true
 [diff]
-	tool = vimdiff
-	guitool = gvimdiff
+	tool = nvimdiff
 [difftool]
 	confirm = false
 	prompt = false
 [merge]
-	tool = vimdiff
+	tool = nvimdiff
 [push]
 	default = nothing
 [alias]