diff --git a/private_dot_gitconfig.tmpl b/private_dot_gitconfig.tmpl
index 4f46eb9..2d1f924 100644
--- a/private_dot_gitconfig.tmpl
+++ b/private_dot_gitconfig.tmpl
@@ -37,9 +37,9 @@
     pushtag = push --follow-tags
 [core]
     editor = vim
-    attributesfile = /Users/gaugendre/.gitattributes
+    attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
     autocrlf = input
-    pager = less
+    pager = delta
 [sendemail]
     smtpserver = smtp.migadu.com
     smtpuser = {{ (bitwarden "item" "Migadu email").login.username }}
@@ -47,6 +47,8 @@
     smtpserverport = 465
     smtppass = {{ (bitwarden "item" "Migadu email").login.password | quote }}
     confirm = auto
+[diff]
+    colorMoved = default
 [diff "color"]
     textconv=pygmentize
 [diff "pandoc2md"]
@@ -57,6 +59,12 @@
     textconv=exiftool
 [diff "ziplist"]
     textconv=unzip -l
+[interactive]
+    diffFilter = delta --color-only
+[delta]
+    navigate = true
+[merge]
+    conflictstyle = diff3
 [pull]
     rebase = false
 [init]
@@ -64,4 +72,4 @@
 [advice]
     detachedHead = false
 [includeIf "gitdir:~/Projects/itsf/**"]
-    path = ~/Projects/itsf/.gitconfig
+    path = {{ .chezmoi.homeDir }}/Projects/itsf/.gitconfig