From 4aeac7e7d15fc9b5770f921142a8abbce43ae69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 6 May 2025 23:14:41 +0200
Subject: [PATCH 1/2] chore(flake): update nixvim

Nixvim added a `systems` input which we override, also this commit has
the `hunk.nvim` plugin which we want.
---
 flake.lock | 11 +++++++----
 flake.nix  |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6d6de0b..3e01bd2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -339,14 +339,17 @@
           "flake-parts"
         ],
         "nixpkgs": "nixpkgs_2",
-        "nuschtosSearch": []
+        "nuschtosSearch": [],
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
-        "lastModified": 1746965641,
-        "narHash": "sha256-6+Cn5aMDSWvsk4nOXmea3whAI4v+PjYaEpcDkTEAlXc=",
+        "lastModified": 1747083534,
+        "narHash": "sha256-r88FEbKX1HLTovPFt1QHxzZDV7D4TGHhYlJcHmK7hYk=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "02a85bd29333ce9fbde0d2c57a2378f47205bb21",
+        "rev": "ff0ccdf572ad6700a2a29a82cc5d17db29708988",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 04aaea2..77b627b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,7 @@
       url = "github:nix-community/nixvim";
       inputs = {
         flake-parts.follows = "flake-parts";
+        systems.follows = "systems";
         # disable optional inputs
         nuschtosSearch.follows = "";
       };

From 97fa750d596c1287e7c637c90cb2115b4df8c01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 6 May 2025 23:14:41 +0200
Subject: [PATCH 2/2] feat(nvim): add hunk.nvim plugin

This should be a better diff editor for `jj`
---
 modules/nixvim/dev-plugins.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix
index eb47a0e..2f08449 100644
--- a/modules/nixvim/dev-plugins.nix
+++ b/modules/nixvim/dev-plugins.nix
@@ -2,10 +2,11 @@
   lib,
   pkgs,
   config,
-  helpers,
   ...
 }:
 let
+  helpers = if lib.hasAttrByPath [ "lib" "nixvim" ] config then config.lib.nixvim else lib.nixvim;
+
   inherit (helpers) enableExceptInTests;
   inherit (lib.trivial) const;
   cfg = config.jhome.nvim;
@@ -174,6 +175,7 @@ in
               mode = "virtualtext";
             };
           };
+          hunk.enable = true;
           otter.enable = true;
         };
       }