From 022ff8023b25097245a82639b2d1ea0553c0fc98 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 23 Dec 2024 09:08:53 -0600 Subject: [PATCH 1/4] vimPlugins.blink-cmp-copilot: add copilot dependency --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a397815beff57..79fb169b536c1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -246,6 +246,10 @@ in blink-cmp = callPackage ./non-generated/blink-cmp { }; + blink-cmp-copilot = super.blink-cmp-copilot.overrideAttrs { + dependencies = [ self.copilot-lua ]; + }; + bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; }; From 4dec804e596862fe3de00a0d18605230c19454ed Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 23 Dec 2024 09:10:42 -0600 Subject: [PATCH 2/4] vimPlugins.snacks-nvim: skip some modules --- pkgs/applications/editors/vim/plugins/overrides.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 79fb169b536c1..4e207e37d882c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2601,14 +2601,19 @@ in nvimSkipModule = [ # Requires setup call first "snacks.dashboard" + "snacks.debug" + "snacks.dim" "snacks.git" + "snacks.indent" + "snacks.input" "snacks.lazygit" "snacks.notifier" + "snacks.scratch" + "snacks.scroll" "snacks.terminal" "snacks.win" "snacks.words" - "snacks.debug" - "snacks.scratch" + "snacks.zen" # Optional trouble integration "trouble.sources.profiler" ]; From 1a9ff008f028f9f0fd08ed8315704071eb3a9eca Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 23 Dec 2024 09:14:39 -0600 Subject: [PATCH 3/4] vimPlugins.nvim-tree-lua: skip some modules --- pkgs/applications/editors/vim/plugins/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4e207e37d882c..d0503462bdd68 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2207,6 +2207,14 @@ in vimCommandCheck = "TealBuild"; }; + nvim-tree-lua = super.nvim-tree-lua.overrideAttrs { + nvimSkipModule = [ + # Meta can't be required + "nvim-tree._meta.api" + "nvim-tree._meta.api_decorator" + ]; + }; + nvim-treesitter = super.nvim-treesitter.overrideAttrs ( callPackage ./nvim-treesitter/overrides.nix { } self super ); From e728c7aca5eb1629c2d8a4499126df15fef1c492 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 23 Dec 2024 09:16:46 -0600 Subject: [PATCH 4/4] vimPlugins.LazyVim: skip ui module --- pkgs/applications/editors/vim/plugins/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d0503462bdd68..a2024e3be6c7d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1303,6 +1303,7 @@ in "lazyvim.plugins.extras.lang.svelte" "lazyvim.plugins.extras.lang.typescript" "lazyvim.plugins.init" + "lazyvim.plugins.ui" "lazyvim.plugins.xtras" ]; };