gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: system -> systemConfig

Browse source
This commit is contained in:
arcnmx 2024-06-23 10:06:36 -07:00
parent 512b1fc75b
commit 45705650bb
31 changed files with 127 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/system/exports/services.nix
View file

@ -76,7 +76,7 @@
};
};
serviceModule = {
system,
systemConfig,
config,
name,
machine,
@ -101,7 +101,7 @@
type = attrsOf (submoduleWith {
modules = [portModule];
specialArgs = {
inherit gensokyo-zone machine system;
inherit gensokyo-zone machine systemConfig;
service = config;
};
});
@ -153,7 +153,7 @@
};
nixosModule = {
config,
system,
systemConfig,
...
}: let
mapAssertion = service: a: let
@ -163,7 +163,7 @@
// {
message = "system.exports.${service.name}: " + res.message or "assertion failed";
};
assertions = mapAttrsToList (_: service: map (mapAssertion service) service.nixos.assertions) system.exports.services;
assertions = mapAttrsToList (_: service: map (mapAssertion service) service.nixos.assertions) systemConfig.exports.services;
in {
config = {
assertions = mkMerge assertions;
@ -183,7 +183,6 @@ in {
specialArgs = {
inherit gensokyo-zone;
machine = name;
system = config;
systemConfig = config;
};
});