buildClan: also import clanCore module

This commit is contained in:
Jörg Thalheim
2023-08-30 16:41:10 +02:00
parent 10e4db7c19
commit 1d496c6363
3 changed files with 5 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
{ nixpkgs, lib }: { nixpkgs, clan, lib }:
{ directory # The directory containing the machines subdirectory { directory # The directory containing the machines subdirectory
, specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available , 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} = { ... } , machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
@@ -18,6 +18,7 @@ let
(name: _: (name: _:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
modules = [ modules = [
clan.nixosModules.clanCore
(machineSettings name) (machineSettings name)
(machines.${name} or { }) (machines.${name} or { })
]; ];

View File

@@ -1,4 +1,4 @@
{ lib, nixpkgs, ... }: { lib, clan, nixpkgs, ... }:
{ {
findNixFiles = folder: findNixFiles = folder:
lib.mapAttrs' lib.mapAttrs'
@@ -14,5 +14,5 @@
jsonschema = import ./jsonschema { inherit lib; }; jsonschema = import ./jsonschema { inherit lib; };
buildClan = import ./build-clan { inherit lib nixpkgs; }; buildClan = import ./build-clan { inherit lib clan nixpkgs; };
} }

View File

@@ -7,6 +7,6 @@
]; ];
flake.lib = import ./default.nix { flake.lib = import ./default.nix {
inherit lib; inherit lib;
inherit (inputs) nixpkgs; inherit (inputs) nixpkgs clan;
}; };
} }