greg/nixos
1
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Give more colmena info

Browse Source
This commit is contained in:
Greg Hellings
2025-12-16 19:09:26 -06:00
parent 20e6be10d0
commit 0b4f074f51
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+17 -1
View File
@@ -86,7 +86,23 @@
}; };
}; };
} }
// (builtins.mapAttrs (_k: v: { imports = v._module.args.modules; }) self.nixosConfigurations) // (builtins.mapAttrs (
k: v:
{
imports = v._module.args.modules;
}
// (
if builtins.hasAttr "tags" metadata.hosts.${k} then
{
deployment = {
inherit (metadata.hosts.${k}) tags;
targetUser = "greg";
};
}
else
{ }
)
) self.nixosConfigurations)
); );
darwinConfigurations = (import ./darwin { inherit top overlays; }); darwinConfigurations = (import ./darwin { inherit top overlays; });
network.json
+12 -6
View File
@@ -18,26 +18,30 @@
"genesis": { "genesis": {
"ip": "10.42.1.5", "ip": "10.42.1.5",
"ts": "100.88.91.27", "ts": "100.88.91.27",
"system": "x86_64-linux" "system": "x86_64-linux",
"tags": [ "router", "server" ]
}, },
"hosea": { "hosea": {
"ip": "10.42.1.7", "ip": "10.42.1.7",
"ts": "100.68.203.1", "ts": "100.68.203.1",
"system": "x86_64-linux" "system": "x86_64-linux",
"tags": [ "server" ]
}, },
"isaiah": { "isaiah": {
"builder": true, "builder": true,
"ip": "10.42.1.6", "ip": "10.42.1.6",
"ts": "100.84.183.79", "ts": "100.84.183.79",
"system": "x86_64-linux", "system": "x86_64-linux",
"systems": [ "x86_64-linux", "aarch64-linux" ] "systems": [ "x86_64-linux", "aarch64-linux" ],
"tags": [ "builder", "kube", "server" ]
}, },
"jeremiah": { "jeremiah": {
"builder": true, "builder": true,
"ip": "10.42.1.8", "ip": "10.42.1.8",
"ts": "100.102.186.39", "ts": "100.102.186.39",
"system": "x86_64-linux", "system": "x86_64-linux",
"systems": [ "x86_64-linux", "aarch64-linux" ] "systems": [ "x86_64-linux", "aarch64-linux" ],
"tags": [ "builder", "kube", "server" ]
}, },
"joel": { "joel": {
"ip": "10.42.0.4", "ip": "10.42.0.4",
@@ -47,7 +51,8 @@
"linode": { "linode": {
"ip": null, "ip": null,
"ts": "100.109.86.8", "ts": "100.109.86.8",
"system": "x86_64-linux" "system": "x86_64-linux",
"tags": [ "public", "server" ]
}, },
"nas1": { "nas1": {
"ip": "10.42.1.14", "ip": "10.42.1.14",
@@ -58,7 +63,8 @@
"ip": "10.42.1.13", "ip": "10.42.1.13",
"ts": "100.90.74.19", "ts": "100.90.74.19",
"system": "x86_64-linux", "system": "x86_64-linux",
"systems": [ "x86_64-linux", "aarch64-linux" ] "systems": [ "x86_64-linux", "aarch64-linux" ],
"tags": [ "builder", "kube", "server" ]
} }
} }
} }