yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixup(buildClan): split up the inner-module into: {forSystem, forName}

Browse Source 
I am preparing this such that we can move the forName modules into the
defaults for the deferred module outputs and the forSystem modules are
added later and only for the 'configsPerSystem' where we actually need
the system modules
This commit is contained in:
Johannes Kirschbauer
2025-04-15 15:02:37 +02:00
parent 14ace40820
commit af04bf547f
4 changed files with 101 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/build-clan/module.nix
View File

@@ -59,17 +59,25 @@ let
nixpkgs.lib.nixosSystem {
modules =
let
innerModule = lib.modules.importApply ./inner-module.nix {
innerModule = lib.modules.importApply ./machineModules/forSystem.nix {
inherit
system
name
pkgs
pkgsForSystem
system
;
clanConfiguration = config;
};
staticModules = (
lib.modules.importApply ./machineModules/forName.nix {
inherit
name
directory
;
}
);
in
[
(config.outputs.moduleForMachine.${name} or { })
staticModules
innerModule
{
config.clan.core.module = innerModule;
@@ -90,13 +98,24 @@ let
nix-darwin.lib.darwinSystem {
modules = [
(config.outputs.moduleForMachine.${name} or { })
(lib.modules.importApply ./inner-module.nix {
# We split the modules to reduce the number of dependencies
# This module only depends on the machine name
# and the directory
(lib.modules.importApply ./machineModules/forName.nix {
inherit
system
name
pkgs
directory
;
})
# This module depends on the system and pkgs
# It contains optional logic to override 'nixpkgs.pkgs' and 'nixpkgs.hostPlatform'
# and other 'system' related logic
(lib.modules.importApply ./machineModules/forSystem.nix {
inherit
pkgs
pkgsForSystem
system
;
clanConfiguration = config;
})
];
@@ -170,7 +189,26 @@ in
# See: 'staticModules' in the moduleForMachine option
# This is only necessary because clan.machines doesn't include all machines
# There can other sources: i.e. inventory
(lib.mapAttrs (_: _: { }) config.inventory.machines)
(lib.mapAttrs (
name: v:
(
{ _class, ... }:
{
imports = (v.machineImports or [ ]);
config = lib.optionalAttrs (_class == "nixos") {
clan.core.settings = {
inherit (config.inventory.meta) name icon;
inherit directory;
machine = {
inherit name;
};
};
};
}
)
) inventoryClass.machines)
# The user can define some machine config here
# i.e. 'clan.machines.jon = ...'