475418cbe0405d5b8bda8f7ae5141ae881e8bfe4

 1diff --git a/config_template.yaml b/config_template.yaml
 2index 6a4ba05917609f64073dc8fe45d4bccb20db4303..4be66670c702f24a2ee94bb28106e0a19092dbdf 100644
 3--- a/config_template.yaml
 4+++ b/config_template.yaml
 5@@ -1,4 +1,6 @@
 6 ---
 7+diff:
 8+  pager: diff-so-fancy
 9 data:
10   gui: true
11   modern_cli: true
12diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
13index e8ba155979efba3a8a7b848ade88a0b950c30eca..a15d9cee4003db215a0de2048c58fb22532b1c44 100644
14--- a/dot_gitconfig.tmpl
15+++ b/dot_gitconfig.tmpl
16@@ -1,14 +1,10 @@
17+; vim: noet
18 [user]
19 	name = TheEdgeOfRage
20 	email = git@theedgeofrage.com
21 	{{ if (index . "gui" | default false) -}}
22 	signingkey = 66AD4BA646FBC0D2
23 	{{- end }}
24-[alias]
25-	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
26-	slg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s' --abbrev-commit
27-[difftool]
28-	prompt = false
29 {{ if (index . "gui" | default false) -}}
30 [commit]
31 	gpgsign = true
32@@ -17,23 +13,25 @@
33 	rebase = true
34 [url "github.com:duneanalytics"]
35 	insteadOf = https://github.com/duneanalytics
36-[url "github.com:duneanalytics"]
37-	insteadOf = https://github.com/smlxl
38+[alias]
39+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
40+	slg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s' --abbrev-commit
41 [init]
42 	defaultBranch = main
43 [color]
44 	ui = auto
45-[core]
46-	pager = delta
47-[interactive]
48-	diffFilter = delta --color-only
49 [advice]
50 	skippedCherryPicks = false
51-[delta]
52-	navigate = true
53-	side-by-side = true
54-	line-numbers = true
55-	true-color = always
56-	syntax-theme = gruvbox-dark
57+
58+[core]
59+	pager = diff-so-fancy | less --tabs=4 -RF
60+[interactive]
61+	diffFilter = diff-so-fancy --patch
62 [diff]
63 	colorMoved = no
64+[difftool]
65+	prompt = false
66+[diff-so-fancy]
67+	markEmptyLines = false
68+	stripLeadingSymbols = false
69+	semIntegration = true