refactor(nvim): pull in vim plugins properly #425

Merged
jalil merged 1 commit from push-zzqktrqmxywr into main 2025-04-21 20:51:45 +02:00
2 changed files with 7 additions and 13 deletions

View file

@ -1,11 +0,0 @@
{ pkgs }:
let
overlay = pkgs.callPackage ./generated.nix {
inherit (pkgs.vimUtils) buildVimPlugin buildNeovimPlugin;
};
plugins = overlay pkgs pkgs;
in
{
inherit overlay;
inherit (plugins) nvim-silicon;
}

View file

@ -7,7 +7,12 @@
let let
cfg = config.jhome.nvim; cfg = config.jhome.nvim;
plugins = pkgs.vimPlugins; plugins = pkgs.vimPlugins;
extraPlugins = import ./extraPlugins { inherit pkgs; }; jExtraVimPlugins = pkgs.vimPlugins.extend (
pkgs.callPackage ./extraPlugins/generated.nix {
inherit (pkgs.vimUtils) buildVimPlugin;
inherit (pkgs.neovimUtils) buildNeovimPlugin;
}
);
in in
{ {
imports = [ imports = [
@ -78,7 +83,7 @@ in
} }
# Big packages that are kinda unnecessary # Big packages that are kinda unnecessary
(lib.mkIf (!cfg.reduceSize) { (lib.mkIf (!cfg.reduceSize) {
extraPlugins = [ extraPlugins.nvim-silicon ]; extraPlugins = [ jExtraVimPlugins.nvim-silicon ];
extraPackages = [ pkgs.silicon ]; extraPackages = [ pkgs.silicon ];
extraConfigLua = extraConfigLua =
# lua # lua