From fe71c546c4e99dca55f6f06780ea6c57d3e59b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Tue, 6 May 2025 23:14:41 +0200 Subject: [PATCH 1/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; }; } From 322959713861ef54be66a579491fc568beb9fd2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index eb47a0e..b7553d7 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; @@ -138,7 +139,7 @@ in { extraPackages = [ (pkgs.python3.withPackages (p: [ p.jupytext ])) ]; plugins = { - image.enable = enableExceptInTests; + image.enable = lib.mkForce enableExceptInTests; jupytext = { enable = true; settings.custom_language_formatting.python = { @@ -174,6 +175,7 @@ in mode = "virtualtext"; }; }; + hunk.enable = true; otter.enable = true; }; }