flake: use lib from the module system not the inputs
This commit is contained in:
parent
00000098d2
commit
000003d479
29
flake.nix
29
flake.nix
|
@ -9,22 +9,19 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = { nixos-modules, nixpkgs-lib, ... }:
|
||||
let
|
||||
inherit (nixpkgs-lib) lib;
|
||||
ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
|
||||
in
|
||||
{
|
||||
nixosModule = { config, libS, ... }@args: {
|
||||
_module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
|
||||
outputs = { nixos-modules, ... }: {
|
||||
nixosModule = { config, lib, libS, ... }@args: {
|
||||
_module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
|
||||
|
||||
imports = [
|
||||
nixos-modules.nixosModules.default
|
||||
] ++ (dir: map
|
||||
(file: ./. + "/${dir}/${file}")
|
||||
# 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";
|
||||
};
|
||||
imports = [
|
||||
nixos-modules.nixosModules.default
|
||||
] ++ (dir: let
|
||||
ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
|
||||
in map
|
||||
(file: ./. + "/${dir}/${file}")
|
||||
# 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";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue