diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 7774cba7e7b18..945653842a358 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -342,7 +342,6 @@ in
   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";
   };
 
   cmp-ai = super.cmp-ai.overrideAttrs {
@@ -676,7 +675,6 @@ in
 
         runHook postCheck
       '';
-      nvimRequireCheck = "codeium";
     };
 
   codesnap-nvim = callPackage ./non-generated/codesnap-nvim { };
@@ -701,24 +699,18 @@ in
 
   competitest-nvim = super.competitest-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
-
-    doInstallCheck = true;
-    nvimRequireCheck = "competitest";
   };
 
   compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "compiler-explorer";
   };
 
   compiler-nvim = super.compiler-nvim.overrideAttrs {
     dependencies = [ self.overseer-nvim ];
-    nvimRequireCheck = "compiler";
   };
 
   completion-buffers = super.completion-buffers.overrideAttrs {
     dependencies = [ self.completion-nvim ];
-    nvimRequireCheck = "completion_buffers";
   };
 
   completion-tabnine = super.completion-tabnine.overrideAttrs {
@@ -755,7 +747,6 @@ in
       copilot-lua
       plenary-nvim
     ];
-    nvimRequireCheck = "CopilotChat";
   };
 
   copilot-cmp = super.copilot-cmp.overrideAttrs {
@@ -768,7 +759,6 @@ in
       lualine-nvim
     ];
     doInstallCheck = true;
-    nvimRequireCheck = "copilot-lualine";
   };
 
   copilot-vim = super.copilot-vim.overrideAttrs (old: {
@@ -793,7 +783,6 @@ in
 
     # We need some patches so it stops complaining about not being in a venv
     patches = [ ./patches/coq_nvim/emulate-venv.patch ];
-    nvimRequireCheck = "coq";
   };
 
   cord-nvim = callPackage ./non-generated/cord-nvim { };
@@ -826,7 +815,6 @@ in
 
   crates-nvim = super.crates-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "crates";
   };
 
   cspell-nvim = super.cspell-nvim.overrideAttrs {
@@ -873,7 +861,6 @@ in
 
   ddc-source-lsp = super.ddc-source-lsp.overrideAttrs {
     dependencies = [ self.ddc-vim ];
-    nvimRequireCheck = "ddc_source_lsp";
   };
 
   ddc-vim = super.ddc-vim.overrideAttrs {
@@ -936,14 +923,12 @@ in
 
   diagram-nvim = super.diagram-nvim.overrideAttrs {
     dependencies = [ self.image-nvim ];
-    nvimRequireCheck = "diagram";
   };
 
   diffview-nvim = super.diffview-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
 
     doInstallCheck = true;
-    nvimRequireCheck = "diffview";
   };
 
   direnv-vim = super.direnv-vim.overrideAttrs (old: {
@@ -977,12 +962,10 @@ in
     fixupPhase = ''
       patchShebangs $(find $out/bin/ -type f -not -name credo-language-server)
     '';
-    nvimRequireCheck = "elixir";
   };
 
   executor-nvim = super.executor-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
-    nvimRequireCheck = "executor";
   };
 
   fcitx-vim = super.fcitx-vim.overrideAttrs {
@@ -1005,7 +988,6 @@ in
 
   flit-nvim = super.flit-nvim.overrideAttrs {
     dependencies = [ self.leap-nvim ];
-    nvimRequireCheck = "flit";
   };
 
   flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs {
@@ -1059,7 +1041,6 @@ in
 
   fuzzy-nvim = super.fuzzy-nvim.overrideAttrs {
     dependencies = [ self.telescope-fzf-native-nvim ];
-    nvimRequireCheck = "fuzzy_nvim";
   };
 
   fugit2-nvim = super.fugit2-nvim.overrideAttrs (oa: {
@@ -1133,17 +1114,14 @@ in
 
   gitlinker-nvim = super.gitlinker-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "gitlinker";
   };
 
   gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "gitsigns";
   };
 
   git-worktree-nvim = super.git-worktree-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "git-worktree";
   };
 
   go-nvim = super.go-nvim.overrideAttrs {
@@ -1182,37 +1160,30 @@ in
     ];
 
     doInstallCheck = true;
-    nvimRequireCheck = "hardhat";
   };
 
   harpoon = super.harpoon.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "harpoon";
   };
 
   harpoon2 = super.harpoon2.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "harpoon";
   };
 
   haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {
     dependencies = [ self.luasnip ];
-    nvimRequireCheck = "haskell-snippets";
   };
 
   haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
