diff --git a/.gitconfig b/.gitconfig
index b382419..73efa74 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,9 +23,28 @@
 
 [tag]
 	gpgSign = true
+
 [core]
-	editor = vim
+	editor = nvim
+
 [init]
 	defaultBranch = master
+
 [pull]
 	rebase = false
+
+[core]
+    pager = delta
+
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true  # use n and N to move between diff sections
+
+[merge]
+    conflictstyle = diff3
+
+[diff]
+    colorMoved = default
+