mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 12:29:19 -08:00
refactor: system -> systemConfig
This commit is contained in:
parent
512b1fc75b
commit
45705650bb
31 changed files with 127 additions and 131 deletions
|
|
@ -11,7 +11,7 @@
|
|||
networkModule = {
|
||||
config,
|
||||
name,
|
||||
system,
|
||||
systemConfig,
|
||||
...
|
||||
}: let
|
||||
knownNetworks = {
|
||||
|
|
@ -68,8 +68,8 @@
|
|||
);
|
||||
postfix = mkIf (config.macAddress != null) (mkOptionDefault (eui64 config.macAddress));
|
||||
};
|
||||
domain = mkOptionDefault "${config.name}.${system.access.domain}";
|
||||
fqdn = mkOptionDefault (mapNullable (domain: "${system.access.hostName}.${domain}") config.domain);
|
||||
domain = mkOptionDefault "${config.name}.${systemConfig.access.domain}";
|
||||
fqdn = mkOptionDefault (mapNullable (domain: "${systemConfig.access.hostName}.${domain}") config.domain);
|
||||
address6 = mkIf config.slaac.enable (mkOptionDefault "${config.slaac.prefix}:${config.slaac.postfix}");
|
||||
};
|
||||
};
|
||||
|
|
@ -79,7 +79,7 @@ in {
|
|||
type = attrsOf (submoduleWith {
|
||||
modules = [networkModule];
|
||||
specialArgs = {
|
||||
system = config;
|
||||
systemConfig = config;
|
||||
};
|
||||
});
|
||||
default = {};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue