diff --git a/git/gitconfig b/git/gitconfig
index 735bded..0df469a 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -8,10 +8,10 @@
 	email = account@buehler.rocks
 [merge]
 	defaultToUpstream = true
-	tool = vimdiff
+	tool = nvim -d
 	conflictstyle = zdiff3
 [core]
-	editor = vim
+	editor = nvim
 	eol = native
 	pager = delta || (diff-so-fancy | less --tabs=4 -RFX)
 	quotepath = false
@@ -46,8 +46,8 @@
 	fetch = +refs/pull/*/head:refs/remotes/upstream/pull/*
 	fetch = +refs/merge-requests/*/head:refs/remotes/upstream/merge-requests/*
 [diff]
-	tool = vimdiff
-	colorMoved = plain
+	tool = nvim -d
+	colorMoved = default
 	algorithm = histogram
 	mnemonicPrefix = true
 	renames = true