diff --git a/git/.gitconfig b/git/.gitconfig
index 417a2af..457c491 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,7 +3,7 @@
 	email = sanchayan@sanchayanmaity.net
 	login = sanchayanmaity
 [core]
-	editor = "nvim"
+	editor = nvim
 	pager = nvim -R
 	excludesfile = ~/.config/git/ignore
 [color]
@@ -18,8 +18,13 @@
 	pruneTags = true
 [diff]
 	tool = nvimdiff
+[difftool]
+	prompt = false
+	trustExitCode = true
 [difftool "nvimdiff"]
-	cmd = nvim -R -d "$LOCAL" "$REMOTE"
+	cmd = nvim -R -d $LOCAL $REMOTE
+[difftool "kitty"]
+    cmd = kitty +kitten diff $LOCAL $REMOTE
 [merge]
 	tool = diffconflicts
 	conflictstyle = diff3
@@ -28,7 +33,7 @@
 	prompt = false
 	keepBackup = false
 [mergetool "diffconflicts"]
-	cmd = nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+	cmd = nvim -c DiffConflicts $MERGED $BASE $LOCAL $REMOTE
 	trustExitCode = true
 [rebase]
 	autosquash = true