diff --git a/.config/git/config b/.config/git/config
index 5845a04..c2aaf14 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,5 +1,23 @@
 [user]
-	email = charles@charlesdanesi.net
-	name = Charles D
+   email = charles@charlesdanesi.net
+   name = Charles Danesi
+
 [init]
-	defaultBranch = main
+   defaultBranch = main
+
+[core]
+   editor = nvim
+   pager = delta
+
+[interactive]
+   diffFilter = delta --color-only
+
+[delta]
+   navigate = true
+   side-by-side = true
+
+[merge]
+   conflictstyle = diff3
+
+[diff]
+   colorMoved = default