flake: use lib from the module system not the inputs

This commit is contained in:
Sandro - 2023-06-02 11:41:18 +02:00
parent 00000098d2
commit 000003d479
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 13 additions and 16 deletions

View File

@ -9,22 +9,19 @@
}; };
}; };
outputs = { nixos-modules, nixpkgs-lib, ... }: outputs = { nixos-modules, ... }: {
let nixosModule = { config, lib, libS, ... }@args: {
inherit (nixpkgs-lib) lib; _module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
in
{
nixosModule = { config, libS, ... }@args: {
_module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
imports = [ imports = [
nixos-modules.nixosModules.default nixos-modules.nixosModules.default
] ++ (dir: map ] ++ (dir: let
(file: ./. + "/${dir}/${file}") ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
# assume that the nixos-modules repo is already imported if libS exists in map
(lib.remove (lib.optionalString (lib.hasAttr "libS" args) "default.nix") (ls dir)) (file: ./. + "/${dir}/${file}")
) "modules"; # assume that the nixos-modules repo is already imported if libS exists
}; (lib.remove (lib.optionalString (lib.hasAttr "libS" args) "default.nix") (ls dir))
) "modules";
}; };
};
} }