1 files changed, 22 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index d570dd3..73db1e2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,8 +1,22 @@
+[core]
+	pager = delta
+
 [user]
 	email = sam@samnystrom.dev
 	name = Sam Nystrom
+
 [init]
 	defaultBranch = main
+
+[interactive]
+	diffFilter = delta --color-only
+
+[merge]
+	conflictstyle = diff3
+
+[diff]
+	colorMoved = default
+
 [sendemail]
 	smtpserver = smtp.migadu.com
 	smtpuser = sam@samnystrom.dev
@@ -10,5 +24,13 @@
 	smtpserverport = 465
 	annotate = yes
 	verify = off
+
 [credential]
 	helper = himitsu
+
+[delta]
+	navigate = true
+	light = false
+	side-by-side = true
+	line-numbers = true
+	syntax-theme = catppuccin-macchiato