wrappers/standalone: simplify extend

This commit is contained in:
Matt Sturgeon 2025-01-20 14:00:08 +00:00
parent 00586f8f1b
commit 780d3eec72
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299

View file

@ -32,25 +32,19 @@ let
mkNvim = mkNvim =
mod: mod:
let let
modules = lib.toList mod;
nixvimConfig = evalNixvim { nixvimConfig = evalNixvim {
modules = [ modules = modules ++ [
mod
systemMod systemMod
]; ];
inherit extraSpecialArgs; inherit extraSpecialArgs;
}; };
extend = extension: mkNvim (modules ++ lib.toList extension);
in in
nixvimConfig.config.build.package.overrideAttrs (old: { nixvimConfig.config.build.package.overrideAttrs (old: {
passthru = old.passthru or { } // rec { passthru = old.passthru or { } // {
inherit (nixvimConfig) config options; inherit (nixvimConfig) config options;
extend = inherit extend;
extension:
mkNvim {
imports = [
mod
extension
];
};
nixvimExtend = lib.warn "<nixvim>.nixvimExtend has been renamed to <nixvim>.extend" extend; nixvimExtend = lib.warn "<nixvim>.nixvimExtend has been renamed to <nixvim>.extend" extend;
}; };
}); });