From 0b3a2f29549408fc14b2b18c152c59bda75afa46 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 27 May 2024 10:57:59 +0200
Subject: [PATCH] git: use delta for diffs

---
 modules/terminal-life/default.nix     |  1 +
 users/teutat3s/.config/git/config.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index eaee2209..9e3ba989 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -31,6 +31,7 @@ in {
       asciinema
       bat
       blesh
+      delta
       eza
       fd
       jump
diff --git a/users/teutat3s/.config/git/config.nix b/users/teutat3s/.config/git/config.nix
index c11cc60d..8e8bb252 100644
--- a/users/teutat3s/.config/git/config.nix
+++ b/users/teutat3s/.config/git/config.nix
@@ -17,7 +17,25 @@ in
       smudge = git-lfs smudge -- %f
       process = git-lfs filter-process
       required = true
+    [core]
+        pager = delta
+    [interactive]
+        diffFilter = delta --color-only
+    [delta]
+        navigate = true    # use n and N to move between diff sections
+        line-numbers = true
+        syntax-theme = base16
+        minus-style = "red dim"
+        plus-style = "green dim"
+        zero-style = "white dim"
 
+        # delta detects terminal colors automatically; set one of these to disable auto-detection
+        # dark = true
+        # light = true
+    [merge]
+        conflictstyle = diff3
+    [diff]
+        colorMoved = default
     [includeIf "gitdir:~/CodeRoom/greenbaum.cloud/"]
       path = ~/.config/git/config_greenbaum.cloud