-    nvimRequireCheck = "haskell-scope-highlighting";
   };
 
   haskell-tools-nvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.haskell-tools-nvim;
-    nvimRequireCheck = "haskell-tools";
   };
 
   hex-nvim = super.hex-nvim.overrideAttrs {
     runtimeDeps = [ xxd ];
-    nvimRequireCheck = "hex";
   };
 
   himalaya-vim = super.himalaya-vim.overrideAttrs {
@@ -1235,7 +1206,6 @@ in
 
   hunk-nvim = super.hunk-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
-    nvimRequireCheck = "hunk";
   };
 
   # https://hurl.dev/
@@ -1254,7 +1224,6 @@ in
     ];
 
     doInstallCheck = true;
-    nvimRequireCheck = "idris2";
   };
 
   image-nvim = super.image-nvim.overrideAttrs {
@@ -1272,7 +1241,6 @@ in
         --replace-fail @nix_magick@ ${luajitPackages.magick}
     '';
 
-    nvimRequireCheck = "image";
   };
 
   indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs {
@@ -1308,7 +1276,6 @@ in
 
   jupytext-nvim = super.jupytext-nvim.overrideAttrs {
     passthru.python3Dependencies = ps: [ ps.jupytext ];
-    nvimRequireCheck = "jupytext";
   };
 
   kulala-nvim = super.kulala-nvim.overrideAttrs {
@@ -1321,7 +1288,6 @@ in
       substituteInPlace lua/kulala/config/init.lua \
         --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"'
     '';
-    nvimRequireCheck = "kulala";
   };
 
   LanguageClient-neovim = callPackage ./non-generated/LanguageClient-neovim { };
@@ -1351,12 +1317,10 @@ in
 
   lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
-    nvimRequireCheck = "lazy-lsp";
   };
 
   lazy-nvim = super.lazy-nvim.overrideAttrs {
     patches = [ ./patches/lazy-nvim/no-helptags.patch ];
-    nvimRequireCheck = "lazy";
   };
 
   lean-nvim = super.lean-nvim.overrideAttrs {
@@ -1364,7 +1328,6 @@ in
       nvim-lspconfig
       plenary-nvim
     ];
-    nvimRequireCheck = "lean";
   };
 
   LeaderF = super.LeaderF.overrideAttrs {
@@ -1385,7 +1348,6 @@ in
       leap-nvim
       nvim-treesitter
     ];
-    nvimRequireCheck = "leap-ast";
   };
 
   leetcode-nvim = super.leetcode-nvim.overrideAttrs {
@@ -1396,7 +1358,6 @@ in
     ];
 
     doInstallCheck = true;
-    nvimRequireCheck = "leetcode";
   };
 
   legendary-nvim = super.legendary-nvim.overrideAttrs {
@@ -1430,7 +1391,6 @@ in
 
   lir-nvim = super.lir-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "lir";
   };
 
   lispdocs-nvim = super.lispdocs-nvim.overrideAttrs {
@@ -1470,22 +1430,18 @@ in
 
   lsp-progress-nvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.lsp-progress-nvim;
-    nvimRequireCheck = "lsp-progress";
   };
 
   lspecho-nvim = super.lspecho-nvim.overrideAttrs {
     meta.license = lib.licenses.mit;
-    nvimRequireCheck = "lspecho";
   };
 
   lspsaga-nvim = super.lspsaga-nvim.overrideAttrs {
     # Other modules require setup call first
-    nvimRequireCheck = "lspsaga";
   };
 
   ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs {
     # Other modules require setup call first
-    nvimRequireCheck = "ltex_extra";
   };
 
   lualine-lsp-progress = super.lualine-lsp-progress.overrideAttrs {
@@ -1494,7 +1450,6 @@ in
 
   luasnip = super.luasnip.overrideAttrs {
     dependencies = [ luaPackages.jsregexp ];
-    nvimRequireCheck = "luasnip";
   };
 
   luasnip-latex-snippets-nvim = super.luasnip-latex-snippets-nvim.overrideAttrs {
@@ -1508,17 +1463,14 @@ in
 
   lz-n = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.lz-n;
-    nvimRequireCheck = "lz.n";
   };
 
   lze = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.lze;
-    nvimRequireCheck = "lze";
   };
 
   lzn-auto-require = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.lzn-auto-require;
