From 817213dd8e3405c17434d7dd9d18fb275fdc60db Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 12 Jan 2025 14:22:37 -0600 Subject: [PATCH 1/7] vimPlugins.sg-nvim: remove explicit nvimRequireCheck --- .../vim/plugins/non-generated/sg-nvim/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix index 3ebc0f3c0204..05922d1adaad 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix @@ -43,6 +43,11 @@ vimUtils.buildVimPlugin { pname = "sg.nvim"; inherit version src; + checkInputs = with vimPlugins; [ + telescope-nvim + nvim-cmp + ]; + dependencies = [ vimPlugins.plenary-nvim ]; postInstall = '' @@ -50,6 +55,11 @@ vimUtils.buildVimPlugin { ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug ''; + nvimSkipModule = [ + # Dependent on active fuzzy search state + "sg.cody.fuzzy" + ]; + passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; @@ -59,7 +69,6 @@ vimUtils.buildVimPlugin { # needed for the update script inherit sg-nvim-rust; }; - nvimRequireCheck = "sg"; meta = { description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; From e5c3b3874a4c2ff3dce5f7434ee976fe2d537e94 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 12 Jan 2025 15:05:52 -0600 Subject: [PATCH 2/7] vimPlugins.avante-nvim: remove explicit nvimRequireCheck --- .../vim/plugins/non-generated/avante-nvim/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 9d8a386e7826..9fcd587ae0fc 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -72,8 +72,11 @@ vimUtils.buildVimPlugin { inherit avante-nvim-lib; }; - doInstallCheck = true; - nvimRequireCheck = "avante"; + nvimSkipModule = [ + # Requires setup with corresponding provider + "avante.providers.azure" + "avante.providers.copilot" + ]; meta = { description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; From 1c0cb7067b2e1844552f166d4bfd516888ad3cb0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 12 Jan 2025 15:52:23 -0600 Subject: [PATCH 3/7] vimPlugins.blink-cmp: remove explicit nvimRequireCheck --- .../vim/plugins/non-generated/blink-cmp/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index 4c4526e013dc..f36def55d93f 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -61,6 +61,9 @@ vimUtils.buildVimPlugin { redxtech ]; }; - doInstallCheck = true; - nvimRequireCheck = "blink-cmp"; + + nvimSkipModule = [ + # Module for reproducing issues + "repro" + ]; } From cf783dcb76e588fcf0e9d8a7ac8c2befa57f6321 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 12 Jan 2025 15:53:12 -0600 Subject: [PATCH 4/7] vimPlugins.codesnap-nvim: remove explicit nvimRequireCheck --- .../vim/plugins/non-generated/codesnap-nvim/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix index 66d106a83f77..554fe7e48ac0 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix @@ -51,9 +51,6 @@ vimUtils.buildVimPlugin { cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so ''; - doInstallCheck = true; - nvimRequireCheck = "codesnap"; - passthru = { updateScript = nix-update-script { attrPath = "vimPlugins.codesnap-nvim.codesnap-lib"; From 4f9026c30b2531a57e23a3b40bd0e8b580a5236d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 12 Jan 2025 15:53:51 -0600 Subject: [PATCH 5/7] vimPlugins.cord-nvim: remove explicit nvimRequireCheck --- .../editors/vim/plugins/non-generated/cord-nvim/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index 43c0eeb5d9a8..b60067186f3d 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -54,9 +54,6 @@ vimUtils.buildVimPlugin { runHook postInstall ''; - doInstallCheck = true; - nvimRequireCheck = "cord"; - passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; From 7673412bb543249078717dfbf57c6edf56a36e5b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 12 Jan 2025 16:08:55 -0600 Subject: [PATCH 6/7] vimPlugins.nvim-spectre: remove explicit nvimRequireCheck --- .../editors/vim/plugins/non-generated/nvim-spectre/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index 4de9cbeaa0a3..5499303b5e8b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -42,8 +42,6 @@ vimUtils.buildVimPlugin { ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so ''; - nvimRequireCheck = "spectre"; - passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; From 287f69e9d5143d4de4ec08827f1c895e101beb9b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 12 Jan 2025 16:09:41 -0600 Subject: [PATCH 7/7] vimPlugins.sniprun: remove explicit nvimRequireCheck --- .../editors/vim/plugins/non-generated/sniprun/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix index 8ea4a90ca87f..09d9de3606f4 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix @@ -57,8 +57,6 @@ vimUtils.buildVimPlugin { propagatedBuildInputs = [ sniprun-bin ]; - nvimRequireCheck = "sniprun"; - passthru = { updateScript = nix-update-script { attrPath = "vimPlugins.sniprun.sniprun-bin";