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

View File

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