NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-26 15:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wrapper: migrate to makeNeovimUnstable wrapper

Browse source
This commit is contained in:
Frothy 2024-02-29 15:15:47 -05:00
parent 685a6eaade
commit d29934b859
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/default.nix
View file

@ -6,8 +6,9 @@ inputs: {
extraSpecialArgs ? {}, extraSpecialArgs ? {},
}: let }: let
inherit (builtins) map filter isString toString getAttr; inherit (builtins) map filter isString toString getAttr;
inherit (pkgs) wrapNeovim vimPlugins; inherit (pkgs) wrapNeovimUnstable vimPlugins;
inherit (pkgs.vimUtils) buildVimPlugin; inherit (pkgs.vimUtils) buildVimPlugin;
inherit (pkgs.neovimUtils) makeNeovimConfig;
extendedLib = import ../lib/stdlib-extended.nix lib; extendedLib = import ../lib/stdlib-extended.nix lib;
@ -57,21 +58,22 @@ inputs: {
(f: f != null) (f: f != null)
plugins); plugins);
neovim = wrapNeovim vimOptions.package { plugins =
(buildConfigPlugins vimOptions.startPlugins)
++ (map (package: {
plugin = package;
optional = false;
})
(buildConfigPlugins
vimOptions.optPlugins));
neovim = wrapNeovimUnstable vimOptions.package (makeNeovimConfig {
inherit (vimOptions) viAlias; inherit (vimOptions) viAlias;
inherit (vimOptions) vimAlias; inherit (vimOptions) vimAlias;
inherit extraLuaPackages; inherit extraLuaPackages;
inherit plugins;
configure = {
customRC = vimOptions.builtConfigRC; customRC = vimOptions.builtConfigRC;
});
packages.myVimPackage = {
start = buildConfigPlugins vimOptions.startPlugins;
opt = buildConfigPlugins vimOptions.optPlugins;
};
};
};
in { in {
inherit (module) options config; inherit (module) options config;
inherit (module._module.args) pkgs; inherit (module._module.args) pkgs;