From 89910a16b9d93a4eda45f778290fbd78cea429fd Mon Sep 17 00:00:00 2001
From: Pierre Martin <pierre@front-commerce.com>
Date: Thu, 12 Mar 2026 12:35:41 +0100
Subject: [PATCH] feat: configurer delta comme pager git
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Active delta avec navigate=true et dark=true.
Met à jour merge.conflictstyle en zdiff3.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 programs/git.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/programs/git.nix b/programs/git.nix
index 6972649..626a85b 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -23,11 +23,13 @@
       "CLAUDE.local.md"
     ];
 
-    # see https://github.com/dandavison/delta#get-started
-    #delta.enable = true;
-    # TEMPORARY DEACTIVATED due to the error
-    # error[E0282]: type annotations needed for `Box<_>`
-    #  --> /build/delta-0.17.0-vendor.tar.gz/time/src/format_description/parse/mod.rs:83:9
+    delta = {
+      enable = true;
+      options = {
+        navigate = true;
+        dark = true;
+      };
+    };
 
     settings = {
       alias = {
@@ -41,7 +43,7 @@
         name = "Pierre Martin";
       };
 
-      merge.conflictstyle = "diff3";
+      merge.conflictstyle = "zdiff3";
       diff.colorMoved = "default";
 
       merge.tool = "meld";