From ff1cfaca45edfb2b6746b48bfdfcab7791acf260 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Mon, 7 Oct 2024 20:49:47 +0200
Subject: [PATCH] Add git delta configuration

---
 templates/gitconfig.j2 | 12 ++++++++++++
 vars/main.yml          |  1 +
 2 files changed, 13 insertions(+)

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: []