vimPlugins: move extras to separate files per source

Make it more obvious where certain plugins come from.
This commit is contained in:
Austin Horstman
2025-03-24 21:41:42 -05:00
parent 506a6a0ee9
commit 060d42bb41
4 changed files with 111 additions and 108 deletions
@@ -19,12 +19,15 @@ let
initialPackages = self: { };
plugins = callPackage ./generated.nix {
inherit buildVimPlugin;
luaPackagePlugins = callPackage ./luaPackagePlugins.nix {
inherit (neovimUtils) buildNeovimPlugin;
};
extras = callPackage ./extras.nix {
nodePackagePlugins = callPackage ./nodePackagePlugins.nix {
inherit buildVimPlugin;
};
plugins = callPackage ./generated.nix {
inherit buildVimPlugin;
inherit (neovimUtils) buildNeovimPlugin;
};
@@ -44,7 +47,8 @@ let
in
lib.pipe initialPackages [
(extends plugins)
(extends extras)
(extends luaPackagePlugins)
(extends nodePackagePlugins)
(extends overrides)
(extends aliases)
lib.makeExtensible
@@ -1,104 +0,0 @@
{
lib,
buildVimPlugin,
buildNeovimPlugin,
nodePackages,
neovim-unwrapped,
}:
let
luaPackages = neovim-unwrapped.lua.pkgs;
in
self: super:
(
let
nodePackageNames = [
"coc-cmake"
"coc-docker"
"coc-emmet"
"coc-eslint"
"coc-explorer"
"coc-flutter"
"coc-git"
"coc-go"
"coc-haxe"
"coc-highlight"
"coc-html"
"coc-java"
"coc-jest"
"coc-json"
"coc-lists"
"coc-ltex"
"coc-markdownlint"
"coc-pairs"
"coc-prettier"
"coc-r-lsp"
"coc-rls"
"coc-rust-analyzer"
"coc-sh"
"coc-smartf"
"coc-snippets"
"coc-solargraph"
"coc-spell-checker"
"coc-sqlfluff"
"coc-stylelint"
"coc-sumneko-lua"
"coc-tabnine"
"coc-texlab"
"coc-tsserver"
"coc-ultisnips"
"coc-vetur"
"coc-vimlsp"
"coc-vimtex"
"coc-wxml"
"coc-yaml"
"coc-yank"
];
nodePackage2VimPackage =
name:
buildVimPlugin {
pname = name;
inherit (nodePackages.${name}) version meta;
src = "${nodePackages.${name}}/lib/node_modules/${name}";
};
in
lib.genAttrs nodePackageNames nodePackage2VimPackage
)
// (
let
luarocksPackageNames = [
"fidget-nvim"
"gitsigns-nvim"
"image-nvim"
"lsp-progress-nvim"
"lualine-nvim"
"luasnip"
"lush-nvim"
"lz-n"
"lze"
"lzextras"
"lzn-auto-require"
"middleclass"
"mini-test"
"neorg"
"neotest"
"nui-nvim"
"nvim-cmp"
"nvim-nio"
"nvim-web-devicons"
"oil-nvim"
"orgmode"
"papis-nvim"
"rest-nvim"
"rocks-config-nvim"
"rtp-nvim"
"telescope-manix"
"telescope-nvim"
];
toVimPackage =
name:
buildNeovimPlugin {
luaAttr = luaPackages.${name};
};
in
lib.genAttrs luarocksPackageNames toVimPackage
)
@@ -0,0 +1,45 @@
{
lib,
buildNeovimPlugin,
neovim-unwrapped,
}:
final: prev:
let
luaPackages = neovim-unwrapped.lua.pkgs;
luarocksPackageNames = [
"fidget-nvim"
"gitsigns-nvim"
"image-nvim"
"lsp-progress-nvim"
"lualine-nvim"
"luasnip"
"lush-nvim"
"lz-n"
"lze"
"lzextras"
"lzn-auto-require"
"middleclass"
"mini-test"
"neorg"
"neotest"
"nui-nvim"
"nvim-cmp"
"nvim-nio"
"nvim-web-devicons"
"oil-nvim"
"orgmode"
"papis-nvim"
"rest-nvim"
"rocks-config-nvim"
"rtp-nvim"
"telescope-manix"
"telescope-nvim"
];
in
lib.genAttrs luarocksPackageNames (
name:
buildNeovimPlugin {
luaAttr = luaPackages.${name};
}
)
@@ -0,0 +1,58 @@
{
lib,
buildVimPlugin,
nodePackages,
}:
final: prev:
let
nodePackageNames = [
"coc-cmake"
"coc-docker"
"coc-emmet"
"coc-eslint"
"coc-explorer"
"coc-flutter"
"coc-git"
"coc-go"
"coc-haxe"
"coc-highlight"
"coc-html"
"coc-java"
"coc-jest"
"coc-json"
"coc-lists"
"coc-ltex"
"coc-markdownlint"
"coc-pairs"
"coc-prettier"
"coc-r-lsp"
"coc-rls"
"coc-rust-analyzer"
"coc-sh"
"coc-smartf"
"coc-snippets"
"coc-solargraph"
"coc-spell-checker"
"coc-sqlfluff"
"coc-stylelint"
"coc-sumneko-lua"
"coc-tabnine"
"coc-texlab"
"coc-tsserver"
"coc-ultisnips"
"coc-vetur"
"coc-vimlsp"
"coc-vimtex"
"coc-wxml"
"coc-yaml"
"coc-yank"
];
in
lib.genAttrs nodePackageNames (
name:
buildVimPlugin {
pname = name;
inherit (nodePackages.${name}) version meta;
src = "${nodePackages.${name}}/lib/node_modules/${name}";
}
)