diff --git a/pkgs/applications/editors/vim/plugins/corePlugins.nix b/pkgs/applications/editors/vim/plugins/corePlugins.nix new file mode 100644 index 000000000000..dde152b0837e --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/corePlugins.nix @@ -0,0 +1,31 @@ +{ + symlinkJoin, +}: +final: prev: { + + corePlugins = symlinkJoin { + name = "core-vim-plugins"; + paths = with final; [ + # plugin managers + lazy-nvim + mini-deps + packer-nvim + vim-plug + + # core dependencies + plenary-nvim + + # popular plugins + mini-nvim + nvim-cmp + nvim-lspconfig + nvim-treesitter + vim-airline + vim-fugitive + vim-surround + ]; + + meta.description = "Collection of popular vim plugins (for internal testing purposes)"; + }; + +} diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index 0bf9f74f2ede..4937bb38f670 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -48,6 +48,8 @@ let inherit (neovimUtils) buildNeovimPlugin; }; + corePlugins = callPackage ./corePlugins.nix { }; + # TL;DR # * Add your plugin to ./vim-plugin-names # * run ./update.py @@ -66,6 +68,7 @@ lib.pipe initialPackages [ (extends luaPackagePlugins) (extends nodePackagePlugins) (extends nonGeneratedPlugins) + (extends corePlugins) (extends overrides) (extends aliases) lib.makeExtensible diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 6baecc1ec162..6259dadbc518 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -9,7 +9,6 @@ fetchurl, neovimUtils, replaceVars, - symlinkJoin, # Language dependencies fetchYarnDeps, mkYarnModules, @@ -137,36 +136,6 @@ let buildNeoVimPlugin = throw "New plugin definitions should be done outside `overrides.nix`"; in { - corePlugins = symlinkJoin { - name = "core-vim-plugins"; - paths = with self; [ - # plugin managers - lazy-nvim - mini-deps - packer-nvim - vim-plug - - # core dependencies - plenary-nvim - - # popular plugins - mini-nvim - nvim-cmp - nvim-lspconfig - nvim-treesitter - vim-airline - vim-fugitive - vim-surround - ]; - - meta = { - description = "Collection of popular vim plugins (for internal testing purposes)"; - }; - }; - - ####################### - # Regular overrides - advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { checkInputs = with self; [ snacks-nvim