diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index efa5567b93f388..bb464d4d7ce4b6 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -131,17 +131,14 @@ in
     ];
   };
 
-  alpha-nvim = super.alpha-nvim.overrideAttrs {
-    nvimRequireCheck = "alpha";
-  };
-
   advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs {
-    dependencies = with super; [
+    dependencies = with self; [
       telescope-nvim
       vim-fugitive
       vim-rhubarb
+      fzf-lua
+      plenary-nvim
     ];
-    nvimRequireCheck = "advanced_git_search.utils";
   };
 
   astrocore = super.astrocore.overrideAttrs {
@@ -163,12 +160,10 @@ in
 
   animation-nvim = super.animation-nvim.overrideAttrs {
     dependencies = [ self.middleclass ];
-    nvimRequireCheck = "animation";
   };
 
   autosave-nvim = super.autosave-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "autosave";
   };
 
   auto-session = super.auto-session.overrideAttrs {
@@ -222,7 +217,6 @@ in
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ lightquantum ];
     };
-    nvimRequireCheck = "barbecue";
   };
 
   base46 = super.base46.overrideAttrs {
@@ -277,7 +271,7 @@ in
   ccc-nvim = super.ccc-nvim.overrideAttrs {
     # ccc auto-discover requires all pass
     # but there's a bootstrap module that hangs forever if we dont stop on first success
-    nvimRequireCheck = "ccc";
+    nvimSkipModule = "ccc.kit.Thread.Server._bootstrap";
   };
 
   chadtree = super.chadtree.overrideAttrs {
@@ -290,10 +284,8 @@ in
         pyyaml
         std2
       ];
-
     # We need some patches so it stops complaining about not being in a venv
     patches = [ ./patches/chadtree/emulate-venv.patch ];
-    nvimRequireCheck = "chadtree";
   };
 
   ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs {
@@ -302,7 +294,6 @@ in
       plenary-nvim
       telescope-nvim
     ];
-    nvimRequireCheck = "chatgpt";
   };
 
   cheatsheet-nvim = super.cheatsheet-nvim.overrideAttrs {
@@ -342,15 +333,15 @@ in
     postPatch = ''
       sed -i -e 's/require "health"/vim.health/' lua/clipboard-image/health.lua
     '';
-    nvimRequireCheck = "clipboard-image";
   };
 
   cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "cmake-tools";
   };
 
   cmd-parser-nvim = super.cmd-parser-nvim.overrideAttrs {
+    # Has cmd-parser.init.test matched from lua/cmd-parser/init.test.lua
+    # Can't be required and is only other module
     nvimRequireCheck = "cmd-parser";
   };
 
@@ -591,7 +582,17 @@ in
 
   codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "codecompanion";
+    nvimSkipModule = [
+      # Optional provider dependencies
+      "codecompanion.providers.diff.mini_diff"
+      "codecompanion.providers.actions.telescope"
+      "codecompanion.providers.actions.mini_pick"
+      # Requires setup call
+      "codecompanion.actions.static"
+      "codecompanion.actions.init"
+      # Test
+      "minimal"
+    ];
   };
 
   codeium-nvim =
@@ -696,7 +697,6 @@ in
       make build
       rm ruby/command-t/ext/command-t/*.o
     '';
-    nvimRequireCheck = "wincent.commandt";
   };
 
   competitest-nvim = super.competitest-nvim.overrideAttrs {