UGA-Innovation-Factory/athenix
3
1
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

fix: Repair when overrides for device types gets merged

Browse Source
This commit is contained in:
UGA Innovation Factory
2025-12-16 14:52:00 -05:00
committed by Hunter Halloran
parent 7ac453e1f7
commit f658a4a5cc
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hosts/default.nix
View File

@@ -170,10 +170,11 @@ let
lib.mapAttrsToList ( lib.mapAttrsToList (
deviceKey: deviceConfig: deviceKey: deviceConfig:
let let
usePrefix = deviceConfig.ugaif.host.useHostPrefix or true;
hostName = mkHostName prefix deviceKey usePrefix;
# Merge: base config -> overrides -> device-specific config # Merge: base config -> overrides -> device-specific config
mergedConfig = lib.recursiveUpdate (lib.recursiveUpdate baseConfig overrides) deviceConfig; mergedConfig = lib.recursiveUpdate (lib.recursiveUpdate baseConfig overrides) deviceConfig;
# Check useHostPrefix from the merged config
usePrefix = mergedConfig.ugaif.host.useHostPrefix or true;
hostName = mkHostName prefix deviceKey usePrefix;
in in
{ {
name = hostName; name = hostName;

8
inventory.nix
View File

@@ -86,9 +86,11 @@
# Creates: nix-builder (without lxc prefix) # Creates: nix-builder (without lxc prefix)
nix-lxc = { nix-lxc = {
devices = { devices = {
"nix-builder" = { "nix-builder" = { };
ugaif.host.useHostPrefix = false; "usda-dash" = { };
}; };
overrides = {
ugaif.host.useHostPrefix = false;
}; };
}; };