From 06f697ff3382da931a087922115374e7eac89aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= <khais.colin@gmail.com>
Date: Mon, 2 Sep 2024 20:26:46 +0200
Subject: [PATCH] feat(diff): use fancy hunk.nvim for jj diffing

---
 flake.lock | 8 ++++----
 home.nix   | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index c9901bd..d44ac0d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -491,11 +491,11 @@
         "nixvim": "nixvim_2"
       },
       "locked": {
-        "lastModified": 1724674505,
-        "narHash": "sha256-QB4MH0l0Pb57F+ClG0NR9xZJdUExT/S1VDFey2bh2y8=",
+        "lastModified": 1725301518,
+        "narHash": "sha256-npglSAZFxmeOQD1RvSvqz39nL8Qjw1DmG+/HZp+yezg=",
         "ref": "refs/heads/master",
-        "rev": "f4ea68f9faf9221859a9d3f2a6a7dbecc38edeeb",
-        "revCount": 1,
+        "rev": "0fab5cc043ae269839c6a2692d1c75a12b10eaf6",
+        "revCount": 3,
         "type": "git",
         "url": "ssh://gitsrht@git.sourcehut.005540.xyz/~logistic-bot/nixvim"
       },
diff --git a/home.nix b/home.nix
index c3c2049..7640a0f 100644
--- a/home.nix
+++ b/home.nix
@@ -76,7 +76,11 @@ in {
         email = "khais.colin@gmail.com";
         name = "Khaïs COLIN";
       };
-      ui.editor = "nvim";
+      ui = {
+        editor = "nvim";
+        diff-editor = [ "nvim" "-c" "DiffEditor $left $right $output" ];
+        merge-editor = [ "nvim" "-c" "DiffEditor $left $right $output" ];
+      };
     };
   };