buildClan: also import clanCore module
This commit is contained in:
parent
10e4db7c19
commit
1d496c6363
|
@ -1,4 +1,4 @@
|
|||
{ nixpkgs, lib }:
|
||||
{ nixpkgs, clan, lib }:
|
||||
{ directory # The directory containing the machines subdirectory
|
||||
, specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available
|
||||
, machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
|
||||
|
@ -18,6 +18,7 @@ let
|
|||
(name: _:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
modules = [
|
||||
clan.nixosModules.clanCore
|
||||
(machineSettings name)
|
||||
(machines.${name} or { })
|
||||
];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, nixpkgs, ... }:
|
||||
{ lib, clan, nixpkgs, ... }:
|
||||
{
|
||||
findNixFiles = folder:
|
||||
lib.mapAttrs'
|
||||
|
@ -14,5 +14,5 @@
|
|||
|
||||
jsonschema = import ./jsonschema { inherit lib; };
|
||||
|
||||
buildClan = import ./build-clan { inherit lib nixpkgs; };
|
||||
buildClan = import ./build-clan { inherit lib clan nixpkgs; };
|
||||
}
|
||||
|
|
|
@ -7,6 +7,6 @@
|
|||
];
|
||||
flake.lib = import ./default.nix {
|
||||
inherit lib;
|
||||
inherit (inputs) nixpkgs;
|
||||
inherit (inputs) nixpkgs clan;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user