Set up git-delta

brew/Brewfile

@@ -51,6 +51,7 @@ brew "bat"
 brew "cocoapods"
 brew "corepack" # for yarn
 brew "csvlens"
+brew "git-delta"
 brew "direnv"
 brew "dvc"
 brew "eza"

git/gitconfig

@@ -1,5 +1,14 @@
 [commit]
 	gpgsign = true
+[core]
+	pager = delta
+[delta]
+	dark = true
+	line-numbers = true
+	navigate = true
+	side-by-side = false
+[diff]
+	colorMoved = default
 [fetch]
 	prune = true
 [filter "lfs"]
@@ -9,6 +18,10 @@
 	smudge = git-lfs smudge -- %f
 [init]
 	defaultBranch = main
+[interactive]
+	diffFilter = delta --color-only
+[merge]
+	conflictstyle = diff3
 [pull]
 	rebase = true
 [push]

zsh/custom.zsh

@@ -41,3 +41,4 @@ eval "$(jump shell)"
 export PAGER=bat
 export MANPAGER="sh -c 'col -bx | bat --language man --plain'"
 export BAT_CONFIG_PATH="$SETUP/bat/config"
+export DELTA_PAGER="less -RF"