Allow deploy of (almost) everything
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.

This commit is contained in:
Greg Hellings
2026-01-08 18:05:19 -06:00
parent 6ef1f4a072
commit ecf5b3e75f
2 changed files with 18 additions and 7 deletions
+6 -5
View File
@@ -99,21 +99,22 @@
// (builtins.mapAttrs ( // (builtins.mapAttrs (
k: v: k: v:
{ {
imports = v._module.args.modules; imports = self.nixosConfigurations.${k}._module.args.modules;
} }
// ( // (
if builtins.hasAttr "tags" metadata.hosts.${k} then if builtins.hasAttr "tags" v then
{ {
deployment = { deployment = {
inherit (metadata.hosts.${k}) tags; inherit (v) tags;
targetHost = metadata.hosts.${k}.ts; targetHost = v.ts;
targetUser = "greg"; targetUser = "greg";
}; };
} }
else else
{ } { }
) )
) self.nixosConfigurations) ) (top.nixunstable.lib.filterAttrs (_: v: !(v ? "external") || !v.external) metadata.hosts))
#) self.nixosConfigurations)
); );
darwinConfigurations = ( darwinConfigurations = (
+12 -2
View File
@@ -9,6 +9,7 @@
"chronicles": { "chronicles": {
"ip": "10.42.1.4", "ip": "10.42.1.4",
"pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS", "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS",
"external": true,
"ts": "100.119.228.115" "ts": "100.119.228.115"
}, },
"exodus": { "exodus": {
@@ -31,6 +32,7 @@
"tags": ["server"] "tags": ["server"]
}, },
"icdm-root": { "icdm-root": {
"external": true,
"system": "x86_64-linux" "system": "x86_64-linux"
}, },
"isaiah": { "isaiah": {
@@ -43,9 +45,11 @@
"tags": ["builder", "kube", "server"] "tags": ["builder", "kube", "server"]
}, },
"iso": { "iso": {
"external": true,
"system": "x86_64-linux" "system": "x86_64-linux"
}, },
"ivr": { "ivr": {
"external": true,
"system": "aarch64-darwin" "system": "aarch64-darwin"
}, },
"jeremiah": { "jeremiah": {
@@ -58,9 +62,9 @@
"tags": ["builder", "kube", "server"] "tags": ["builder", "kube", "server"]
}, },
"joel": { "joel": {
"external": true,
"ip": "10.42.0.4", "ip": "10.42.0.4",
"ts": null, "ts": null
"system": "x86_64-linux"
}, },
"linode": { "linode": {
"ip": null, "ip": null,
@@ -70,25 +74,31 @@
"tags": ["public", "server"] "tags": ["public", "server"]
}, },
"MacBook-Pro.local": { "MacBook-Pro.local": {
"external": true,
"system": "aarc64-darwin" "system": "aarc64-darwin"
}, },
"MacBook-Prolocal.local": { "MacBook-Prolocal.local": {
"external": true,
"system": "aarc64-darwin" "system": "aarc64-darwin"
}, },
"nas1": { "nas1": {
"external": true,
"ip": "10.42.1.14", "ip": "10.42.1.14",
"ts": "100.114.187.61" "ts": "100.114.187.61"
}, },
"nixos": { "nixos": {
"external": true,
"system": "x86_64-linux" "system": "x86_64-linux"
}, },
"proxmoxtemplate": { "proxmoxtemplate": {
"external": true,
"system": "x86_64-linux" "system": "x86_64-linux"
}, },
"vm-gitlab": { "vm-gitlab": {
"system": "x86_64-linux" "system": "x86_64-linux"
}, },
"wsl": { "wsl": {
"external": true,
"system": "aarch64-linux" "system": "aarch64-linux"
}, },
"zeke": { "zeke": {