lib: update to mkImage builder
This commit is contained in:
parent
301132e17e
commit
97be7a19c6
1 changed files with 34 additions and 5 deletions
|
|
@ -17,6 +17,11 @@
|
||||||
consoleModules = nixosModules + "/console";
|
consoleModules = nixosModules + "/console";
|
||||||
workstationModules = nixosModules + "/workstation";
|
workstationModules = nixosModules + "/workstation";
|
||||||
serverModules = nixosModules + "/server";
|
serverModules = nixosModules + "/server";
|
||||||
|
minimalCore = [
|
||||||
|
(baseModules + "/options.nix")
|
||||||
|
(baseModules + "/admin.nix")
|
||||||
|
(baseModules + "/ssh.nix")
|
||||||
|
];
|
||||||
core = [baseModules hardwareModules consoleModules appearanceModules hm agenix];
|
core = [baseModules hardwareModules consoleModules appearanceModules hm agenix];
|
||||||
hostModules = "${self}/hosts";
|
hostModules = "${self}/hosts";
|
||||||
|
|
||||||
|
|
@ -54,7 +59,6 @@
|
||||||
inherit role type;
|
inherit role type;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
[(hostModules + "/${hostname}")]
|
|
||||||
additionalModules
|
additionalModules
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
@ -72,6 +76,7 @@
|
||||||
role = "workstation";
|
role = "workstation";
|
||||||
additionalModules = concatLists [
|
additionalModules = concatLists [
|
||||||
core
|
core
|
||||||
|
[(hostModules + "/${hostname}")]
|
||||||
[workstationModules]
|
[workstationModules]
|
||||||
additionalModules
|
additionalModules
|
||||||
];
|
];
|
||||||
|
|
@ -82,7 +87,7 @@
|
||||||
hostname,
|
hostname,
|
||||||
system,
|
system,
|
||||||
type,
|
type,
|
||||||
platform,
|
profile,
|
||||||
services,
|
services,
|
||||||
additionalModules ? [],
|
additionalModules ? [],
|
||||||
specialArgs ? {},
|
specialArgs ? {},
|
||||||
|
|
@ -92,15 +97,39 @@
|
||||||
role = "server";
|
role = "server";
|
||||||
additionalModules = concatLists [
|
additionalModules = concatLists [
|
||||||
(singleton {
|
(singleton {
|
||||||
ooknet.host = {
|
ooknet.server = {
|
||||||
inherit platform services;
|
inherit services;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
core
|
core
|
||||||
|
[(serverModules + "/profiles/${profile}")]
|
||||||
[serverModules]
|
[serverModules]
|
||||||
additionalModules
|
additionalModules
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mkImage = {
|
||||||
|
profile,
|
||||||
|
system,
|
||||||
|
hostname,
|
||||||
|
additionalModules ? [],
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
mkNixos {
|
||||||
|
specialArgs = {inherit keys inputs lib self;};
|
||||||
|
modules = concatLists [
|
||||||
|
(singleton {
|
||||||
|
networking.hostName = hostname;
|
||||||
|
nixpkgs = {
|
||||||
|
hostPlatform = mkDefault system;
|
||||||
|
flake.source = nixpkgs.outPath;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
["${self}/modules/server/profiles/${profile}/base"]
|
||||||
|
minimalCore
|
||||||
|
additionalModules
|
||||||
|
];
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
inherit mkServer mkWorkstation;
|
inherit mkServer mkWorkstation mkImage;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue