From 77c73c2ea9142c8c534ebf7ebd89e1060dd8321b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Mon, 12 May 2025 23:52:13 +0200
Subject: [PATCH] feat(jj): configure to use hunk.nvim if available

This should keep me inside of nvim for longer c:
---
 modules/hm/dev.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix
index 571619b..b5ba9e3 100644
--- a/modules/hm/dev.nix
+++ b/modules/hm/dev.nix
@@ -123,9 +123,21 @@ in
             # Jujutsu (alternative DVCS (git-compatible))
             jujutsu = {
               enable = true;
+              # Use the more up to date version of jj
               package = pkgs.unstable.jujutsu;
               settings = {
-                ui.pager = "bat";
+                ui = lib.mkMerge [
+                  # If `bat` is available use it as the pager
+                  (lib.mkIf config.programs.bat.enable { pager = "bat"; })
+                  # if hunk.nvim is enabled use it as a diff editor
+                  (lib.mkIf config.programs.nixvim.plugins.hunk.enable {
+                    diff-editor = [
+                      "nvim"
+                      "-c"
+                      "DiffEditor $left $right $output"
+                    ];
+                  })
+                ];
                 fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters;
                 # mimic git commit --verbose by adding a diff
                 templates.draft_commit_description = ''