From 2eb9a106acb0ce4efd095f21f92a696d33e4eab6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 21 Nov 2025 13:33:52 -0600 Subject: [PATCH] vimPlugins: sorted files Keep files automatically sorted / linted for sorting. Signed-off-by: Austin Horstman --- .../editors/vim/plugins/aliases.nix | 52 ++++++++++--------- .../editors/vim/plugins/cocPlugins.nix | 6 +-- .../editors/vim/plugins/luaPackagePlugins.nix | 4 +- .../vim/plugins/nodePackagePlugins.nix | 2 + .../editors/vim/plugins/overrides.nix | 16 +++--- 5 files changed, 44 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index a6f6be298482..0d4af7b1cd9f 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -36,24 +36,21 @@ in mapAliases ( with prev; { + # keep-sorted start case=no + "sourcemap.vim" = sourcemap-vim; airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 bats = bats-vim; blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17 BufOnly = BufOnly-vim; calendar = calendar-vim; + caw = caw-vim; + chad = chadtree; coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01 coffee-script = vim-coffee-script; coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18 - Solarized = vim-colors-solarized; - solarized = vim-colors-solarized; - spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27 - SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27 - sparkup = throw "the upstream repository got deleted"; # added 2025-08-06 colors-solarized = vim-colors-solarized; - caw = caw-vim; - chad = chadtree; colorsamplerpack = Colour-Sampler-Pack; Colour_Sampler_Pack = Colour-Sampler-Pack; command_T = command-t; # backwards compat, added 2014-10-18 @@ -62,8 +59,8 @@ mapAliases ( concealedyank = concealedyank-vim; context-filetype = context_filetype-vim; Cosco = cosco-vim; - css_color_5056 = vim-css-color; CSApprox = csapprox; + css_color_5056 = vim-css-color; csv = csv-vim; ctrlp = ctrlp-vim; cute-python = vim-cute-python; @@ -76,25 +73,25 @@ mapAliases ( ethersync = lib.warnOnInstantiate "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31 extradite = vim-extradite; feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09 - fugitive = vim-fugitive; floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26 fruzzy = throw "vimPlugins.fruzzy did not update since 2019-10-28 and uses EOL version of Nim"; # Added 2025-11-12 + fugitive = vim-fugitive; fzfWrapper = fzf-wrapper; ghc-mod-vim = ghcmod-vim; ghcmod = ghcmod-vim; - gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10 - goyo = goyo-vim; Gist = vim-gist; gitgutter = vim-gitgutter; + gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10 + goyo = goyo-vim; gundo = gundo-vim; Gundo = gundo-vim; # backwards compat, added 2015-10-03 + haskellconceal = vim-haskellconceal; haskellConceal = vim-haskellconceal; # backwards compat, added 2014-10-18 haskellConcealPlus = vim-haskellConcealPlus; - haskellconceal = vim-haskellconceal; hier = vim-hier; hlint-refactor = hlint-refactor-vim; - hoogle = vim-hoogle; Hoogle = vim-hoogle; + hoogle = vim-hoogle; indent-blankline-nvim-lua = indent-blankline-nvim; # backwards compat, added 2021-07-05 ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; @@ -109,8 +106,6 @@ mapAliases ( neuron-nvim = throw "neuron.nvim has been removed: archived repository 2023-02-19"; # Added 2025-09-10 nvim-ts-rainbow = throw "nvim-ts-rainbow has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 nvim-ts-rainbow2 = throw "nvim-ts-rainbow2 has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 - The_NERD_Commenter = nerdcommenter; - The_NERD_tree = nerdtree; open-browser = open-browser-vim; pathogen = vim-pathogen; peskcolor-vim = throw "peskcolor-vim has been removed: abandoned by upstream"; # Added 2024-08-23 @@ -120,39 +115,45 @@ mapAliases ( quickrun = vim-quickrun; rainbow_parentheses = rainbow_parentheses-vim; repeat = vim-repeat; - riv = riv-vim; rhubarb = vim-rhubarb; + riv = riv-vim; rust-tools-nvim = lib.warnOnInstantiate "rust-tools-nvim is abandoned by upstream; you should use rustaceanvim" rust-tools-nvim; sensible = vim-sensible; signature = vim-signature; - snipmate = vim-snipmate; - sourcemap = sourcemap-vim; - "sourcemap.vim" = sourcemap-vim; - Spacegray-vim = throw "Spacegray-vim has been removed: abandoned by upstream"; # Added 2025-03-24 - surround = vim-surround; sleuth = vim-sleuth; + snipmate = vim-snipmate; + Solarized = vim-colors-solarized; + solarized = vim-colors-solarized; solidity = vim-solidity; + sourcemap = sourcemap-vim; + Spacegray-vim = throw "Spacegray-vim has been removed: abandoned by upstream"; # Added 2025-03-24 + SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27 + spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27 + sparkup = throw "the upstream repository got deleted"; # added 2025-08-06 ssr = ssr-nvim; # Added 2025-08-31 stylish-haskell = vim-stylish-haskell; stylishHaskell = vim-stylish-haskell; # backwards compat, added 2014-10-18 suda-vim = vim-suda; # backwards compat, added 2024-05-16 Supertab = supertab; + surround = vim-surround; Syntastic = syntastic; SyntaxRange = vim-SyntaxRange; table-mode = vim-table-mode; - taglist = taglist-vim; tabpagebuffer = tabpagebuffer-vim; tabpagecd = vim-tabpagecd; Tabular = tabular; Tagbar = tagbar; + taglist = taglist-vim; + The_NERD_Commenter = nerdcommenter; + The_NERD_tree = nerdtree; thumbnail = thumbnail-vim; tlib = tlib_vim; tmux-navigator = vim-tmux-navigator; tmuxNavigator = vim-tmux-navigator; # backwards compat, added 2014-10-18 todo-nvim = throw "todo-nvim has been removed: abandoned by upstream"; # Added 2023-08-23 tslime = tslime-vim; - unite = unite-vim; UltiSnips = ultisnips; + unite = unite-vim; vim-addon-vim2nix = vim2nix; vim-sourcetrail = throw "vim-sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14 vimproc = vimproc-vim; @@ -161,10 +162,11 @@ mapAliases ( watchdogs = vim-watchdogs; WebAPI = webapi-vim; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 - yankring = YankRing-vim; - Yankring = YankRing-vim; xterm-color-table = xterm-color-table-vim; + Yankring = YankRing-vim; + yankring = YankRing-vim; zeavim = zeavim-vim; + # keep-sorted end } // deprecations ) diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 2c89ba9de6a6..41855caca636 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -7,6 +7,8 @@ final: prev: let cocPackages = [ + # keep-sorted start + "coc-basedpyright" "coc-clangd" "coc-cmake" "coc-css" @@ -31,7 +33,6 @@ let "coc-r-lsp" "coc-rust-analyzer" "coc-sh" - "coc-sh" "coc-smartf" "coc-snippets" "coc-solargraph" @@ -42,13 +43,12 @@ let "coc-tabnine" "coc-texlab" "coc-toml" - "coc-toml" "coc-vimlsp" "coc-vimtex" "coc-wxml" - "coc-basedpyright" "coc-yaml" "coc-yank" + # keep-sorted end ]; in lib.genAttrs cocPackages ( diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index 851feed0f3e4..a98d88731992 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -8,6 +8,7 @@ let luaPackages = neovim-unwrapped.lua.pkgs; luarocksPackageNames = [ + # # keep-sorted start case=no "fidget-nvim" "fzf-lua" "gitsigns-nvim" @@ -37,10 +38,11 @@ let "rest-nvim" "rocks-config-nvim" "rocks-nvim" - "rustaceanvim" "rtp-nvim" + "rustaceanvim" "telescope-manix" "telescope-nvim" + # keep-sorted end ]; in lib.genAttrs luarocksPackageNames ( diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index c587531c7ce0..b86c1ac2eb5e 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -6,8 +6,10 @@ final: prev: let nodePackageNames = [ + # # keep-sorted start case=no "coc-go" "coc-tsserver" + # keep-sorted end ]; in lib.genAttrs nodePackageNames ( diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 230e5b083738..1c72c9719cf2 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -143,6 +143,7 @@ let in assertNoAdditions { + # keep-sorted start case=no block=yes newline_separated=yes advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { checkInputs = with self; [ fzf-lua @@ -2553,6 +2554,13 @@ 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 ]; }; @@ -4228,11 +4236,5 @@ assertNoAdditions { --replace-fail "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" ''; }; - - nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs { - dependencies = with self; [ - plenary-nvim - nvim-lspconfig - ]; - }; + # keep-sorted end }