-    nvimRequireCheck = "lzn-auto-require.loader";
   };
 
   magma-nvim = super.magma-nvim.overrideAttrs {
@@ -1576,7 +1528,6 @@ in
       mason-nvim
       nvim-lspconfig
     ];
-    nvimRequireCheck = "mason-lspconfig";
   };
 
   mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
@@ -1600,7 +1551,6 @@ in
 
   mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs {
     dependencies = [ self.mason-nvim ];
-    nvimRequireCheck = "mason-tool-installer";
   };
 
   material-vim = super.material-vim.overrideAttrs {
@@ -1616,7 +1566,6 @@ in
 
   middleclass = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.middleclass;
-    nvimRequireCheck = "middleclass";
   };
 
   mind-nvim = super.mind-nvim.overrideAttrs {
@@ -1650,7 +1599,6 @@ in
   mkdnflow-nvim = super.mkdnflow-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     # Requires setup call and has optional nvim-cmp dependency
-    nvimRequireCheck = "mkdnflow";
   };
 
   modicator-nvim = super.modicator-nvim.overrideAttrs {
@@ -1673,7 +1621,6 @@ in
       nvim-treesitter
       hydra-nvim
     ];
-    nvimRequireCheck = "multicursors";
   };
 
   muren-nvim = super.muren-nvim.overrideAttrs {
@@ -1682,7 +1629,6 @@ in
 
   ncm2 = super.ncm2.overrideAttrs {
     dependencies = [ self.nvim-yarp ];
-    nvimRequireCheck = "ncm2";
   };
 
   ncm2-jedi = super.ncm2-jedi.overrideAttrs {
@@ -1713,12 +1659,16 @@ in
     dependencies = [ self.nvim-lspconfig ];
 
     doInstallCheck = true;
-    nvimRequireCheck = "neoconf";
   };
 
   neogit = super.neogit.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "neogit";
+    nvimSkipModule = [
+      # Optional diffview integration
+      "neogit.integrations.diffview"
+      "neogit.popups.diff.actions"
+      "neogit.popups.diff.init"
+    ];
   };
 
   neorepl-nvim = super.neorepl-nvim.overrideAttrs {
@@ -1734,7 +1684,6 @@ in
     luaAttr = luaPackages.neorg;
 
     doInstallCheck = true;
-    nvimRequireCheck = "neorg";
   };
 
   neorg-telescope = super.neorg-telescope.overrideAttrs {
@@ -1751,7 +1700,6 @@ in
       nvim-nio
       plenary-nvim
     ];
-    nvimRequireCheck = "neotest";
   };
 
   neotest-bash = super.neotest-bash.overrideAttrs {
@@ -1861,7 +1809,6 @@ in
       nvim-nio
       plenary-nvim
     ];
-    nvimRequireCheck = "neotest-java";
   };
 
   neotest-jest = super.neotest-jest.overrideAttrs {
@@ -1887,7 +1834,6 @@ in
       nvim-nio
       plenary-nvim
     ];
-    nvimRequireCheck = "neotest-pest";
   };
 
   neotest-phpunit = super.neotest-phpunit.overrideAttrs {
@@ -1915,7 +1861,6 @@ in
       nvim-nio
       plenary-nvim
     ];
-    nvimRequireCheck = "neotest-plenary";
   };
 
   neotest-python = super.neotest-python.overrideAttrs {
@@ -1924,7 +1869,6 @@ in
       nvim-nio
       plenary-nvim
     ];
-    nvimRequireCheck = "neotest-python";
   };
 
   neotest-rspec = super.neotest-rspec.overrideAttrs {
@@ -1949,7 +1893,6 @@ in
       nvim-nio
       plenary-nvim
     ];
-    nvimRequireCheck = "neotest-scala";
   };
 
   neotest-testthat = super.neotest-testthat.overrideAttrs {
@@ -1958,7 +1901,6 @@ in
       nvim-nio
       plenary-nvim
     ];
