From 9484efa16de79f22c731c06dc74af13d0a7777eb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 13 Nov 2024 11:19:24 -0500
Subject: [PATCH] try using delta

---
 dot_config/git/config | 54 ++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/dot_config/git/config b/dot_config/git/config
index c973050..299223c 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -1,25 +1,31 @@
-[user]
-	email = joel@beckmeyer.us
-	name = Joel Beckmeyer
-[color]
-	ui = auto
-[push]
-	default = current
-	autoSetupRemote = true
-[filesystem "N/A|13.0.2|/dev/sda2"]
-	timestampResolution = 10000 nanoseconds
-	minRacyThreshold = 6379 microseconds
-[merge]
-	tool = meld
-[review "review.lineageos.org"]
-	username = jbeckmeyer
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
-[pull]
-	rebase = false
 [core]
-	autocrlf = input
-	safecrlf = true
+  autocrlf = input
+  safecrlf = true
+  pager = delta
+[user]
+  email = joel@beckmeyer.us
+  name = Joel Beckmeyer
+[color]
+  ui = auto
+[push]
+  default = current
+  autoSetupRemote = true
+[filesystem "N/A|13.0.2|/dev/sda2"]
+  timestampResolution = 10000 nanoseconds
+  minRacyThreshold = 6379 microseconds
+[merge]
+  tool = meld
+  conflictstyle = zdiff3
+[review "review.lineageos.org"]
+  username = jbeckmeyer
+[filter "lfs"]
+  clean = git-lfs clean -- %f
+  smudge = git-lfs smudge -- %f
+  process = git-lfs filter-process
+  required = true
+[pull]
+  rebase = false
+[interactive]
+  diffFilter = delta --color-only
+[delta]
+  navigate = true  # use n and N to move between diff sections