From f658a4a5cceb55fb544124e648773d403a9eba56 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Tue, 16 Dec 2025 14:52:00 -0500 Subject: [PATCH] fix: Repair when overrides for device types gets merged --- hosts/default.nix | 5 +++-- inventory.nix | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 1766d35..352302d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -170,10 +170,11 @@ let lib.mapAttrsToList ( deviceKey: deviceConfig: let - usePrefix = deviceConfig.ugaif.host.useHostPrefix or true; - hostName = mkHostName prefix deviceKey usePrefix; # Merge: base config -> overrides -> device-specific config 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 { name = hostName; diff --git a/inventory.nix b/inventory.nix index 003c368..3054334 100644 --- a/inventory.nix +++ b/inventory.nix @@ -86,9 +86,11 @@ # Creates: nix-builder (without lxc prefix) nix-lxc = { devices = { - "nix-builder" = { - ugaif.host.useHostPrefix = false; - }; + "nix-builder" = { }; + "usda-dash" = { }; + }; + overrides = { + ugaif.host.useHostPrefix = false; }; };