-    nvimRequireCheck = "neotest-testthat";
   };
 
   neotest-vitest = super.neotest-vitest.overrideAttrs {
@@ -1984,7 +1926,6 @@ in
       plenary-nvim
       nui-nvim
     ];
-    nvimRequireCheck = "neo-tree";
   };
 
   netman-nvim = super.netman-nvim.overrideAttrs {
@@ -2001,7 +1942,6 @@ in
       plenary-nvim
       telescope-nvim
     ];
-    nvimRequireCheck = "neuron";
   };
 
   nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs {
@@ -2014,18 +1954,15 @@ in
 
   noice-nvim = super.noice-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
-    nvimRequireCheck = "noice";
   };
 
   none-ls-nvim = super.none-ls-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "null-ls";
   };
 
   notmuch-vim = notmuch.vim;
 
   NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs {
-    nvimRequireCheck = "notebook-navigator";
   };
 
   nterm-nvim = super.nterm-nvim.overrideAttrs {
@@ -2034,7 +1971,6 @@ in
 
   null-ls-nvim = super.null-ls-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "null-ls";
   };
 
   nvchad = super.nvchad.overrideAttrs {
@@ -2093,7 +2029,6 @@ in
 
   nvim-coverage = super.nvim-coverage.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "coverage";
   };
 
   nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs {
@@ -2102,12 +2037,10 @@ in
 
   nvim-dap-python = super.nvim-dap-python.overrideAttrs {
     dependencies = [ self.nvim-dap ];
-    nvimRequireCheck = "dap-python";
   };
 
   nvim-dap-rego = super.nvim-dap-rego.overrideAttrs {
     dependencies = [ self.nvim-dap ];
-    nvimRequireCheck = "dap-rego";
   };
 
   nvim-dap-rr = super.nvim-dap-rr.overrideAttrs {
@@ -2121,7 +2054,6 @@ in
     ];
 
     doInstallCheck = true;
-    nvimRequireCheck = "dapui";
   };
 
   nvim-dap-virtual-text = super.nvim-dap-virtual-text.overrideAttrs {
@@ -2142,7 +2074,6 @@ in
     dependencies = [ self.dressing-nvim ];
 
     doInstallCheck = true;
-    nvimRequireCheck = "genghis";
   };
 
   nvim-gps = super.nvim-gps.overrideAttrs {
@@ -2190,18 +2121,15 @@ in
 
   nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "lsp-file-operations";
   };
 
   nvim-lsputils = super.nvim-lsputils.overrideAttrs {
     dependencies = [ self.popfix ];
-    nvimRequireCheck = "lsputil.codeAction";
   };
 
   nvim-metals = super.nvim-metals.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     dontBuild = true;
-    nvimRequireCheck = "metals";
   };
 
   nvim-moonwalk = super.nvim-moonwalk.overrideAttrs {
@@ -2215,7 +2143,6 @@ in
       nvim-lspconfig
       nvim-navic
     ];
-    nvimRequireCheck = "nvim-navbuddy";
   };
 
   nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs {
@@ -2270,17 +2197,14 @@ in
       '';
 
       meta.platforms = lib.platforms.linux;
-      nvimRequireCheck = "dbee";
     }
   );
 
   nvim-impairative = super.nvim-impairative.overrideAttrs {
-    nvimRequireCheck = "impairative";
   };
 
   nvim-navic = super.nvim-navic.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
