diff --git a/flake.lock b/flake.lock
index 3e01bd2..8dd4bd3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -226,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746171682,
-        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
+        "lastModified": 1747020534,
+        "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "50eee705bbdbac942074a8c120e8194185633675",
+        "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
         "type": "github"
       },
       "original": {
@@ -303,11 +303,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746810718,
-        "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
+        "lastModified": 1746957726,
+        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
+        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
         "type": "github"
       },
       "original": {
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 = ''
diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix
index eb47a0e..4a4ff8a 100644
--- a/modules/nixvim/dev-plugins.nix
+++ b/modules/nixvim/dev-plugins.nix
@@ -174,6 +174,7 @@ in
               mode = "virtualtext";
             };
           };
+          hunk.enable = true;
           otter.enable = true;
         };
       }