diff --git a/templates/gitconfig.j2 b/templates/gitconfig.j2
index 0457357..11f5112 100644
--- a/templates/gitconfig.j2
+++ b/templates/gitconfig.j2
@@ -7,9 +7,21 @@ signingkey = {{ gpg_pub_key }}
 
 [core]
 editor = nvim
+pager = delta
+
+[interactive]
+diffFilter = delta --color-only
 
 [pull]
 rebase = false
 
 [merge]
 tool = nvimdiff
+conflictstyle = diff3
+
+[diff]
+colorMoved = default
+
+[delta]
+navigate = true
+hyperlinks = true
diff --git a/vars/main.yml b/vars/main.yml
index e0115aa..cd8d787 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -36,6 +36,7 @@ packages:
   - otf-monaspace-nerd
   - systemd-ukify
   - efibootmgr
+  - git-delta
 
 platform_packages: []
 modprobe_templates: []