-    nvimRequireCheck = "nvim-navic";
   };
 
   nvim-notify = super.nvim-notify.overrideAttrs {
@@ -2297,7 +2221,6 @@ in
   };
 
   nvim-scissors = super.nvim-scissors.overrideAttrs {
-    nvimRequireCheck = "scissors";
   };
 
   nvim-snippets = super.nvim-snippets.overrideAttrs {
@@ -2356,7 +2279,6 @@ in
   };
 
   nvim-treesitter-sexp = super.nvim-treesitter-sexp.overrideAttrs {
-    nvimRequireCheck = "treesitter-sexp";
   };
 
   nvim-treesitter-textobjects = super.nvim-treesitter-textobjects.overrideAttrs {
@@ -2369,7 +2291,6 @@ in
 
   nvim-trevJ-lua = super.nvim-trevJ-lua.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
-    nvimRequireCheck = "trevj";
   };
 
   nvim-test = super.nvim-test.overrideAttrs {
@@ -2397,7 +2318,6 @@ in
 
   nvim-ufo = super.nvim-ufo.overrideAttrs {
     dependencies = [ self.promise-async ];
-    nvimRequireCheck = "ufo";
   };
 
   nvim-unception = super.nvim-unception.overrideAttrs {
@@ -2417,20 +2337,21 @@ in
 
   obsidian-nvim = super.obsidian-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "obsidian";
   };
 
   octo-nvim = super.octo-nvim.overrideAttrs {
-    dependencies = with self; [
+    checkInputs = with self; [
+      # Pickers, can use telescope or fzf-lua
+      fzf-lua
       telescope-nvim
+    ];
+    dependencies = with self; [
       plenary-nvim
     ];
-    nvimRequireCheck = "octo";
   };
 
   ollama-nvim = super.ollama-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "ollama";
   };
 
   onehalf = super.onehalf.overrideAttrs {
@@ -2485,12 +2406,10 @@ in
 
   orgmode = super.orgmode.overrideAttrs {
     dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ];
-    nvimRequireCheck = "orgmode";
   };
 
   otter-nvim = super.otter-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
-    nvimRequireCheck = "otter";
   };
 
   outline-nvim = super.outline-nvim.overrideAttrs {
@@ -2511,7 +2430,11 @@ in
 
       runHook postCheck
     '';
-    nvimRequireCheck = "overseer";
+    nvimSkipModule = [
+      # Optional integrations
+      "overseer.strategy.toggleterm"
+      "overseer.dap"
+    ];
   };
 
   package-info-nvim = super.package-info-nvim.overrideAttrs {
@@ -2556,7 +2479,6 @@ in
       # we need the 'query' grammar to make
       (nvim-treesitter.withPlugins (p: [ p.query ]))
     ];
-    nvimRequireCheck = "nvim-treesitter-playground";
   };
 
   # TODO: runtimedeps
@@ -2567,7 +2489,6 @@ in
     '';
 
     doInstallCheck = true;
-    nvimRequireCheck = "plenary";
   };
 
   poimandres-nvim = super.poimandres-nvim.overrideAttrs {
@@ -2608,7 +2529,6 @@ in
   };
 
   quicker-nvim = super.quicker-nvim.overrideAttrs {
-    nvimRequireCheck = "quicker";
   };
 
   rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs {
@@ -2622,7 +2542,6 @@ in
 
   range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
     dependencies = [ self.cmd-parser-nvim ];
-    nvimRequireCheck = "range-highlight";
   };
 
   ranger-nvim = super.ranger-nvim.overrideAttrs {
@@ -2631,7 +2550,6 @@ in
     postPatch = ''
       substituteInPlace lua/ranger-nvim.lua --replace-fail '@ranger@' ${ranger}/bin/ranger
     '';
-    nvimRequireCheck = "ranger-nvim";
   };
 
   aider-nvim = super.aider-nvim.overrideAttrs {
@@ -2641,7 +2559,6 @@ in
       substituteInPlace lua/aider.lua --replace-fail '@aider@' ${aider-chat}/bin/aider
       substituteInPlace lua/helpers.lua --replace-fail '@aider@' ${aider-chat}/bin/aider
     '';
-    nvimRequireCheck = "aider";
   };
 
   refactoring-nvim = super.refactoring-nvim.overrideAttrs {
@@ -2649,7 +2566,6 @@ in
       nvim-treesitter
       plenary-nvim
     ];
-    nvimRequireCheck = "refactoring";
   };
 
   remote-nvim-nvim = super.remote-nvim-nvim.overrideAttrs {
@@ -2674,31 +2590,25 @@ in
         p.json
       ]))
     ];
-    nvimRequireCheck = "rest-nvim";
   };
 
   rocks-nvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.rocks-nvim;
-    nvimRequireCheck = "rocks";
   };
 
   rocks-config-nvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.rocks-config-nvim;
-    nvimRequireCheck = "rocks-config";
   };
 
   roslyn-nvim = super.roslyn-nvim.overrideAttrs {
-    nvimRequireCheck = "roslyn";
   };
 
   rtp-nvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.rtp-nvim;
