switch from diff-so-fancy to delta

gitconfig

@@ -32,11 +32,20 @@
 
 [core]
 	editor = vi
-	pager = diff-so-fancy | less -FXRS -x4
+	pager = delta
 	untrackedCache = true
 
+[interactive]
+	diffFilter = delta --color-only
+
+[delta]
+	line-numbers = false
+	navigate = true
+	side-by-side = true
+
 [merge]
 	defaultToUpstream = true
+	conflictstyle = diff3
 
 [rebase]
 	autosquash = true
@@ -56,6 +65,7 @@
 [diff]
 	tool = kitty
 	guitool = kitty.gui
+    colorMoved = default
 [difftool]
 	prompt = false
 	trustExitCode = true