From af966d305a6b3c4635f261d2403f8bacbdf6cb91 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:31:59 +0200 Subject: [PATCH] vim/plugins/overrides.nix: run keep-sorted --- .../editors/vim/plugins/overrides.nix | 410 +++++++++--------- 1 file changed, 206 insertions(+), 204 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e03819063fc8..ac3f29e5730b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -233,15 +233,15 @@ assertNoAdditions { checkInputs = [ self.toggleterm-nvim ]; }; - autosave-nvim = super.autosave-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - auto-session = super.auto-session.overrideAttrs { # Optional integration checkInputs = [ self.telescope-nvim ]; }; + autosave-nvim = super.autosave-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { patches = [ (replaceVars ./patches/aw-watcher-vim/program_paths.patch { @@ -316,6 +316,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + blink-cmp-env = super.blink-cmp-env.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + blink-cmp-git = super.blink-cmp-git.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -336,14 +340,6 @@ assertNoAdditions { ]; }; - blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs { - dependencies = [ self.blink-cmp ]; - }; - - blink-nerdfont-nvim = super.blink-nerdfont-nvim.overrideAttrs { - dependencies = [ self.blink-cmp ]; - }; - blink-cmp-words = super.blink-cmp-words.overrideAttrs (old: { dependencies = [ self.blink-cmp ]; meta = old.meta // { @@ -352,11 +348,15 @@ assertNoAdditions { }; }); - blink-cmp-env = super.blink-cmp-env.overrideAttrs { + blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs { dependencies = [ self.blink-cmp ]; }; - blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs { + blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + + blink-nerdfont-nvim = super.blink-nerdfont-nvim.overrideAttrs { dependencies = [ self.blink-cmp ]; }; @@ -455,6 +455,12 @@ assertNoAdditions { ]; }; + claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs { + dependencies = with self; [ + fzf-lua + ]; + }; + claude-fzf-nvim = super.claude-fzf-nvim.overrideAttrs { dependencies = with self; [ claudecode-nvim @@ -468,12 +474,6 @@ assertNoAdditions { ''; }; - claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs { - dependencies = with self; [ - fzf-lua - ]; - }; - clighter8 = super.clighter8.overrideAttrs { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \ @@ -586,11 +586,6 @@ assertNoAdditions { checkInputs = [ self.nvim-cmp ]; }; - cmp_luasnip = super.cmp_luasnip.overrideAttrs { - checkInputs = [ self.nvim-cmp ]; - dependencies = [ self.luasnip ]; - }; - cmp-neosnippet = super.cmp-neosnippet.overrideAttrs { checkInputs = [ self.nvim-cmp ]; dependencies = [ self.neosnippet-vim ]; @@ -685,6 +680,11 @@ assertNoAdditions { dependencies = [ zsh ]; }; + cmp_luasnip = super.cmp_luasnip.overrideAttrs { + checkInputs = [ self.nvim-cmp ]; + dependencies = [ self.luasnip ]; + }; + cobalt2-nvim = super.cobalt2-nvim.overrideAttrs { dependencies = with self; [ colorbuddy-nvim ]; # Few broken themes @@ -699,6 +699,15 @@ assertNoAdditions { ]; }; + codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs { + dependencies = with self; [ + # transitive dependency for codecompanion-nvim + plenary-nvim + + codecompanion-nvim + ]; + }; + codecompanion-nvim = super.codecompanion-nvim.overrideAttrs { checkInputs = with self; [ # Optional completion @@ -723,15 +732,6 @@ assertNoAdditions { ]; }; - codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs { - dependencies = with self; [ - # transitive dependency for codecompanion-nvim - plenary-nvim - - codecompanion-nvim - ]; - }; - codesettings-nvim = super.codesettings-nvim.overrideAttrs { # This module is a build CLI and should not be `require`d directly! nvimSkipModules = [ "codesettings.build.cli" ]; @@ -806,19 +806,6 @@ assertNoAdditions { nvimSkipModules = [ "context.highlight" ]; }; - CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs { - checkInputs = with self; [ - # Optional integrations - fzf-lua - telescope-nvim - snacks-nvim - ]; - dependencies = with self; [ - copilot-lua - plenary-nvim - ]; - }; - copilot-cmp = super.copilot-cmp.overrideAttrs { dependencies = [ self.copilot-lua ]; }; @@ -843,6 +830,19 @@ assertNoAdditions { }; }); + CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional integrations + fzf-lua + telescope-nvim + snacks-nvim + ]; + dependencies = with self; [ + copilot-lua + plenary-nvim + ]; + }; + coq_nvim = super.coq_nvim.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ @@ -966,6 +966,10 @@ assertNoAdditions { dependencies = [ self.ddc-vim ]; }; + ddc-ui-native = super.ddc-ui-native.overrideAttrs { + dependencies = [ self.ddc-vim ]; + }; + ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { dependencies = with self; [ ddc-vim @@ -973,10 +977,6 @@ assertNoAdditions { ]; }; - ddc-ui-native = super.ddc-ui-native.overrideAttrs { - dependencies = [ self.ddc-vim ]; - }; - ddc-vim = super.ddc-vim.overrideAttrs { dependencies = [ self.denops-vim ]; }; @@ -1293,16 +1293,12 @@ assertNoAdditions { runtimeDeps = [ curl ]; }; - ghcid = super.ghcid.overrideAttrs { - configurePhase = "cd plugins/nvim"; - }; - gh-nvim = super.gh-nvim.overrideAttrs { dependencies = [ self.litee-nvim ]; }; - gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; + ghcid = super.ghcid.overrideAttrs { + configurePhase = "cd plugins/nvim"; }; git-conflict-nvim = super.git-conflict-nvim.overrideAttrs { @@ -1321,6 +1317,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + go-nvim = super.go-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -1600,6 +1600,23 @@ assertNoAdditions { } ); + lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs { + dependencies = [ self.nvim-lspconfig ]; + }; + + lazy-nvim = super.lazy-nvim.overrideAttrs { + patches = [ ./patches/lazy-nvim/no-helptags.patch ]; + nvimSkipModules = [ + # Requires headless config option + "lazy.manage.task.init" + "lazy.manage.checker" + "lazy.manage.init" + "lazy.manage.runner" + "lazy.view.commands" + "lazy.build" + ]; + }; + lazydocker-nvim = super.lazydocker-nvim.overrideAttrs { runtimeDeps = [ lazydocker @@ -1643,23 +1660,6 @@ assertNoAdditions { ]; }; - lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs { - dependencies = [ self.nvim-lspconfig ]; - }; - - lazy-nvim = super.lazy-nvim.overrideAttrs { - patches = [ ./patches/lazy-nvim/no-helptags.patch ]; - nvimSkipModules = [ - # Requires headless config option - "lazy.manage.task.init" - "lazy.manage.checker" - "lazy.manage.init" - "lazy.manage.runner" - "lazy.view.commands" - "lazy.build" - ]; - }; - LeaderF = super.LeaderF.overrideAttrs { nativeBuildInputs = [ python3.pkgs.setuptools ]; buildInputs = [ python3 ]; @@ -1821,6 +1821,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -1836,10 +1840,6 @@ assertNoAdditions { nvimRequireCheck = "lspsaga"; }; - lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; - ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs { # Other modules require setup call first nvimRequireCheck = "ltex_extra"; @@ -1946,13 +1946,6 @@ assertNoAdditions { ]; }; - mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs { - dependencies = with self; [ - mason-nvim - nvim-dap - ]; - }; - mason-nvim = super.mason-nvim.overrideAttrs { nvimSkipModules = [ # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' @@ -1962,6 +1955,13 @@ assertNoAdditions { ]; }; + mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs { + dependencies = with self; [ + mason-nvim + nvim-dap + ]; + }; + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs { dependencies = [ self.mason-nvim ]; }; @@ -2084,6 +2084,17 @@ assertNoAdditions { dependencies = [ self.ultisnips ]; }; + neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { + checkInputs = [ git ]; + dependencies = with self; [ + plenary-nvim + nui-nvim + ]; + nvimSkipModule = [ + "neo-tree.types.fixes.compat-0.10" + ]; + }; + neoconf-nvim = super.neoconf-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; @@ -2253,7 +2264,7 @@ assertNoAdditions { nvimSkipModules = "neotest-jest-assertions"; }; - neotest-mocha = super.neotest-mocha.overrideAttrs { + neotest-minitest = super.neotest-minitest.overrideAttrs { dependencies = with self; [ neotest nvim-nio @@ -2261,7 +2272,7 @@ assertNoAdditions { ]; }; - neotest-minitest = super.neotest-minitest.overrideAttrs { + neotest-mocha = super.neotest-mocha.overrideAttrs { dependencies = with self; [ neotest nvim-nio @@ -2365,14 +2376,16 @@ assertNoAdditions { ]; }; - neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { - checkInputs = [ git ]; + neovim-tips = super.neovim-tips.overrideAttrs { + dependencies = [ + self.nui-nvim + ]; + }; + + neovim-trunk = super.neovim-trunk.overrideAttrs { dependencies = with self; [ plenary-nvim - nui-nvim - ]; - nvimSkipModule = [ - "neo-tree.types.fixes.compat-0.10" + telescope-nvim ]; }; @@ -2387,19 +2400,6 @@ assertNoAdditions { ]; }; - neovim-trunk = super.neovim-trunk.overrideAttrs { - dependencies = with self; [ - plenary-nvim - telescope-nvim - ]; - }; - - neovim-tips = super.neovim-tips.overrideAttrs { - dependencies = [ - self.nui-nvim - ]; - }; - nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -2503,10 +2503,6 @@ assertNoAdditions { dependencies = [ self.nvim-dap ]; }; - nvim-dap-vscode-js = super.nvim-dap-vscode-js.overrideAttrs { - dependencies = [ self.nvim-dap ]; - }; - nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs { dependencies = [ self.nvim-dap ]; }; @@ -2540,6 +2536,10 @@ assertNoAdditions { dependencies = [ self.nvim-dap ]; }; + nvim-dap-vscode-js = super.nvim-dap-vscode-js.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs { dependencies = [ self.nvim-treesitter-legacy ]; }; @@ -2606,6 +2606,13 @@ assertNoAdditions { dependencies = [ self.nvim-java-core ]; }; + nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs { + dependencies = with self; [ + plenary-nvim + nvim-lspconfig + ]; + }; + nvim-lilypond-suite = super.nvim-lilypond-suite.overrideAttrs { nvimSkipModule = [ # Option not set immediately @@ -2615,13 +2622,6 @@ assertNoAdditions { ]; }; - nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs { - dependencies = with self; [ - plenary-nvim - nvim-lspconfig - ]; - }; - nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2647,6 +2647,7 @@ assertNoAdditions { nvim-navic ]; }; + nvim-navic = super.nvim-navic.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -2780,16 +2781,16 @@ assertNoAdditions { callPackage ./nvim-treesitter/overrides.nix { } self super ); - # TODO: raise warning at 26.04; drop at 26.11 - nvim-treesitter-legacy = super.nvim-treesitter-legacy.overrideAttrs ( - callPackage ./nvim-treesitter-legacy/overrides.nix { } self super - ); - nvim-treesitter-context = super.nvim-treesitter-context.overrideAttrs { # Meant for CI installing parsers nvimSkipModules = [ "install_parsers" ]; }; + # TODO: raise warning at 26.04; drop at 26.11 + nvim-treesitter-legacy = super.nvim-treesitter-legacy.overrideAttrs ( + callPackage ./nvim-treesitter-legacy/overrides.nix { } self super + ); + nvim-treesitter-pairs = super.nvim-treesitter-pairs.overrideAttrs { dependencies = [ self.nvim-treesitter-legacy ]; }; @@ -2921,6 +2922,14 @@ assertNoAdditions { nvimSkipModules = "omni-lightline"; }; + one-nvim = super.one-nvim.overrideAttrs (old: { + # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co' + # https://github.com/Th3Whit3Wolf/one-nvim/issues/23 + meta = old.meta // { + broken = true; + }; + }); + onedark-nvim = super.onedark-nvim.overrideAttrs { nvimSkipModules = [ # Requires global config value @@ -2935,14 +2944,6 @@ assertNoAdditions { configurePhase = "cd vim"; }; - one-nvim = super.one-nvim.overrideAttrs (old: { - # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co' - # https://github.com/Th3Whit3Wolf/one-nvim/issues/23 - meta = old.meta // { - broken = true; - }; - }); - opencode-nvim = super.opencode-nvim.overrideAttrs { runtimeDeps = [ curl @@ -2974,10 +2975,6 @@ assertNoAdditions { ]; }; - org-roam-nvim = super.org-roam-nvim.overrideAttrs { - dependencies = [ self.orgmode ]; - }; - org-notebook-nvim = super.org-notebook-nvim.overrideAttrs { dependencies = [ self.orgmode @@ -2989,6 +2986,10 @@ assertNoAdditions { ]; }; + org-roam-nvim = super.org-roam-nvim.overrideAttrs { + dependencies = [ self.orgmode ]; + }; + otter-nvim = super.otter-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; nvimSkipModules = [ @@ -3219,6 +3220,10 @@ assertNoAdditions { }); + rust-tools-nvim = super.rust-tools-nvim.overrideAttrs { + dependencies = [ self.nvim-lspconfig ]; + }; + rustaceanvim = super.rustaceanvim.overrideAttrs { checkInputs = [ # Optional integration @@ -3226,10 +3231,6 @@ assertNoAdditions { ]; }; - rust-tools-nvim = super.rust-tools-nvim.overrideAttrs { - dependencies = [ self.nvim-lspconfig ]; - }; - rzls-nvim = super.rzls-nvim.overrideAttrs { dependencies = [ self.roslyn-nvim ]; }; @@ -3253,10 +3254,6 @@ assertNoAdditions { scretch-nvim = super.scretch-nvim.overrideAttrs { }; - searchbox-nvim = super.searchbox-nvim.overrideAttrs { - dependencies = [ self.nui-nvim ]; - }; - search-and-replace-nvim = super.search-and-replace-nvim.overrideAttrs { runtimeDeps = [ fd @@ -3264,6 +3261,10 @@ assertNoAdditions { ]; }; + searchbox-nvim = super.searchbox-nvim.overrideAttrs { + dependencies = [ self.nui-nvim ]; + }; + sidekick-nvim = super.sidekick-nvim.overrideAttrs { runtimeDeps = [ copilot-language-server @@ -3466,6 +3467,7 @@ assertNoAdditions { maintainers = with lib.maintainers; [ fredeb ]; }; }); + telekasten-nvim = super.telekasten-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim @@ -3802,64 +3804,6 @@ assertNoAdditions { }; }); - vimacs = super.vimacs.overrideAttrs (old: { - buildPhase = '' - substituteInPlace bin/vim \ - --replace-fail '/usr/bin/vim' 'vim' \ - --replace-fail '/usr/bin/gvim' 'gvim' - # remove unnecessary duplicated bin wrapper script - rm -r plugin/vimacs - ''; - meta = old.meta // { - description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; - homepage = "http://algorithm.com.au/code/vimacs"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ millerjason ]; - }; - }); - - vimade = super.vimade.overrideAttrs { - checkInputs = with self; [ - # Optional providers - hlchunk-nvim - mini-nvim - snacks-nvim - ]; - }; - - vimsence = super.vimsence.overrideAttrs (old: { - meta = old.meta // { - description = "Discord rich presence for Vim"; - homepage = "https://github.com/hugolgst/vimsence"; - maintainers = with lib.maintainers; [ hugolgst ]; - }; - }); - - vimtex = super.vimtex.overrideAttrs { - checkInputs = with self; [ - # Optional integrations - fzf-lua - snacks-nvim - ]; - }; - - vimproc-vim = super.vimproc-vim.overrideAttrs { - buildInputs = [ which ]; - - # TODO: revisit - buildPhase = '' - substituteInPlace autoload/vimproc.vim \ - --replace-fail vimproc_mac.so vimproc_unix.so \ - --replace-fail vimproc_linux64.so vimproc_unix.so \ - --replace-fail vimproc_linux32.so vimproc_unix.so - make -f make_unix.mak - ''; - }; - - vimshell-vim = super.vimshell-vim.overrideAttrs { - dependencies = [ self.vimproc-vim ]; - }; - vim-addon-actions = super.vim-addon-actions.overrideAttrs { dependencies = with self; [ vim-addon-mw-utils @@ -4001,6 +3945,10 @@ assertNoAdditions { dependencies = with self; [ fzf-vim ]; }; + vim-gist = super.vim-gist.overrideAttrs { + dependencies = [ self.webapi-vim ]; + }; + # change the go_bin_path to point to a path in the nix store. See the code in # fatih/vim-go here # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 @@ -4033,10 +3981,6 @@ assertNoAdditions { ''; }; - vim-gist = super.vim-gist.overrideAttrs { - dependencies = [ self.webapi-vim ]; - }; - vim-grammarous = super.vim-grammarous.overrideAttrs { # use `:GrammarousCheck` to initialize checking # In neovim, you also want to use set @@ -4195,6 +4139,64 @@ assertNoAdditions { ]; }; + vimacs = super.vimacs.overrideAttrs (old: { + buildPhase = '' + substituteInPlace bin/vim \ + --replace-fail '/usr/bin/vim' 'vim' \ + --replace-fail '/usr/bin/gvim' 'gvim' + # remove unnecessary duplicated bin wrapper script + rm -r plugin/vimacs + ''; + meta = old.meta // { + description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; + homepage = "http://algorithm.com.au/code/vimacs"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ millerjason ]; + }; + }); + + vimade = super.vimade.overrideAttrs { + checkInputs = with self; [ + # Optional providers + hlchunk-nvim + mini-nvim + snacks-nvim + ]; + }; + + vimproc-vim = super.vimproc-vim.overrideAttrs { + buildInputs = [ which ]; + + # TODO: revisit + buildPhase = '' + substituteInPlace autoload/vimproc.vim \ + --replace-fail vimproc_mac.so vimproc_unix.so \ + --replace-fail vimproc_linux64.so vimproc_unix.so \ + --replace-fail vimproc_linux32.so vimproc_unix.so + make -f make_unix.mak + ''; + }; + + vimsence = super.vimsence.overrideAttrs (old: { + meta = old.meta // { + description = "Discord rich presence for Vim"; + homepage = "https://github.com/hugolgst/vimsence"; + maintainers = with lib.maintainers; [ hugolgst ]; + }; + }); + + vimshell-vim = super.vimshell-vim.overrideAttrs { + dependencies = [ self.vimproc-vim ]; + }; + + vimtex = super.vimtex.overrideAttrs { + checkInputs = with self; [ + # Optional integrations + fzf-lua + snacks-nvim + ]; + }; + virt-column-nvim = super.virt-column-nvim.overrideAttrs { # Meta file nvimSkipModules = "virt-column.config.types";