-    nvimRequireCheck = "rtp_nvim";
   };
 
   rustaceanvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.rustaceanvim;
-    nvimRequireCheck = "rustaceanvim";
   };
 
   rust-tools-nvim = super.rust-tools-nvim.overrideAttrs {
@@ -2714,7 +2624,6 @@ in
   };
 
   scretch-nvim = super.scretch-nvim.overrideAttrs {
-    nvimRequireCheck = "scretch";
   };
 
   searchbox-nvim = super.searchbox-nvim.overrideAttrs {
@@ -2823,18 +2732,20 @@ in
       passthru = oa.passthru // {
         initLua = ''vim.g.sqlite_clib_path = "${libsqlite}"'';
       };
-      nvimRequireCheck = "sqlite";
+
+      nvimSkipModule = [
+        # Require "sql.utils" ?
+        "sqlite.tbl.cache"
+      ];
     }
   );
 
   ssr = super.ssr-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
-    nvimRequireCheck = "ssr";
   };
 
   startup-nvim = super.startup-nvim.overrideAttrs {
     dependencies = with super; [ plenary-nvim ];
-    nvimRequireCheck = "startup";
   };
 
   statix = buildVimPlugin rec {
@@ -2857,7 +2768,6 @@ in
       substituteInPlace lua/stylish/components/menu.lua --replace-fail xdotool ${xdotool}/bin/xdotool
       substituteInPlace lua/stylish/components/menu.lua --replace-fail xwininfo ${xorg.xwininfo}/bin/xwininfo
     '';
-    nvimRequireCheck = "stylish";
   };
 
   supermaven-nvim = super.supermaven-nvim.overrideAttrs {
@@ -2914,7 +2824,6 @@ in
   syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
     meta.maintainers = with lib.maintainers; [ callumio ];
-    nvimRequireCheck = "syntax-tree-surfer";
   };
 
   taskwarrior3 = buildVimPlugin {
@@ -2932,7 +2841,6 @@ in
       plenary-nvim
       telescope-nvim
     ];
-    nvimRequireCheck = "telekasten";
   };
 
   telescope-asynctasks-nvim = super.telescope-asynctasks-nvim.overrideAttrs {
@@ -3109,7 +3017,6 @@ in
       otter-nvim
     ];
 
-    nvimRequireCheck = "quarto";
     doInstallCheck = true;
   };
 
@@ -3138,7 +3045,6 @@ in
 
   todo-comments-nvim = super.todo-comments-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "todo-comments";
   };
 
   tokyonight-nvim = super.tokyonight-nvim.overrideAttrs {
@@ -3152,7 +3058,6 @@ in
 
   triptych-nvim = super.triptych-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "triptych";
   };
 
   tsc-nvim = super.tsc-nvim.overrideAttrs {
@@ -3173,7 +3078,6 @@ in
 
   tssorter-nvim = super.tssorter-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
-    nvimRequireCheck = "tssorter";
   };
 
   tup =
@@ -3207,7 +3111,6 @@ in
       nvim-lspconfig
       plenary-nvim
     ];
-    nvimRequireCheck = "typescript-tools";
   };
 
   unicode-vim =
@@ -3527,7 +3430,6 @@ in
   };
 
   vim-tabby = super.vim-tabby.overrideAttrs {
-    nvimRequireCheck = "tabby";
   };
 
   vim-textobj-entire = super.vim-textobj-entire.overrideAttrs {
@@ -3663,12 +3565,10 @@ in
       middleclass
       animation-nvim
     ];
-    nvimRequireCheck = "windows";
   };
 
   wtf-nvim = super.wtf-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
-    nvimRequireCheck = "wtf";
   };
 
   YankRing-vim = super.YankRing-vim.overrideAttrs {
@@ -3685,7 +3585,10 @@ in
 
   yazi-nvim = super.yazi-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
-    nvimRequireCheck = "yazi";
+    nvimSkipModule = [
+      # Used for reproducing issues
+      "repro"
+    ];
   };
 
   YouCompleteMe = super.YouCompleteMe.overrideAttrs {
@@ -3788,7 +3691,6 @@ in
        --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}',"
     '';
 
-    nvimRequireCheck = "typst-preview";
   };
 }
 // (