refactor(nvim): pull in vim plugins properly
This way should be faster to evaluate and more correct as we follow the way done in nixpkgs.
This commit is contained in:
parent
5358188ad1
commit
46ba379d08
2 changed files with 7 additions and 13 deletions
|
@ -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;
|
|
||||||
}
|
|
|
@ -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
|
||||||
|
|
Loading…
Add table
Reference in a new issue