flake: use lib from the module system not the inputs
This commit is contained in:
parent
00000098d2
commit
000003d479
13
flake.nix
13
flake.nix
|
@ -9,18 +9,15 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixos-modules, nixpkgs-lib, ... }:
|
outputs = { nixos-modules, ... }: {
|
||||||
let
|
nixosModule = { config, lib, libS, ... }@args: {
|
||||||
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; });
|
_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
|
||||||
|
ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
|
||||||
|
in map
|
||||||
(file: ./. + "/${dir}/${file}")
|
(file: ./. + "/${dir}/${file}")
|
||||||
# assume that the nixos-modules repo is already imported if libS exists
|
# assume that the nixos-modules repo is already imported if libS exists
|
||||||
(lib.remove (lib.optionalString (lib.hasAttr "libS" args) "default.nix") (ls dir))
|
(lib.remove (lib.optionalString (lib.hasAttr "libS" args) "default.nix") (ls dir))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user