fix flake and roles in json

This commit is contained in:
Tyler Starr 2025-06-22 22:02:09 -07:00
parent ced0b5ec15
commit 802b998bfd
2 changed files with 3 additions and 11 deletions

View File

@ -27,7 +27,7 @@
hostname = "${hostname}"; hostname = "${hostname}";
}; };
modules = [ modules = [
./hosts/${hostConfig.role}/configuration.nix ./hosts/${hostname}/configuration.nix
./modules ./modules
agenix.nixosModules.default agenix.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
@ -36,9 +36,8 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { user = hostConfig.user; }; home-manager.extraSpecialArgs = { user = hostConfig.user; };
} }
] ++ (if "${hostConfig.role}" == "htpc" then [/etc/nixos/hardware-configuration.nix] ] ++ (if "${hostname}" == "wsl" then []
else if "${hostConfig.role}" == "wsl" then [] else [./hosts/${hostname}/hardware.nix]);
else [./hosts/${hostConfig.role}/hardware.nix]);
}) })
) hosts; ) hosts;
}; };

View File

@ -1,30 +1,23 @@
{ {
"kestrel": { "kestrel": {
"role": "kestrel",
"user": "tstarr" "user": "tstarr"
}, },
"shivan": { "shivan": {
"role": "shivan",
"user": "tstarr" "user": "tstarr"
}, },
"torus": { "torus": {
"role": "torus",
"user": "tstarr" "user": "tstarr"
}, },
"bulwark": { "bulwark": {
"role": "bulwark",
"user": "tstarr" "user": "tstarr"
}, },
"osprey": { "osprey": {
"role": "osprey",
"user": "tstarr" "user": "tstarr"
}, },
"wsl": { "wsl": {
"role": "wsl",
"user": "dev" "user": "dev"
}, },
"htpc-bako": { "htpc-bako": {
"role": "htpc",
"user": "starr" "user": "starr"
} }
} }