chore: remove unused attic reference

chore: remove attic-client
chore: buildbot over Nebula
2026-07-25 15:39:30 -05:00 · 2026-07-25 15:38:40 -05:00 · 2026-07-25 15:38:28 -05:00 · 2026-07-25 15:18:15 -05:00 · 2026-07-25 13:49:47 -05:00
14 changed files with 234 additions and 204 deletions
@@ -31,11 +31,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1783833875,
-        "narHash": "sha256-G+hRtNJ/Nnr6VFMQp2UZdx/ckJDR/RJoK0Fy/yx1/YY=",
+        "lastModified": 1783231291,
+        "narHash": "sha256-iaoW3Enrb51mCT4AIixKXgkb1LdI/ikpCV9sV+zmkYU=",
        "owner": "nix-community",
        "repo": "buildbot-nix",
-        "rev": "147af587241e2af85399402da60a4f44fdb1e5d7",
+        "rev": "d8a926f66587ed37df1a422205d7aeb1692700f8",
        "type": "github"
      },
      "original": {
@@ -53,11 +53,11 @@
        "stable": "stable"
      },
      "locked": {
-        "lastModified": 1783909498,
-        "narHash": "sha256-T9OfLPLuh1Bf1xojlpWXwooJ6IXapxvb8GM0p3YNy8g=",
+        "lastModified": 1783265280,
+        "narHash": "sha256-n+TVzNkFtsW+ghl7JeFJYwIbXaZ2tn/WgjVMXwlzybI=",
        "owner": "zhaofengli",
        "repo": "colmena",
-        "rev": "76ba0daa542880b730faec81f4e87efcaa63bc57",
+        "rev": "e4250e61da7e007e19e8e17d8675b88ad27d6c06",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1784362797,
-        "narHash": "sha256-EP9b9b+OXDxHBPefFwMYCIaLq0fn3UkmrbfzbLUT7kQ=",
+        "lastModified": 1783395956,
+        "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "b4cccbd4bc299c1f71ae185b79c3cf99aa82805c",
+        "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15",
        "type": "github"
      },
      "original": {
@@ -288,11 +288,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1784407317,
-        "narHash": "sha256-iZrxHToDJWnvt+5LGAtvuQMTy1NZYlNEKbKaVtBJNcc=",
+        "lastModified": 1783436070,
+        "narHash": "sha256-F80z1JoiJgZyTT5D+3siLOVzqmCEphLR7t0Ym/I2CLI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "39411a8e12a5526d992e65bc7e3dc9a4414d6713",
+        "rev": "f09af49406ffad37acb6538d3207189a1a1e0b7e",
        "type": "github"
      },
      "original": {
@@ -330,11 +330,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1784344393,
-        "narHash": "sha256-yAo2ZzSIdeBZg7cOKUpQxwflL+DRYN+1DMObZk2lP2Q=",
+        "lastModified": 1783397047,
+        "narHash": "sha256-aXPvDeF7F0sKg2MWglAtSz6h1R6a9+V7Y2k24At2Q9o=",
        "owner": "Infinidoge",
        "repo": "nix-minecraft",
-        "rev": "7297d14c52ec8ef39c6aeff2c1818541fd030473",
+        "rev": "ed748d3593082a7e02d2c49b7643ecac3a7efde4",
        "type": "github"
      },
      "original": {
@@ -349,11 +349,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1784016977,
-        "narHash": "sha256-TydDba3YD2u15uS0L+PDs7lMqPopnzWggljTKDqOCSw=",
+        "lastModified": 1783166611,
+        "narHash": "sha256-8xyWfpItjSdMiR2bRdUf+Nj1T1Vdctgn4K7jVUyAaOk=",
        "owner": "Mic92",
        "repo": "niks3",
-        "rev": "b306808bf381e7e66e33de1e9446a1be0935f4e3",
+        "rev": "b45810677be67de714cbb4ff53f036bdb2e5f9a0",
        "type": "github"
      },
      "original": {
@@ -388,11 +388,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1784310968,
-        "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=",
+        "lastModified": 1783370751,
+        "narHash": "sha256-E+3MIMvKuo9k+K+qLQ9YXzsBzkgHuyVLnsEbN2DFfuc=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "779c32a00155994c86cde8213a8dd4df139d4355",
+        "rev": "662bd6e312d2c8b212e32cb377abaee190749320",
        "type": "github"
      },
      "original": {
@@ -403,11 +403,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1783224372,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "lastModified": 1782723713,
+        "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
        "type": "github"
      },
      "original": {
@@ -434,11 +434,11 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1783821755,
-        "narHash": "sha256-eMPX9S6MKPyUnaOgeRfrG7OKUiAlc1AlcRinMbSB0WA=",
+        "lastModified": 1783217952,
+        "narHash": "sha256-lItVCcSNUiL9NlB0+VoZwhtZk+0jAnfjJjch1g7U0bM=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "228ab8523d81526e57a6ca342e1a919fb6d246a8",
+        "rev": "830143f1e74a5ce8aa6cdad9c41ae84b73e8b3be",
        "type": "github"
      },
      "original": {
@@ -465,11 +465,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1783978241,
-        "narHash": "sha256-7kK0Y/fIV2NTKArkd/eZGaFg+dEmgP8KDRsGK2vB5M4=",
+        "lastModified": 1782774429,
+        "narHash": "sha256-1tRFhlVVSBP2UAyJ4fWV3wRxofOZQCIWmbXJS/kQw7U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a8b81d3cc8d35af7bc98694696bea61ad4f8fca7",
+        "rev": "c3db893991ef9cf1902c661c2d61249bcfb051dc",
        "type": "github"
      },
      "original": {
@@ -494,11 +494,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1783915482,
-        "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=",
+        "lastModified": 1783279667,
+        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee",
+        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
        "type": "github"
      },
      "original": {
@@ -510,11 +510,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1784356753,
-        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
        "type": "github"
      },
      "original": {
@@ -542,11 +542,11 @@
    },
    "nixunstable": {
      "locked": {
-        "lastModified": 1784356753,
-        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
        "type": "github"
      },
      "original": {
@@ -563,11 +563,11 @@
        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1784057377,
-        "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=",
+        "lastModified": 1783349931,
+        "narHash": "sha256-aYE76ATiGBg7/cQ2dHASRq97WvNum4OOIPgZ8xIK0QI=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "07180a087e4a00720dc0731cbcd8dec796974381",
+        "rev": "4fd45857deecb90d2732c87e0315daa48505515e",
        "type": "github"
      },
      "original": {
@@ -604,11 +604,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1784417922,
-        "narHash": "sha256-19XZ56wJXArMKxjY25pKXkNp/FrYHGoo+HuQtW6teSM=",
+        "lastModified": 1783451984,
+        "narHash": "sha256-pOIx6pF9DJCeGuDostAegvtmWhbX0ze0bLCzXYHkt94=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "2c806d314605495dd7fd75b5950003a062e2b47a",
+        "rev": "9d0a05bf73440e7e870c011a6c16e7e8636d98fd",
        "type": "github"
      },
      "original": {
@@ -689,11 +689,11 @@
    },
    "stable": {
      "locked": {
-        "lastModified": 1783625654,
-        "narHash": "sha256-pI1244/PJfTyKhlAr2QYQC55vR6UQdnGA0rJUgtO2IQ=",
+        "lastModified": 1783021296,
+        "narHash": "sha256-WYOmcI0zSkkU4VpR7xda8o0AWNC9xuqkEM7n4tKjJY8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a0230bd8d5cbd13893b2263918d396a2c7dd0407",
+        "rev": "d3474199ff806484bfccd1fdef7afc27fb8d74b5",
        "type": "github"
      },
      "original": {
@@ -836,11 +836,11 @@
        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1784343266,
-        "narHash": "sha256-EGkegdTz2n6ESyih8s3dUuPyJQWlYfPp7U41J05g8PY=",
+        "lastModified": 1783396462,
+        "narHash": "sha256-0Q3WQGlhzTb6QAXnmleX55Pqn+La4lcXupW1ElN/gZI=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "472a3e862c76c64ac3ad75a24d332cb5cdd5f1bb",
+        "rev": "98798c612761584740eed894f3ca1e1a1a856ac0",
        "type": "github"
      },
      "original": {
@@ -857,11 +857,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1784058842,
-        "narHash": "sha256-3u3tvbCIAid3Mv7RrJx13jusIEQC/HeKYhO/SUSxR3A=",
+        "lastModified": 1783336371,
+        "narHash": "sha256-ZisTtweyb7JUwPP54HAXE9TypT8m89dIxDI36Ak0hAs=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "24c8dc8e0f2170e1a377be24dfadc7d9d21dc1ad",
+        "rev": "a9620cfa43f0c1c30a46c31ae3c6e58cdb124a14",
        "type": "github"
      },
      "original": {
@@ -13,9 +13,41 @@ def --env unlock [] {
 }

 def nebulaIps [] {
-    open ../../network.json | get hosts | items { |h, e| $e.nebulaIp? } | filter { |e| $e != null } | sort
+    open /etc/nixos/network.json | get hosts | items { |h, e| $e.nebulaIp? } | where $it != null | sort
 }

+def genNebulaCert [ --ips: string, --name: string ] {
+    let public = $'~/SynologyDrive/nebula/($name).key.pub' | path expand
+    let private = $'~/SynologyDrive/nebula/($name).key' | path expand
+    let cert = $'/etc/nixos/secrets/nebula/($name).crt'
+    let ca_cert = '~/SynologyDrive/nebula/ca.crt' | path expand
+    let ca_key = '~/SynologyDrive/nebula/ca.key' | path expand
+
+    # Generate public key if there isn't one already
+    if ( not ($public | path exists) ) {
+        nebula-cert keygen -out-key $private -out-pub $public
+    }
+    # Clear old cert if there is one
+    if ( $cert | path exists) {
+        rm $cert
+    }
+
+    # Create and sign certs
+    (nebula-cert sign
+        -ca-crt $ca_cert
+        -ca-key $ca_key
+        -name $name
+        -networks $ips
+        -out-crt $cert
+        -in-pub $public
+    )
+
+    # Agenix update
+    cd /etc/nixos/secrets
+    cat $private | agenix -e $'nebula/($name).key.age'
+}
+
+
 def rebuild [ $target: string = "switch" ] {
    if (uname | get operating-system) == "Darwin" {
        sudo darwin-rebuild $target
@@ -39,7 +71,8 @@ def deploy [ $host: string, $build: string = "" ] {
    if $buildhost == "linode" or $buildhost == "genesis" {
        $buildhost = "isaiah"
    }
-    nixos-rebuild switch --sudo --use-substitutes --target-host $host --build-host $buildhost
+    colmena apply --on $host
+    #nixos-rebuild switch --sudo --use-substitutes --target-host $host --build-host $buildhost
 }

 def ff [ $file: string ] {
@@ -8,7 +8,6 @@
  home.packages =
    with pkgs;
    [
-      attic-client
      dig
      jqp
      kubernetes-helm
@@ -12,10 +12,6 @@
    top.nix-hardware.nixosModules.framework-11th-gen-intel
  ];

-  age.secrets = {
-    compose-attic.file = ../../../secrets/compose/attic.env.age;
-  };
-
  boot = {
    loader = {
      systemd-boot = {
@@ -130,7 +130,7 @@ in
        lib.mapAttrs
          (domain: net: {
            master = true;
-            file = makeZoneFile (lib'.hostsByNet net metadata.hosts) domain;
+            file = makeZoneFile (lib'.hostsByNet net (metadata.hosts // metadata.external)) domain;
          })
          {
            "shire-zebra.ts.net" = "tailscale";
@@ -88,6 +88,7 @@ in
      priority = 254;
    };
    nebula.enable = true;
+    proxies."buildbot.nebula.thehellings.com".target = "http://buildbot.nebula.thehellings.com:8010/";
    tailscale = {
      enable = true;
      tags = [ "home" ];
@@ -142,12 +143,12 @@ in
            updateOutputs = false;
          };
        };
-        domain = "${config.networking.hostName}.shire-zebra.ts.net:8010";
+        domain = "buildbot.nebula.thehellings.com:8010";
        evalMaxMemorySize = 8192;
        evalWorkerCount = 4;
        gitea = {
          enable = true;
-          instanceUrl = "https://gitea.shire-zebra.ts.net";
+          instanceUrl = "https://src.thehellings.com";
          oauthId = "7ec9107d-379b-47c8-870f-1191956d0500";
          oauthSecretFile = config.age.secrets.gitea-oauthSecret.path;
          tokenFile = config.age.secrets.gitea-oauthToken.path;
@@ -155,7 +156,7 @@ in
          webhookSecretFile = config.age.secrets.gitea-webhookSecret.path;
        };
        showTrace = true;
-        #webhookBaseUrl = "http://${config.networking.hostName}.shire-zebra.ts.net:8010";
+        #webhookBaseUrl = "http://${config.networking.hostName}.nebula.thehellings.com:8010";
        workersFile = config.age.secrets.gitea-buildbotWorkersFile.path;
      };
      worker = {
@@ -15,6 +15,8 @@ let
    sha256 = "sha256-Qs1qJmgZm8q9xZsORjT/N/wzpbWVVODXtzDpjnAYMuQ=";
  };
  keepaliveIp = "10.42.5.1";
+  nebulaName = "k3s.nebula.thehellings.com";
+  nebulaIp = "10.157.100.1";
 in
 {
  options.greg = {
@@ -44,6 +46,13 @@ in
  };

  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.greg.nebula.enable;
+        message = "Configure Nebula for this host, first";
+      }
+    ];
+
    age.secrets = {
      bw_secret.file = ../../secrets/kubernetes/bw_secret.age;
      dendrite_key.file = ../../secrets/dendrite_key.age;
@@ -97,6 +106,8 @@ in
          "--tls-san ${config.networking.hostName}.thehellings.lan"
          "--tls-san ${config.networking.hostName}.shire-zebra.ts.net"
          "--tls-san ${keepaliveIp}"
+          "--tls-san ${nebulaName}"
+          "--tls-san ${nebulaIp}"
        ];
        manifests = {
          cert-manager.source = cert-manager;
@@ -112,20 +123,37 @@ in
      keepalived = {
        enable = true;
        openFirewall = true;
-        vrrpInstances.kubernetes = {
-          interface = cfg.vipInterface;
-          priority = cfg.priority;
-          state = if (config.networking.hostName == "isaiah") then "MASTER" else "BACKUP";
-          virtualIps = [
-            {
-              addr = "${keepaliveIp}/16";
-              dev = cfg.vipInterface;
-            }
-          ];
-          virtualRouterId = 77;
-          extraConfig = ''
-            advert_int 1
-          '';
+        vrrpInstances = {
+          kubernetes = {
+            interface = cfg.vipInterface;
+            priority = cfg.priority;
+            state = if (config.networking.hostName == "isaiah") then "MASTER" else "BACKUP";
+            virtualIps = [
+              {
+                addr = "${keepaliveIp}/16";
+                dev = cfg.vipInterface;
+              }
+            ];
+            virtualRouterId = 77;
+            extraConfig = ''
+              advert_int 1
+            '';
+          };
+          k3s-nebula = {
+            interface = "nebula0";
+            priority = 1;
+            state = if (config.networking.hostName == "isaiah") then "MASTER" else "BACKUP";
+            virtualIps = [
+              {
+                addr = "${nebulaIp}/16";
+                dev = "nebula0";
+              }
+            ];
+            virtualRouterId = 78;
+            extraConfig = ''
+              advert_int 1
+            '';
+          };
        };
      };
      openiscsi = {
@@ -13,13 +13,6 @@
      "ip": "10.42.1.17",
      "system": "x86_64-linux"
    },
-    "chronicles": {
-      "ip": "10.42.1.4",
-      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS",
-      "external": true,
-      "ts": "100.119.228.115",
-      "aliases": ["s3"]
-    },
    "exodus": {
      "ip": null,
      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxmnCj2E9DxcnefPW+n4yCuLShxqr0p024riogdeXA3",
@@ -35,15 +28,6 @@
      "tags": ["router", "server"],
      "nebulaIp": "10.157.0.2"
    },
-    "hermes": {
-      "external": true,
-      "ip": "10.42.1.18",
-      "mac": "BC:24:11:E4:72:AB",
-      "nebulaIp": "10.157.0.8",
-      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILFYyzz/9i5rXprCQj9IL1ulrbQ6E9BOSeOcvf4D/b0G",
-      "system": "x86_64-linux",
-      "tags": ["server"]
-    },
    "hosea": {
      "ip": "10.42.1.7",
      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz",
@@ -52,10 +36,6 @@
      "tags": ["server"],
      "nebulaIp": "10.157.0.3"
    },
-    "icdm-root": {
-      "external": true,
-      "system": "x86_64-linux"
-    },
    "isaiah": {
      "builder": true,
      "ip": "10.42.1.6",
@@ -76,6 +56,7 @@
      "user": "gregory.hellings"
    },
    "jeremiah": {
+      "aliases": [ "buildbot" ],
      "builder": true,
      "ip": "10.42.1.8",
      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0",
@@ -85,11 +66,6 @@
      "tags": ["builder", "kube", "server"],
      "nebulaIp": "10.157.0.5"
    },
-    "joel": {
-      "external": true,
-      "ip": "10.42.0.4",
-      "ts": null
-    },
    "gregs-MacBook-Pro-16-inch-Nov-2024": {
      "external": true,
      "system": "aarch64-darwin"
@@ -118,58 +94,10 @@
      "external": true,
      "system": "aarch64-darwin"
    },
-    "nas1": {
-      "aliases": [ "*.nas1" ],
-      "external": true,
-      "ip": "10.42.1.14",
-      "ts": "100.114.187.61"
-    },
    "nixos": {
      "external": true,
      "system": "x86_64-linux"
    },
-    "printer": {
-      "external": true,
-      "ip": "10.42.1.3"
-    },
-    "proxmoxtemplate": {
-      "external": true,
-      "system": "x86_64-linux"
-    },
-    "pve2": {
-      "external": true,
-      "ip": "10.42.1.15",
-      "system": "x86_64-linux"
-    },
-    "pve2bmc": {
-      "derp": "10.42.2.129",
-      "external": true,
-      "mac": "00:25:90:4b:34:e8",
-      "ip": "10.42.6.2",
-      "system": "ipmi"
-    },
-    "pve3": {
-      "external": true,
-      "ip": "10.42.1.16",
-      "system": "x86_64-linux"
-    },
-    "pve3bmc": {
-      "derp": "10.42.2.181",
-      "external": true,
-      "ip": "10.42.6.3",
-      "mac": "00:25:90:4a:dc:2e",
-      "system": "ipmi"
-    },
-    "pve4": {
-      "external": true,
-      "ip": "10.42.1.17",
-      "system": "x86_64-linux"
-    },
-    "pve4bmc": {
-      "external": true,
-      "ip": "10.42.6.4",
-      "system": "ipmi"
-    },
    "wsl": {
      "external": true,
      "system": "aarch64-linux"
@@ -184,5 +112,56 @@
      "tags": ["builder", "kube", "server"],
      "nebulaIp": "10.157.0.6"
    }
+  },
+  "external": {
+    "chronicles": {
+      "ip": "10.42.1.4",
+      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS",
+      "ts": "100.119.228.115",
+      "aliases": ["s3"]
+    },
+    "hermes": {
+      "ip": "10.42.1.18",
+      "mac": "BC:24:11:E4:72:AB",
+      "nebulaIp": "10.157.0.8",
+      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILFYyzz/9i5rXprCQj9IL1ulrbQ6E9BOSeOcvf4D/b0G",
+      "tags": ["server"]
+    },
+    "joel": {
+      "ip": "10.42.0.4"
+    },
+    "k3s": {
+      "aliases": [ "*.k3s" ],
+      "ip": "10.42.5.1",
+      "nebulaIp": "10.157.100.1"
+    },
+    "nas1": {
+      "aliases": [ "*.nas1" ],
+      "ip": "10.42.1.14",
+      "ts": "100.114.187.61"
+    },
+    "printer": {
+      "ip": "10.42.1.3"
+    },
+    "pve2": {
+      "ip": "10.42.1.15"
+    },
+    "pve2bmc": {
+      "ip": "10.42.6.2",
+      "mac": "00:25:90:4b:34:e8"
+    },
+    "pve3": {
+      "ip": "10.42.1.16"
+    },
+    "pve3bmc": {
+      "ip": "10.42.6.3",
+      "mac": "00:25:90:4a:dc:2e"
+    },
+    "pve4": {
+      "ip": "10.42.1.17"
+    },
+    "pve4bmc": {
+      "ip": "10.42.6.4"
+    }
  }
 }
@@ -1,6 +1,6 @@
 -----BEGIN NEBULA CERTIFICATE V2-----
-MIGloD+ABmlzYWlhaKEHBAUKnQAEEIUEac2MaYYEa668pYcgg4lMYGB2VakRFO6b
-K9vHSLzjZpuqhBVQ7MReOwUHQKyCIBv+1Lr/E3Q6d99laLGdXRTss2SIL4OGBp8z
-qqfEsAMpg0CyDSEYuL8GaHQq708GbCxhxFifCZaRTB+ReGBScmhT9XhIwSLHRRZJ
-1TmoY4QvrdPOS3NAWvlawk/JUqN7SWQL
+MIGsoEaABmlzYWlhaKEOBAUKnQAEEAQFCp1kARCFBGplFeuGBGuuvKWHIIOJTGBg
+dlWpERTumyvbx0i842abqoQVUOzEXjsFB0CsgiDoVBJV1aKswyKPq1E4ZH9H21tx
+2IB0pKfEqNVdOLVedYNAjZSaY/IreMGnplY6txmSNuqSpFe1UTEDu4MOGSeZTKsO
+71y33z4AWsexnDD2ItFLT2rA5EgbApacaYF0AxtSCQ==
 -----END NEBULA CERTIFICATE V2-----
@@ -1,6 +1,6 @@
 -----BEGIN NEBULA CERTIFICATE V2-----
-MIGnoEGACGplcmVtaWFooQcEBQqdAAUQhQRpzYxphgRrrrylhyCDiUxgYHZVqREU
-7psr28dIvONmm6qEFVDsxF47BQdArIIgHXr6BLGmqfF92GXiN6MBj3ac0p/EtNYf
-xR3/EdI5GnGDQIFxfV5fVwi26+IRk9QIFxyyFBtmsZyPbdxL8ca1WUPm3lCNA4BT
-Knd9Y3Zlp6L35L4/dzSqAVoXu2nlHF6SOAA=
+MIGuoEiACGplcmVtaWFooQ4EBQqdAAUQBAUKnWQBEIUEamUYxYYEa668pYcgg4lM
+YGB2VakRFO6bK9vHSLzjZpuqhBVQ7MReOwUHQKyCIBHK000U9B0TVjuoTaMhQZFi
+8cKytw8is2cqUW4XAENBg0CLM+fuJcMVMbk6VHmRhko4KUTaQzWG2dggEwskTWCf
+IPXiTY2L/hInHSGFynIIe+Ux9hSRJ1W1KF4J8jq5LBwN
 -----END NEBULA CERTIFICATE V2-----
@@ -1,6 +1,6 @@
 -----BEGIN NEBULA CERTIFICATE V2-----
-MIGjoD2ABHpla2WhBwQFCp0ABhCFBGnNjGmGBGuuvKWHIIOJTGBgdlWpERTumyvb
-x0i842abqoQVUOzEXjsFB0CsgiCirKKbej7yAALn41C+MYmertD9LOv09gZ61ODF
-wEcnB4NAfix/r3q+XLYe3egKUoqJUW2i11x0ST0hxqhJUd8LjHKirRyHsvUraMbG
-c8x+CXsCPLgheGt548PpmrObQWtrBA==
+MIGqoESABHpla2WhDgQFCp0ABhAEBQqdZAEQhQRqZRi1hgRrrrylhyCDiUxgYHZV
+qREU7psr28dIvONmm6qEFVDsxF47BQdArIIg+FmKGTcvIvUcFdcguETRybn3jh58
+jJL6X5BHcmrxOWODQCfB4+92Zs/315a6I60PXsUaw3Jk0MQPLUuHykTO19imWsYa
+DyKFlk26ePhczGlhO2svq9J8p0zce0w+TPveOw8=
 -----END NEBULA CERTIFICATE V2-----
@@ -1,41 +1,35 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg 59/Hfejnlp8Qk6VTcVpsaB2su+p/LjxnXCI3+uoxeXs
-DW3LJMJ7nK3ySrDVrZTUhOCiDBujWh2ycGjpfMkddJw
-> ssh-ed25519 8UnW5Q 2ESBP1XYX71s9tlf1YC9lL+UmJPYjf5qiNNGUsEtnWU
-jWRnunZ2ub0QAvQaRznVGTIPIxHrzw8B620zFeZUx3Y
-> ssh-ed25519 UFfTmg Vs0zDRmw2scS8exINo2lBO1x2UqVXEElWFtCnGwrzWI
-SQM1l0GhHyDqzvykuyvR62XCeQPl/JaEttZJXFdvSFo
-> ssh-ed25519 KbVVUw WVNEfBAAEGP0O7vtL04/IaM9nCR57UJkTcT+96ZtaHQ
-3m/lb1USu6Vng2+4IEfXsdNwF4NMuVjZ5H/1+QUX4Q8
-> ssh-ed25519 xNtnoA cWYQoTMQmxpFPDCsj8AGOqxx4ErhHnsMiOgJJvhjBCI
-6GU/IeVZB1ECMAGYiL8tLPqgCuC2ujNcdSgzhOof7hI
-> ssh-ed25519 aY2AXA n1f3kFHxIvt5CbiBq6Vs32zoZEeYC5aBAZz5lCUEuxI
-OuFwQTJAdv2oMxzFbce6iqUa7SAu3aHMYU+D3L0gNbo
-> ssh-ed25519 AQhf1g hjjixHEYRom6XjHsIf2pMZvcMNxfeBw79+ApOheQezc
-/HvBy+L5eaz9NAShIeNfagE8LzamzxolD5ZIdapiyPA
-> ssh-ed25519 mOmPfg JJQYaT1ch0i4xeMrCVCgzq25dy7GhqNCHGXTd3syHCI
-4F+EQY7WbDJ8DwukaMelfYi9Q3LjYBpfhgCJVyXUtWI
-> ssh-ed25519 YJiRbw eFi1X3pmVVmkCDl8Jr+lIv2LeuSbMg6WqrpezABmOR8
-2arsXH0pdYxINujCFonHrqwEDVr4qR5ugXix8uu+cOk
-> ssh-ed25519 Nl/5yA ScYVPC1pyYkgweGi+hxQaXJ8UEnKta2VqbyHgSPTKCY
-CLiTEjJ6ylD3SlzrFHaz8yHaqc5KbCs3x3ij8Mgdnks
-> ssh-ed25519 GdLgCQ TQHucvsozqInbmCsh1GHZ2JF5pbUteT/W3XieSIfmj4
-Owq1wb9MdMD9pVJj24QCTvmkyh57Q2cKqfMRxj3ZFq4
-> ssh-ed25519 tOH/HQ KVKjt9GYmfcNOO7LTA1bypmtoYTYHgKWgD2dpD4zxUA
-VjlWDbSZp0NHC9VfRONz8UH2JtvIQWzqc7V/gJef/5A
-> ssh-ed25519 FpzvfQ gAlbAOE0Zz2A0391SyUKfLQDBt0+9HYPn54rG5HY/hM
-4t/wJ7L7yJvnFkdonsKTBFza+C7gXr8AI1PMEH58sO8
-> ssh-ed25519 2UotMw rrb5P6bPLUibtQ8Pkz533mQe65XA4DZOyw7B3GV6oHg
-Xs9cK2GZ3k2FgrHjIeB4DTe3gdahFFvS892siiAyEvI
-> ssh-ed25519 kdPvzQ JTPJpaE97otqsADN017u6dw2h9DWlD2NkwIyT5+b8yo
-QroD7owHZ4ThrVDBTJO3/wn6PK8wfrOwypjbjTxGkSM
-> ssh-ed25519 onmXpg QuQjNKosTocZ4y2KRvqMISezBbSll9ERKBTtKEVMIRs
-R0mgBtM2iZ6lcBzGC5hDz5G06G5O8FM2C1Vll2NW/Ag
-> ssh-ed25519 CnhD0g tSMysXdWjfmoBkVXD/wCIUEikjH7jiuEFlmrbfjIkmE
-xrkP8nl1nE+LvHA0vb1rOnQKNR/SB+KaqYBvJHDa3fs
-> ssh-ed25519 4ep2UA o1Vut8uttNV4+3DuZ67gURlGdnRittoON/xPE05i838
-03mFKfz89r0EKnY4tRL1zd9jKarZFW9TdX9nvvgAOTU
--- At7cFNjOg5E5WlaySJtqRZoK2/Gu+sXMI/cITd1SOKA
-ã€¹Ýäöß6v’z³ªâ0{ŸÝšj& �úöw®ÂmÝeªEþ�ÒæÔ,|
-_ŽaÍDóº#qó]Lõã"íW ê(Ñ¶Í´w¾µ¦˜ÕmÂÖ]O#
-T ô†•kÉ—gÜòrá]Þf¡T©_·‚Æö'¿•wÜ;Àƒ!N\¹¤¿g!TcØbê…7ëæïXmãLxã®þ‘ð
+-> ssh-ed25519 8UnW5Q E8Ki3oFCl3dLp9gxZ7/Ene8NMM26OVJ4PMJQQYQnBm0
+3rC3LMfdPCvSsiwaVnAb7VHwyw7KjZKcASdWm0lDg5E
+-> ssh-ed25519 UFfTmg 6q8nJbCIQe2IV/W/31OpuI6sZI833IbU+weSTU05Mng
+EgiGZwIN0oRjw9pAaHjypWtswBA1c5PCkNeN9K4YlT8
+-> ssh-ed25519 xNtnoA cyxa8uxevJ9VEaYLg2g9rewcAMhsZRAPEkzqd9k6ngE
+SedkkmBd4foxqB1MlCAkfIqO6ft5xnmLBa2cShzw/GI
+-> ssh-ed25519 aY2AXA biY7lFtfvr6vBv/XBhZ6Uh7Hpj+Du0NuEjo2RMp6USI
+5DgzmbEw5f6h4lHm7FlRZHXn4C9vCJ6IguXk7jZXxqM
+-> ssh-ed25519 AQhf1g e3g+IdnzmuJZj3H4LWdbZ8yaj5GM21zz3HCgkzFG5Cg
+oyzAIsqnL9ypSOCHINMu/+VM9TJeqgY9jLumhmAFIu8
+-> ssh-ed25519 mOmPfg o4pCs9ferfC6+OawWXsM5Wa/5q+4EN+lEg/diMrjVhQ
+H1gSB90UuJaivo2MhinPQGCV+rmSX1ZWazfhOxIDcaM
+-> ssh-ed25519 YJiRbw o33TjJkI7rc1DxXRMdgwoHfCqzU3sGd7BZo7Uw0I8iA
+/PiNDHyAl54HYszKkRzsjuoAZ53Ly1Oizf6NUIDB+I4
+-> ssh-ed25519 Nl/5yA FUycbaA303kvgINg9eNM53lN6aUXQPBxWz9liuhZ6Vo
+nNMPiq0w06WWfe73fpj/9ixunwgzZUCEi6pIKWuNWvQ
+-> ssh-ed25519 GdLgCQ sD2xKKzEyD7GsnFJCrDi40sJX0yBIXLr3pLx1R6RT1g
+ThDfA6T5/9cgAFKZPQtxGhKHdYOZx4sSQnoxzJMsLwc
+-> ssh-ed25519 tOH/HQ YeQfSV5UxsYAMEIOq1FNpkNcM4LEA8zvcbOceZ/26ws
+KMeeyObeOBmqxS6hqhVbDgvoB5jUJr8k21igT3rqoww
+-> ssh-ed25519 FpzvfQ GbT7exaVbqJNP7LdV/wyye89yXuN6FI20j7ckx5r5nI
+bNMqf7oY6NWVTPvVLOy+UpJKT0C9m6WunfdvMXCUZzk
+-> ssh-ed25519 2UotMw Zpco9IYJXyl9wIZo22g/kp/OjfClOtUP2in+N0hYX3o
+e68dEYPiNdlrSFaMTzvrhCz9/5V5zFAvrTnPtNSyI4c
+-> ssh-ed25519 kdPvzQ 2j64L6rV5b5+sbKbNAGf9+7uKLgdBpKNv9umHtSW4wY
+3y74VGUzKb9uhh3DvlkvZ5Jxtgfku7s1kDKrGDWUUvk
+-> ssh-ed25519 onmXpg 8GDMsteOopCnaaVkXAoRMbGuXeKoSqpyZhLvbnEWBQU
+X0HsZbpT4Wc/KO0TBwVSyjK6Zcbz1A34VCozNrMH4Lw
+-> ssh-ed25519 CnhD0g uHIeQtUwcDRXdJpFglJ12ptOPP64yMP6WKPz00sAQ0c
+yIKZNODIQSkNr4UilEHZzOBxeRA4G/sAbkppyOdUjkQ
+-> ssh-ed25519 4ep2UA k+cteVM7cMWQk7xDcCZgWlZxgA4ZBmUlbZHQFmMoi0Q
+YC2fptyb258arEdeOcPhCc3+z/vIgEElbqn2Ik3r2Lo
+--- NJ2uO0A/UbPrw+IgObiiXTwV75xgsWTjYvLpTwznDXM
+³B Ð-ø�`8nß=m5/s”zÇ¼mÚÝØˆ‚Sþ”ÖÍÆ œ¿Âõ&_¤WÛRpõß²“�=iG’FyÃEíÐ†¹¥èIñq:ö|-~$ò>ûÄbv~leè/ñd•V Ùˆq”ªÐ¾±¶˜Â€ƒ•‰5¯ÝýŠÏ‚é|¸‘JÅí␍´£_£°l¯¬ñZ2°rìPÞ—p½‚.
Author	SHA1	Message	Date
Greg Hellings	a07068a4fb	chore: remove unused attic reference buildbot/nix-eval Build done. Details buildbot/nix-build Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-darwin Build done. Details	2026-07-25 15:39:30 -05:00
Greg Hellings	ec53199532	chore: remove attic-client	2026-07-25 15:38:40 -05:00
Greg Hellings	389798c4f0	chore: buildbot over Nebula	2026-07-25 15:38:28 -05:00
Greg Hellings	475fe50d19	Expand Nebula * Add Nebula to Kubernetes node * Update k3s nodes to support nebula keepalived * Move external IPs to a separate structure	2026-07-25 15:18:15 -05:00
Greg Hellings	0d1d846884	chore: update deprecated nushell pipe	2026-07-25 13:49:47 -05:00