chore: update flake.lock 2026-08-02

Major update for linode and Nebula
* Consolidate Linode into a single file * Convert gitea and matrix to using Nebula connections * Have Linode proxy to Nebula connections instead of Tailscale * Update Acme to use DNS-01 * Update Flake to pull from branch that supports ACME 5.x client
2026-08-02 00:01:17 +00:00 · 2026-08-01 14:38:01 -05:00 · 2026-07-28 22:42:21 -05:00 · 2026-07-28 22:41:01 -05:00 · 2026-07-28 22:40:17 -05:00 · 2026-07-28 19:50:24 -05:00
96 changed files with 1575 additions and 1751 deletions
@@ -0,0 +1,51 @@
+name: Update zims pin
+
+"on":
+  schedule:
+    - cron: "0 2 1 * *"  # 0200 on the first of every month
+  workflow_dispatch:
+
+jobs:
+  update-flake-lock:
+    runs-on: nix-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Update flake.lock
+        run: nix run .#zim-updater -- --output pkgs/zim/blobs.json
+
+      - name: Create PR if changed
+        env:
+          GITEA_TOKEN: ${{ secrets.KLAATU_TOKEN }}
+          GITEA_URL: https://src.thehellings.com
+          REPO: greg/nixos
+        run: |
+          if git diff --quiet pkgs/zim/blobs.json; then
+            echo "blobs.json unchanged, nothing to do"
+            exit 0
+          fi
+
+          BRANCH="auto/update-zims-$(date +%Y%m%d)"
+          git config user.email "klaatu@thehellings.com"
+          git config user.name "klaatu"
+          git checkout -b "$BRANCH"
+          git add pkgs/zim/blobs.json
+          git commit -m "chore: update zim blobs.json $(date +%Y-%m-%d)"
+
+          # Push branch using token auth
+          git remote set-url origin "https://klaatu:${GITEA_TOKEN}@${GITEA_URL#https://}/${REPO}.git"
+          git push origin "$BRANCH"
+
+          # Create PR via Gitea API
+          curl -s -X POST \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            "${GITEA_URL}/api/v1/repos/${REPO}/pulls" \
+            -d "{
+              \"title\": \"chore: update zims $(date +%Y-%m-%d)\",
+              \"head\": \"$BRANCH\",
+              \"base\": \"main\",
+              \"body\": \"Automated monthly zims update.\\n\\nGenerated by Gitea Actions.\",
+              \"assignees\": [\"greg\"]
+            }"
@@ -1,12 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIByDCCAW+gAwIBAgIRANS+dPEH5Vqug7OWhCMmcx4wCgYIKoZIzj0EAwIwLjER
-MA8GA1UEChMISGVsbGluZ3MxGTAXBgNVBAMTEEhlbGxpbmdzIFJvb3QgQ0EwHhcN
-MjQwMjIwMjEyNzIxWhcNMzQwMjE3MjEyNzIxWjA2MREwDwYDVQQKEwhIZWxsaW5n
-czEhMB8GA1UEAxMYSGVsbGluZ3MgSW50ZXJtZWRpYXRlIENBMFkwEwYHKoZIzj0C
-AQYIKoZIzj0DAQcDQgAErZUhPfx5MpNbNVyqHDrIgUGnb6Hitl8hXlpH+kgjBzCi
-7I/+TQnl9Tc0VVNOFOYLOfBi7hV3/QudUtLGk0FKeaNmMGQwDgYDVR0PAQH/BAQD
-AgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFMZR8LDd+hNy+TmtEHvt
-zRzXboh2MB8GA1UdIwQYMBaAFAlH11TwIFGB/K75qZ3e0S+fN3JUMAoGCCqGSM49
-BAMCA0cAMEQCIBxHK6r8pMX5hrTwYKRfMmRIt44m0KtNejA2T5t09hs+AiBfvmHb
-LfoE4qoC6NgpvXorAbx+O7xkem/9svF0Ob+RsA==
-----END CERTIFICATE-----
@@ -1,11 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIBoTCCAUagAwIBAgIRAL/1mvE8+73nRFGsvzaaVSAwCgYIKoZIzj0EAwIwLjER
-MA8GA1UEChMISGVsbGluZ3MxGTAXBgNVBAMTEEhlbGxpbmdzIFJvb3QgQ0EwHhcN
-MjQwMjIwMjEyNzIwWhcNMzQwMjE3MjEyNzIwWjAuMREwDwYDVQQKEwhIZWxsaW5n
-czEZMBcGA1UEAxMQSGVsbGluZ3MgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABEgNBjlT/7gmzNp9vKJvGPJn9/IizuMGVpucdrN9+J1u1ABkLNRzj5p2
-g7s3e/BG+EJnnTf/2tuq3p/wPqmQkdujRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNV
-HRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBQJR9dU8CBRgfyu+amd3tEvnzdyVDAK
-BggqhkjOPQQDAgNJADBGAiEA/uBclcFCOpkEgAeBAVurktYB82sMdIyyDGHcjlwi
-pvkCIQC2kuZ/nXRjibeIebQIVTBskQ1LxlLxnx7zNSjtr3kFfQ==
-----END CERTIFICATE-----
@@ -1,54 +0,0 @@
-services:
-  attic:
-    container_name: attic
-    image: ghcr.io/zhaofengli/attic:latest
-    command: ["-f", "/attic/server.toml"]
-    restart: unless-stopped
-    ports:
-      - 8080:8080
-    networks:
-      attic:
-      pgattic:
-    volumes:
-      - /mnt/all/configs/attic/server.toml:/attic/server.toml
-      - /mnt/all/containers/attic/data:/attic/storage
-    env_file:
-      - stack.env
-    depends_on:
-      pgattic:
-        condition: service_healthy
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "wget --no-verbose --tries=1 --spider http://attic:8080 || exit 1",
-        ]
-      interval: 15s
-      timeout: 10s
-      retries: 10
-      start_period: 15s
-    deploy:
-      resources:
-        reservations:
-          cpus: 1.0
-
-  pgattic:
-    container_name: pgattic
-    image: postgres:17.6-alpine
-    restart: unless-stopped
-    ports: []
-    networks:
-      pgattic:
-    volumes:
-      - /mnt/all/containers/attic/postgres:/var/lib/postgresql/data
-    env_file:
-      - stack.env
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-networks:
-  attic:
-  pgattic:
@@ -1,9 +0,0 @@
-services:
-  pinchflat:
-    image: ghcr.io/kieraneglin/pinchflat:latest
-    ports:
-      - "8945:8945"
-    volumes:
-      - "/mnt/all/configs/pinchflat:/config"
-      - "/mnt/all/video/yt:/downloads"
-    restart: unless-stopped
@@ -1,19 +0,0 @@
-# Demo of rest-server with prometheus and grafana
-version: "2"
-
-services:
-  restserver:
-    image: "restic/rest-server:0.14.0"
-    volumes:
-      - /mnt/all/backups:/data
-      - /mnt/all/configs/certs:/certs
-    environment:
-      OPTIONS: >-
-        --tls
-        --tls-cert /certs/nas1.shire-zebra.ts.net.crt
-        --tls-key /certs/nas1.shire-zebra.ts.net.key
-        --path /data
-        --prometheus
-        --debug
-    ports:
-      - "30248:8000"
@@ -31,11 +31,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1783231291,
-        "narHash": "sha256-iaoW3Enrb51mCT4AIixKXgkb1LdI/ikpCV9sV+zmkYU=",
+        "lastModified": 1784438381,
+        "narHash": "sha256-OuKnPzVTpGYaUQp/GjR7NFY8ezVRlR2V2CUxkHkI2UU=",
        "owner": "nix-community",
        "repo": "buildbot-nix",
-        "rev": "d8a926f66587ed37df1a422205d7aeb1692700f8",
+        "rev": "72e12f1a1381321e07279b18f3d401c29871b50e",
        "type": "github"
      },
      "original": {
@@ -53,11 +53,11 @@
        "stable": "stable"
      },
      "locked": {
-        "lastModified": 1783265280,
-        "narHash": "sha256-n+TVzNkFtsW+ghl7JeFJYwIbXaZ2tn/WgjVMXwlzybI=",
+        "lastModified": 1785582945,
+        "narHash": "sha256-PI+qji1xkJm3PV7l7/PKJDumFz0fbA4etXE614jRnls=",
        "owner": "zhaofengli",
        "repo": "colmena",
-        "rev": "e4250e61da7e007e19e8e17d8675b88ad27d6c06",
+        "rev": "84d419ad080477ed2f31fbf3866551393df647a7",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783395956,
-        "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=",
+        "lastModified": 1785389976,
+        "narHash": "sha256-0tLW8Ff5yt8AH97jw4ZpFJ0OCJ122zIlgWGDmOfU/VU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15",
+        "rev": "15abb8c98f336cd8bd840d71059adebabe60bf04",
        "type": "github"
      },
      "original": {
@@ -162,11 +162,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1782949081,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "lastModified": 1785627969,
+        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783814254,
-        "narHash": "sha256-bsqgm3shjBFaLJ8kzQxhPtc3ftqMeTSVBeCTg7ELA3k=",
+        "lastModified": 1785531816,
+        "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e473bdcd8786928b35061bc281568d91d752a2e6",
+        "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe",
        "type": "github"
      },
      "original": {
@@ -284,11 +284,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1783740340,
-        "narHash": "sha256-FKGh3FwjVVIkrMMhBp9hQMZXRiFYCMTBBx8EV96kr08=",
+        "lastModified": 1785555369,
+        "narHash": "sha256-KUHFKv51VoV1wpyIreeusIkFsgycjeuRA9vDsBmCUu0=",
        "owner": "Infinidoge",
        "repo": "nix-minecraft",
-        "rev": "124369a28ed235ab92b40b0ca2dd14d5306940c5",
+        "rev": "76a82a08c36423e5ff627c62f55797de52c3061b",
        "type": "github"
      },
      "original": {
@@ -303,11 +303,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1783583669,
-        "narHash": "sha256-fiAFsNCgzMmaeoEFQiibMIYO3MyUqvKlwNT3F+N94MI=",
+        "lastModified": 1785226690,
+        "narHash": "sha256-H7lhfp4ja6vysomufDgVoRgiBUyEcQDnN6rGB9yDIDM=",
        "owner": "Mic92",
        "repo": "niks3",
-        "rev": "fbcded5420a3f2357fda14b6cf0f0453d1ed3266",
+        "rev": "ce7cd4b0462c634802a9faf0cb19f4718d115ec8",
        "type": "github"
      },
      "original": {
@@ -342,11 +342,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1783792734,
-        "narHash": "sha256-50rvY9GdFvpYDcMLcD/4cWSi0hVxArT5wsGlVsHy8eY=",
+        "lastModified": 1785232496,
+        "narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "8efb4337e857949f4cfac86d12ef1066f417f31f",
+        "rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98",
        "type": "github"
      },
      "original": {
@@ -357,11 +357,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1782723713,
-        "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
        "type": "github"
      },
      "original": {
@@ -373,11 +373,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1782614948,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
+        "lastModified": 1785031560,
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
        "type": "github"
      },
      "original": {
@@ -388,11 +388,11 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1783217952,
-        "narHash": "sha256-lItVCcSNUiL9NlB0+VoZwhtZk+0jAnfjJjch1g7U0bM=",
+        "lastModified": 1785031560,
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "830143f1e74a5ce8aa6cdad9c41ae84b73e8b3be",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
        "type": "github"
      },
      "original": {
@@ -419,11 +419,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1783564090,
-        "narHash": "sha256-ajlPoJbp28hK8Zgua3n+g4LuzGVGlKfs94jA2VVUa3Q=",
+        "lastModified": 1783978241,
+        "narHash": "sha256-7kK0Y/fIV2NTKArkd/eZGaFg+dEmgP8KDRsGK2vB5M4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9ab0784f4b4b98a4f100d4cb2245d791cdccf70a",
+        "rev": "a8b81d3cc8d35af7bc98694696bea61ad4f8fca7",
        "type": "github"
      },
      "original": {
@@ -448,11 +448,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1783279667,
-        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
+        "lastModified": 1784555310,
+        "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
+        "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493",
        "type": "github"
      },
      "original": {
@@ -464,11 +464,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1783522502,
-        "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=",
+        "lastModified": 1785571196,
+        "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612",
+        "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
        "type": "github"
      },
      "original": {
@@ -480,32 +480,32 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1777207419,
-        "narHash": "sha256-V3bmPWAajDiC+1ClDOp55gianW2EyRJSJOyu1RUQibc=",
+        "lastModified": 1784564315,
+        "narHash": "sha256-7OpsHHIZFUBLbeHNQ0oC40DZRQjsmGWodXge+OqgPgk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a7ecea3deccfbdbf22945a89984fcc5a169da8aa",
+        "rev": "0c2094806c9e542f31785ef3569ab9e900e3ce9c",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a7ecea3deccfbdbf22945a89984fcc5a169da8aa",
+        "rev": "0c2094806c9e542f31785ef3569ab9e900e3ce9c",
        "type": "github"
      }
    },
    "nixunstable": {
      "locked": {
-        "lastModified": 1783522502,
-        "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=",
-        "owner": "nixos",
+        "lastModified": 1785349197,
+        "narHash": "sha256-LcCdjhqwjFVrFTNW6tHm3KNYRrD1TA6bYRea30yIIjw=",
+        "owner": "geri1701",
        "repo": "nixpkgs",
-        "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612",
+        "rev": "af4902d1e79cbeade8e0d9e10e7a9ada4dce01b5",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "owner": "geri1701",
+        "ref": "lego-v5-acme-spike",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -517,11 +517,11 @@
        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1783647864,
-        "narHash": "sha256-gtVkWD4SbsvQQ8aSFEsrUTxxyuim4/ZC6lBJmA+sE/k=",
+        "lastModified": 1785527278,
+        "narHash": "sha256-rYFSM491MFFA1V6oax5PngXbevGt6n0o8sKhwFoItE0=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "ebffdb62cd1604537ee51d4d23258c002f1c90f8",
+        "rev": "a19efae6c1afe426e8243d79f6dfbab186be6df8",
        "type": "github"
      },
      "original": {
@@ -537,11 +537,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1783812717,
-        "narHash": "sha256-/ShoG1aG4RN+002Y69CQk0HJ8U/DRw5PHGJcgqB/rLQ=",
+        "lastModified": 1785627680,
+        "narHash": "sha256-uWtMa2bwZdK3GPIaSRikEezgHK/dvpawxzjqm4BIHfk=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "f677cb4b829c9df339277c6e80200b1c98320463",
+        "rev": "b4d9d89f110d52db3cf336cb9f8b4448e6648e87",
        "type": "github"
      },
      "original": {
@@ -571,11 +571,11 @@
    },
    "stable": {
      "locked": {
-        "lastModified": 1783021296,
-        "narHash": "sha256-WYOmcI0zSkkU4VpR7xda8o0AWNC9xuqkEM7n4tKjJY8=",
+        "lastModified": 1783625654,
+        "narHash": "sha256-pI1244/PJfTyKhlAr2QYQC55vR6UQdnGA0rJUgtO2IQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d3474199ff806484bfccd1fdef7afc27fb8d74b5",
+        "rev": "a0230bd8d5cbd13893b2263918d396a2c7dd0407",
        "type": "github"
      },
      "original": {
@@ -654,11 +654,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1780220602,
-        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
+        "lastModified": 1784369104,
+        "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "rev": "df3c0640565d04a0261253cdd89fce78ec50168a",
        "type": "github"
      },
      "original": {
@@ -693,11 +693,11 @@
        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1783739870,
-        "narHash": "sha256-AlZ6alGgglSnobDd0TJCWTu822os+2PxEGy7nZyI33E=",
+        "lastModified": 1785555171,
+        "narHash": "sha256-MLBtKBAbLXB81qm5UZq7w0IFnP/fh6QWhfU55dA8uFo=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "a187e07424aa1d5e4ec148408d8e2873501d7bb8",
+        "rev": "730fe1d38d63878df9cf6b46b36308d197a9334e",
        "type": "github"
      },
      "original": {
@@ -714,11 +714,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783336371,
-        "narHash": "sha256-ZisTtweyb7JUwPP54HAXE9TypT8m89dIxDI36Ak0hAs=",
+        "lastModified": 1784642409,
+        "narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "a9620cfa43f0c1c30a46c31ae3c6e58cdb124a14",
+        "rev": "eaeb18da90024448a60eb1ec7132eafa4003404e",
        "type": "github"
      },
      "original": {
@@ -28,7 +28,8 @@
    nix-hardware.url = "github:nixos/nixos-hardware";
    nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
    nixvimunstable.url = "github:nix-community/nixvim/main";
-    nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    #nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixunstable.url = "github:geri1701/nixpkgs/lego-v5-acme-spike";
    nurpkgs.url = "github:nix-community/NUR";
    vsext.url = "github:nix-community/nix-vscode-extensions";
    wsl = {
@@ -100,7 +101,7 @@
                {
                  deployment = {
                    inherit (v) tags;
-                    targetHost = v.ts;
+                    targetHost = if (v ? "nebulaIp") then v.nebulaIp else v.ts;
                    targetUser = "greg";
                  };
                }
@@ -12,6 +12,46 @@ def --env unlock [] {
    }
 }

+def nebulaIps [] {
+    open /etc/nixos/network.json | get hosts | items { |h, e| $e.nebulaIp? } | where $it != null | sort
+}
+
+def localIps [] {
+    open /etc/nixos/network.json | get hosts | items { |h, e| $e.ip? } | 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
@@ -35,7 +75,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 ] {
@@ -27,9 +27,12 @@

        "*" = {
          DynamicForward = [ "10240" ];
-          ServerAliveInterval = 60;
+          ForwardAgent = "yes";
          LogLevel = "error";
-          SetEnv = { TERM = "xterm-256color"; };
+          ServerAliveInterval = 60;
+          SetEnv = {
+            TERM = "xterm-256color";
+          };
        };

        "10.42.1.4" = lib.hm.dag.entryBefore [ "10.42.*" ] nas;
@@ -8,7 +8,6 @@
  home.packages =
    with pkgs;
    [
-      attic-client
      dig
      jqp
      kubernetes-helm
@@ -0,0 +1 @@
+{...}: {}
@@ -23,9 +23,12 @@
    mattermost-desktop
    minio-client
    mumble
+    nebula
    nix-index
+    adoptopenjdk-icedtea-web
    pre-commit
    prismlauncher
+    rclone
    restic
    restic-browser
    tea
@@ -1,4 +0,0 @@
-{ ... }:
-
-{
-}
@@ -30,6 +30,7 @@ let
      modules = [
        {
          nixpkgs.hostPlatform = system;
+          networking.hostName = name;
        }
        # Imported ones
        top.agenix.nixosModules.default
@@ -0,0 +1,60 @@
+{
+  config,
+  metadata,
+  modulesPath,
+  ...
+}:
+{
+  # Then build nixosConfiguration.<host>.config.system.build.images.proxmox
+  # SCP that to /var/lib/vz/dumps on the Proxmox host
+  imports = [ "${modulesPath}/virtualisation/proxmox-image.nix" ];
+  greg = {
+    home = true;
+    nebula.enable = true;
+  };
+  networking = {
+    defaultGateway = metadata.infra.gw;
+    nameservers = [ metadata.infra.dns ];
+    interfaces.ens18 = {
+      useDHCP = false;
+      ipv4.addresses = [
+        {
+          address = metadata.hosts."${config.networking.hostName}".ip;
+          prefixLength = 16;
+        }
+      ];
+    };
+  };
+  virtualisation.diskSize = 20480; # Size in mebbibytes for the base disk image
+  # Use these instead of the above to run an LXC image
+  # The main reason I wouldn't use these is because Proxmox LXC does
+  # not seem to be well supported by either Nebula VPN or Tailscale,
+  # both of which I use for my mesh networking. If there isn't a need
+  # for the service to run on those networks, then by all means go ahead
+  # and use LXC!
+  # imports = [ (modulesPath + "/virtualisation/proxmox-lxc.nix") ];
+  # proxmoxLXC = {
+  #   manageNetwork = false;
+  #   privileged = true;
+  # };
+  # systemd.suppressedSystemUnits = [
+  #   "dev-mqueue.mount"
+  #   "sys-kernel-debug.mount"
+  #   "sys-fs-fuse-connections.mount"
+  # ];
+  nix.settings = {
+    sandbox = false;
+  };
+  services = {
+    fstrim.enable = false; # Let Proxmox host handle fstrim
+    openssh = {
+      enable = true;
+      openFirewall = true;
+      settings = {
+        PermitRootLogin = "yes";
+        PasswordAuthentication = true;
+        PermitEmptyPasswords = "yes";
+      };
+    };
+  };
+}
@@ -9,13 +9,9 @@
 {
  imports = [
    ./hardware-configuration.nix
-    top.nix-hardware.nixosModules.framework-11th-gen-intel
+    top.nix-hardware.nixosModules.framework-intel-core-ultra-series1
  ];

-  age.secrets = {
-    compose-attic.file = ../../../secrets/compose/attic.env.age;
-  };
-
  boot = {
    loader = {
      systemd-boot = {
@@ -130,10 +130,10 @@ 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";
+            "shire-zebra.ts.net" = "tailscale";
            "nebula.thehellings.com" = "nebula";
            nebula = "nebula";
            "thehellings.lan" = "lan";
@@ -185,7 +185,7 @@ in
      s3 = {
        accessKeyFile = config.age.secrets.niks3-access-key-id.path;
        bucket = "niks3";
-        endpoint = "nas1.shire-zebra.ts.net:9000";
+        endpoint = "nas1.shire-zebra.ts.net:30188";
        secretKeyFile = config.age.secrets.niks3-secret-access-key.path;
        useSSL = false;
      };
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  # Bootloader.
-  boot = {
-    loader.grub = {
-      enable = true;
-      device = "/dev/sda";
-    };
-  };
-}
@@ -1,28 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ pkgs, ... }:
-
-{
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ./boot.nix
-    ./filesystem.nix
-    ./location.nix
-    ./networking.nix
-    ./wiki.nix
-  ];
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.greg = {
-    isNormalUser = true;
-    description = "Gregory Hellings";
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-    packages = with pkgs; [ ];
-  };
-}
@@ -1,13 +0,0 @@
-{ ... }:
-
-let
-in
-{
-  fileSystems."serve" = {
-    #device = "10.42.1.4:/volume1/icdm-mysql/";
-    #fsType = "nfs";
-    device = "/dev/sdb1";
-    fsType = "auto";
-    mountPoint = "/srv";
-  };
-}
@@ -1,53 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ehci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/dab0d455-e25e-4445-8fa4-5320047d7e7b";
-    fsType = "btrfs";
-    options = [ "subvol=@" ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/5aedbb07-5761-423b-909d-2560405eae32";
-    fsType = "ext4";
-  };
-
-  fileSystems."/var" = {
-    device = "/dev/disk/by-uuid/57968536-c29d-417d-997e-85223d1d1f65";
-    fsType = "btrfs";
-  };
-
-  swapDevices = [ { device = "/dev/disk/by-uuid/09691dce-375a-43c6-8d40-4498d20a6d9a"; } ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
-
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  # Set your time zone.
-  time.timeZone = "America/Chicago";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-}
@@ -1,63 +0,0 @@
-{ ... }:
-let
-  dnsHosts = builtins.concatStringsSep "\n" [ "wiki.icdm.lan 10.42.101.1" ];
-in
-{
-  # If we have to do proxying in Bayonnais, we can start to work on that here
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-  networking = {
-    hostName = "icdm-root";
-    useDHCP = false;
-    defaultGateway = "10.42.1.1";
-    nameservers = [
-      "100.100.100.100"
-      "10.42.1.2"
-    ];
-    enableIPv6 = false;
-
-    interfaces = {
-      eno1.ipv4.addresses = [
-        {
-          address = "10.42.101.1";
-          prefixLength = 16;
-        }
-        {
-          address = "10.77.1.2";
-          prefixLength = 16;
-        }
-      ];
-    };
-    # Allow traffic through
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [ 53 ];
-      allowedUDPPorts = [
-        53
-        67
-      ];
-    };
-
-    extraHosts = "${dnsHosts}";
-  };
-
-  services.dnsmasq = {
-    enable = true;
-    settings = {
-      domain = "icdm.lan";
-      dhcp-range = [ "eno1,10.77.1.10,10.77.1.255,255.255.0.0,12h" ];
-      dhcp-option = [
-        "eno1,option:router,10.77.1.1"
-        "eno1,option:dns-server,10.77.1.2,1.1.1.1"
-        "eno1,option:domain-search,icdm.lan"
-      ];
-      expand-hosts = true;
-      log-dhcp = true;
-      log-queries = true;
-      # Upstream servers
-      server = [
-        "1.1.1.1"
-        "8.8.4.4"
-      ];
-    };
-  };
-}
@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-let
-  wikiHost = "wiki.icdm.lan";
-  kiwixport = 8080;
-in
-{
-  services.kiwix-serve = {
-    enable = true;
-    port = kiwixport;
-    library = {
-      inherit (pkgs) zim;
-    };
-  };
-
-  greg.proxies."${wikiHost}".target = "http://localhost:${toString kiwixport}";
-  networking.firewall.allowedTCPPorts = [ 80 ];
-}
@@ -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 = {
@@ -0,0 +1,76 @@
+{
+  config,
+  metadata,
+  modulesPath,
+  pkgs,
+  ...
+}:
+{
+  imports = [ "${modulesPath}/virtualisation/proxmox-image.nix" ];
+  greg = {
+    home = true;
+    nebula.enable = true;
+    proxies =
+      let
+        tgt = {
+          target = "http://localhost:${config.services.uptime-kuma.settings.PORT}";
+          genAliases = false;
+        };
+      in
+      {
+        "kuma.nebula.thehellings.com" = tgt;
+        "kuma.thehellings.lan" = tgt;
+        "kuma.shire-zebra.ts.net" = tgt;
+      };
+  };
+  nix.settings = {
+    sandbox = false;
+  };
+  networking = {
+    defaultGateway = metadata.infra.gw;
+    nameservers = [ metadata.infra.dns ];
+    interfaces.ens18 = {
+      useDHCP = false;
+      ipv4.addresses = [
+        {
+          address = metadata.hosts."${config.networking.hostName}".ip;
+          prefixLength = 16;
+        }
+      ];
+    };
+  };
+  proxmox.cloudInit.enable = false;
+  services = {
+    fstrim.enable = true;
+    mysql = {
+      enable = true;
+      ensureDatabases = [
+        config.services.uptime-kuma.settings.UPTIME_KUMA_DB_NAME
+      ];
+      ensureUsers = [
+        {
+          name = config.services.uptime-kuma.settings.UPTIME_KUMA_DB_USERNAME;
+          ensurePermissions = {
+            "uptimekuma.*" = "ALL PRIVILEGES";
+          };
+        }
+      ];
+      package = pkgs.mariadb;
+    };
+    openssh = {
+      enable = true;
+      openFirewall = true;
+    };
+    uptime-kuma = {
+      enable = true;
+      settings = {
+        PORT = "3001"; # Default, but this allows us to explicitly use it elsewhere
+        UPTIME_KUMA_DB_TYPE = "mariadb";
+        UPTIME_KUMA_DB_SOCKET = "/run/mysqld/mysqld.sock";
+        UPTIME_KUMA_DB_NAME = "uptimekuma";
+        UPTIME_KUMA_DB_USERNAME = "uptimekuma";
+        UPTIME_KUMA_DB_PASSWORD = "uptimekuma";
+      };
+    };
+  };
+}
@@ -1,31 +1,65 @@
 {
  pkgs,
+  pkgs',
  lib,
  config,
  ...
 }:

+let
+  homepage = "127.0.0.1:30080";
+  nextcloudPort = 8080;
+  sshPort = 2222;
+in
 {
  imports = [
-    ./git.nix
    ./hardware-configuration.nix
-    ./podman.nix
-    ./matrix.nix
-    ./nextcloud.nix
-    ./nginx.nix
-    ./postgres.nix
  ];

+  age.secrets = {
+    acme.file = ../../../secrets/acme.age;
+    nextcloudadmin = {
+      file = ../../../secrets/nextcloudadmin.age;
+      owner = "nextcloud";
+    };
+  };
+
  environment.systemPackages = with pkgs; [
    bind
    graphviz
    nix-du
    pgloader
+    podman-compose
+    pkgs'.upgrade-pg-cluster
  ];

  greg = {
+    backup.jobs = {
+      nextcloud-bkup = {
+        src = "/var/lib/nextcloud";
+        dest = "nextcloud-backup";
+        pre = lib.getExe (
+          pkgs.writeShellApplication {
+            name = "nextcloud-backup-pre";
+            runtimeInputs = [ config.services.nextcloud.occ ];
+            text = "nextcloud-occ maintenance:mode --on";
+          }
+        );
+        post = lib.getExe (
+          pkgs.writeShellApplication {
+            name = "nextcloud-backup-post";
+            runtimeInputs = [ config.services.nextcloud.occ ];
+            text = "nextcloud-occ maintenance:mode --off";
+          }
+        );
+      };
+      greg-postgresql-backup = {
+        src = config.services.postgresqlBackup.location;
+        dest = "linode-postgres";
+      };
+    };
    gitea-runner = {
-      enable = true;
+      enable = false;
      extraLabels = [
        "vps:host"
        "blog:host"
@@ -37,19 +71,22 @@
      enable = true;
      isLighthouse = true;
    };
-    proxies."immich.thehellings.com" = {
-      genAliases = false;
-      target = "http://localhost:${builtins.toString config.services.immich-public-proxy.port}";
-      ssl = true;
-    };
    tailscale.enable = true;
  };

  networking = {
-    networkmanager.enable = lib.mkForce false;
-    hostName = "linode";
    domain = "thehellings.com";
-    nameservers = [ "100.88.91.27" ];
+    firewall.allowedTCPPorts = [
+      sshPort
+      80
+      443
+    ];
+    hostName = "linode";
+    nameservers = [
+      "10.157.0.2"
+      "100.96.198.104"
+    ];
+    networkmanager.enable = lib.mkForce false;
  };

  programs.ssh.extraConfig = lib.strings.concatStringsSep "\n" [
@@ -60,10 +97,242 @@
    "    UserKnownHostsFile /dev/null"
  ];

+  security.acme = {
+    acceptTerms = true;
+    defaults = {
+      dnsPropagationCheck = false;
+      dnsResolver = "92.123.95.3:53,92.123.94.3:53,92.123.94.2:53,92.123.95.4:53,92.123.95.2:53";
+      email = "greg.hellings@gmail.com";
+      extraLegoRunFlags = [ "--ipv4only" ]; # Force IPv4 only
+      #server = "https://acme-staging-v02.api.letsencrypt.org/directory";
+    };
+    certs."thehellings.com" = {
+      dnsProvider = "linode";
+      environmentFile = config.age.secrets.acme.path;
+      extraDomainNames = [
+        "*.thehellings.com"
+      ];
+    };
+  };
+
  services = {
+
+    anubis = {
+      instances = {
+        git = {
+          enable = true;
+          settings = {
+            BIND = "/run/anubis/anubis-git/anubis.sock";
+            COOKIE_DOMAIN = "thehellings.com";
+            SERVE_ROBOTS_TXT = true;
+            SLOG_LEVEL = "DEBUG";
+            TARGET = "http://git.k3s.nebula.thehellings.com";
+          };
+        };
+      };
+    };
+
+    haproxy = {
+      enable = true;
+      config = ''
+        global
+          nbthread 4
+          maxconn 80
+          log /dev/log local0
+
+        defaults
+          timeout connect 500s
+          timeout client 500s
+          timeout server 1h
+
+        listen gitsshd
+          bind *:${toString sshPort}
+          timeout client 1h
+          mode tcp
+          server git-isaiah isaiah.nebula.thehellings.com:32222
+          server git-jeremiah jeremiah.nebula.thehellings.com:32222
+          server git-zeke zeke.nebula.thehellings.com:32222
+
+        frontend https
+          bind *:80
+          bind *:443 ssl crt ${config.security.acme.certs."thehellings.com".directory}/full.pem
+
+          http-request redirect scheme https unless { ssl_fc }
+          http-request add-header X-Forwarded-Proto https
+
+          http-response replace-header ^Set-Cookie:\ (.*) Set-Cookie \1;\ Secure
+
+          option http-server-close
+          option http-keep-alive
+
+          #option httplog
+          #declare capture response len 80
+          #http-response capture res.hdr(Location) id 0
+
+          use_backend git if { hdr(host) -i src.thehellings.com }
+          use_backend git if { req_ssl_sni -i src.thehellings.com }
+          use_backend next if { hdr(host) -i next.thehellings.com }
+          use_backend next if { req_ssl_sni -i next.thehellings.com }
+          use_backend matrix if { hdr(host) -i matrix.thehellings.com }
+          use_backend matrix if { req_ssl_sni -i matrix.thehellings.com }
+          use_backend web if { hdr(host) -i thehellings.com }
+          use_backend web if { req_ssl_sni -i thehellings.com }
+
+        backend git
+          mode http
+          balance roundrobin
+          option accept-unsafe-violations-in-http-response
+          retries 3
+          option forwardfor
+          http-request set-header Host git.k3s.nebula.thehellings.com
+          server git-isaiah isaiah.nebula.thehellings.com:80
+          server git-jeremiah jeremiah.nebula.thehellings.com:80
+          server git-zeke zeke.nebula.thehellings.com:80
+
+        backend matrix
+          mode http
+          balance roundrobin
+          option accept-unsafe-violations-in-http-response
+          retries 3
+          option forwardfor
+          http-request set-header Host matrix.k3s.nebula.thehellings.com
+          server git-isaiah isaiah.nebula.thehellings.com:80
+          server git-jeremiah jeremiah.nebula.thehellings.com:80
+          server git-zeke zeke.nebula.thehellings.com:80
+
+        backend web
+          mode http
+          balance roundrobin
+          option accept-unsafe-violations-in-http-response
+          retries 3
+          option forwardfor
+          server web-container ${homepage}
+
+        backend next
+          log global
+          mode http
+          balance roundrobin
+          option accept-unsafe-violations-in-http-response
+          retries 3
+          option forwardfor
+          #http-response replace-value Location http://localhost:${builtins.toString nextcloudPort}/(.*) https://next.thehellings.com/\2
+          server nextcloud 127.0.0.1:${builtins.toString nextcloudPort}
+      '';
+    };
+
    immich-public-proxy = {
      enable = true;
      immichUrl = "https://immich.shire-zebra.ts.net";
    };
+
+    logrotate = {
+      enable = true;
+      settings = {
+        postgresBackup = {
+          enable = true;
+          files = "${config.services.postgresqlBackup.location}/*.gz";
+        };
+        postgresLog = {
+          enable = true;
+          files = "/var/lib/postgresql/*/log/*.log";
+          compress = true;
+          compresscmd = "${pkgs.xz}/bin/xz";
+        };
+      };
+    };
+
+    nextcloud = {
+      enable = true;
+      package = pkgs.nextcloud33;
+      appstoreEnable = true;
+      hostName = "localhost";
+      https = false;
+      config = {
+        adminpassFile = config.age.secrets.nextcloudadmin.path;
+        adminuser = "greg";
+        dbhost = "/run/postgresql";
+        dbtype = "pgsql";
+      };
+      settings = {
+        default_phone_region = "US";
+        overwriteprotocol = "http";
+        trusted_domains = [ "next.thehellings.com" ];
+        trusted_proxies = [
+          "localhost"
+          "127.0.0.1"
+        ];
+      };
+    };
+
+    # Move to :8080 so that we can run haproxy as the primary HTTP service
+    nginx.virtualHosts."${config.services.nextcloud.hostName}".listen = [
+      {
+        addr = "127.0.0.1";
+        port = nextcloudPort;
+      }
+    ];
+
+    openssh.settings.PasswordAuthentication = false;
+
+    postgresql = {
+      enable = true;
+      package = pkgs.postgresql_15;
+      checkConfig = true;
+      ensureDatabases = [ "nextcloud" ];
+      #initialScript = pkgs.writeText "create-matrix-db.sql" ''
+      #	CREATE ROLE "matrix-synapse" WITH LOGIN;
+      #	CREATE DATABASE "synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" LC_CTYPE = "C";
+      #	GRANT ALL PRIVILEGES ON DATABASE "synapse" TO "matrix-synapse";
+      #'';  # These are done manually in order to set the LC_COLLATE values properly
+      ensureUsers = [
+        {
+          name = "nextcloud";
+          ensureDBOwnership = true;
+        }
+      ];
+      settings = {
+        log_connections = true;
+        log_statement = "all";
+        logging_collector = true;
+        log_filename = "postgresql.log";
+      };
+      identMap = ''
+        root root postgres
+      '';
+    };
+
+    postgresqlBackup = {
+      enable = true;
+      databases = [ "nextcloud" ];
+    };
+  };
+
+  systemd.services = {
+    haproxy = {
+      after = [
+        "nextcloud.service"
+        "network-online.target"
+      ];
+      wants = [
+        "nextcloud.service"
+        "network-online.target"
+      ];
+    };
+  };
+
+  users.users.haproxy.extraGroups = [ config.security.acme.certs."thehellings.com".group ];
+
+  # Actually serve the content from here
+  virtualisation.oci-containers = {
+    backend = "podman";
+    containers."homepage" = {
+      image = "registry.thehellings.com:443/greg/homepage/gregs-homepage:latest";
+      ports = [ "${homepage}:80" ];
+    };
+  };
+  virtualisation.podman = {
+    enable = true;
+    dockerCompat = true;
+    dockerSocket.enable = true;
  };
 }
@@ -1,148 +0,0 @@
-{ config, ... }:
-
-let
-  srcDomain = "src.thehellings.com";
-  sshPort = 2222;
-in
-{
-  greg.proxies."${srcDomain}" = {
-    target = "http://unix:${config.services.anubis.instances.git.settings.BIND}";
-    ssl = true;
-    genAliases = false;
-    extraConfig = ''
-      #proxy_ssl_verify off;
-      #proxy_ssl_server_name on;
-
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Http-Version $server_protocol;
-      proxy_set_header User-Agent $http_user_agent;
-      client_max_body_size 100000m;
-
-      #proxy_set_header Host $host;
-      #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      #proxy_set_header X-Forwarded-Proto $scheme;
-      #proxy_set_header X-Forwarded-Ssl on;
-
-      # Ultimate AI Block List v1.7 20250924
-      # https://perishablepress.com/ultimate-ai-block-list/
-
-      if ($http_user_agent ~* "(openai\.com|\.ai|-ai|_ai|ai\.|ai-|ai_|ai=|AddSearchBot|Agentic|AgentQL|Agent\ 3|Agent\ API|AI\ Agent|AI\ Article\ Writer|AI\ Chat|AI\ Content\ Detector|AI\ Detection|AI\ Dungeon|AI\ Journalist|AI\ Legion)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(AI\ RAG|AI\ Search|AI\ SEO\ Crawler|AI\ Training|AI\ Web|AI\ Writer|AI2|AIBot|aiHitBot|AIMatrix|AISearch|AITraining|Alexa|Alice\ Yandex|AliGenie|AliyunSec|Alpha\ AI|AlphaAI|Amazon|Amelia)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(AndersPinkBot|AndiBot|Anonymous\ AI|Anthropic|AnyPicker|Anyword|Applebot|Aria\ AI|Aria\ Browse|Articoolo|Ask\ AI|AutoGen|AutoGLM|Automated\ Writer|AutoML|Autonomous\ RAG|AwarioRssBot|AwarioSmartBot|AWS\ Trainium|Azure)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(BabyAGI|BabyCatAGI|BardBot|Basic\ RAG|Bedrock|Big\ Sur|Bigsur|Botsonic|Brightbot|Browser\ MCP\ Agent|Browser\ Use|Bytebot|ByteDance|Bytespider|CarynAI|CatBoost|CC-Crawler|CCBot|Chai|Character)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Charstar\ AI|Chatbot|ChatGLM|Chatsonic|ChatUser|Chinchilla|Claude|ClearScope|Clearview|Cognitive\ AI|Cohere|Common\ Crawl|CommonCrawl|Content\ Harmony|Content\ King|Content\ Optimizer|Content\ Samurai|ContentAtScale|ContentBot|Contentedge)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(ContentShake|Conversion\ AI|Copilot|CopyAI|Copymatic|Copyscape|CoreWeave|Corrective\ RAG|Cotoyogi|CRAB|Crawl4AI|CrawlQ\ AI|Crawlspace|Crew\ AI|CrewAI|Crushon\ AI|DALL-E|DarkBard|DataFor|DataProvider)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Datenbank\ Crawler|DeepAI|Deep\ AI|DeepL|DeepMind|Deep\ Research|DeepResearch|DeepSeek|Devin|Diffbot|Doubao\ AI|DuckAssistBot|DuckDuckGo\ Chat|DuckDuckGo-Enhanced|Echobot|Echobox|Elixir|FacebookBot|FacebookExternalHit|Factset)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Falcon|FIRE-1|Firebase|Firecrawl|Flux|Flyriver|Frase\ AI|FriendlyCrawler|Gato|Gemini|Gemma|Gen\ AI|GenAI|Generative|Genspark|Gentoo-chat|Ghostwriter|GigaChat|GLM|GodMode)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Goose|GPT|Grammarly|Grendizer|Grok|GT\ Bot|GTBot|GTP|Hemingway\ Editor|Hetzner|Hugging|Hunyuan|Hybrid\ Search\ RAG|Hypotenuse\ AI|iAsk|ICC-Crawler|ImageGen|ImagesiftBot|img2dataset|imgproxy)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(INK\ Editor|INKforall|Instructor|IntelliSeek|Inferkit|ISSCyberRiskCrawler|Janitor\ AI|Jasper|Jenni\ AI|Julius\ AI|Kafkai|Kaggle|Kangaroo|Keyword\ Density\ AI|Kimi|Knowledge|KomoBot|Kruti|LangChain|Le\ Chat)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Lensa|Lightpanda|LinerBot|LLaMA|LLM|Local\ RAG\ Agent|Lovable|Magistral|magpie-crawler|Manus|MarketMuse|Meltwater|Meta-AI|Meta-External|Meta-Webindexer|Meta\ AI|MetaAI|MetaTagBot|Middleware|Midjourney)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Mini\ AGI|MiniMax|Mintlify|Mistral|Mixtral|model-training|Monica|Narrative|NeevaBot|netEstate|Neural\ Text|NeuralSEO|NinjaAI|NodeZero|Nova\ Act|NovaAct|OAI-SearchBot|OAI\ SearchBot|OASIS|Olivia)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Omgili|Open\ AI|Open\ Interpreter|OpenAGI|OpenAI|OpenBot|OpenPi|OpenRouter|OpenText\ AI|Operator|Outwrite|Page\ Analyzer\ AI|PanguBot|Panscient|Paperlibot|Paraphraser\.io|peer39_crawler|Perflexity|Perplexity|Petal)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Phind|PiplBot|PoeBot|PoeSearchBot|ProWritingAid|Proximic|Puppeteer|Python\ AI|Qualified|Quark|QuillBot|Qopywriter|Qwen|RAG\ Agent|RAG\ Azure\ AI|RAG\ Chatbot|RAG\ Database|RAG\ IS|RAG\ Pipeline|RAG\ Search)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(RAG\ with|RAG-|RAG_|Raptor|React\ Agent|Redis\ AI\ RAG|RobotSpider|Rytr|SaplingAI|SBIntuitionsBot|Scala|Scalenut|Scrap|ScriptBook|Seekr|SEObot|SEO\ Content\ Machine|SEO\ Robot|SemrushBot|Sentibot)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Serper|ShapBot|Sidetrade|Simplified\ AI|Sitefinity|Skydancer|SlickWrite|SmartBot|Sonic|Sora|Spider/2|SpiderCreator|Spin\ Rewrite|Spinbot|Stability|StableDiffusionBot|Sudowrite|SummalyBot|Super\ Agent|Superagent)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(SuperAGI|Surfer\ AI|TerraCotta|Text\ Blaze|TextCortex|Thinkbot|Thordata|TikTokSpider|Timpibot|Tinybird|Together\ AI|Traefik|TurnitinBot|uAgents|VelenPublicWebCrawler|Venus\ Chub\ AI|Vidnami\ AI|Vision\ RAG|WebSurfer|WebText)") {
-        return 444;
-      }
-      if ($http_user_agent ~* "(Webzio|WeChat|Whisper|WordAI|Wordtune|WPBot|Writecream|WriterZen|Writescope|Writesonic|xAI|xBot|YaML|YandexAdditional|YouBot|Zendesk|Zero|Zhipu|Zhuque\ AI|Zimm)") {
-        return 444;
-      }
-    '';
-  };
-  #greg.proxies."registry.thehellings.com" = {
-  #target = "https://gitea.shire-zebra.ts.net:5000";
-  #ssl = true;
-  #genAliases = false;
-  #extraConfig = ''
-  #proxy_set_header X-Forwarded-Proto https;
-  #proxy_set_header X-Forwarded-Ssl on;
-  #client_max_body_size 25000m;
-  #'';
-  #};
-
-  networking.firewall.allowedTCPPorts = [ sshPort ];
-
-  services = {
-    anubis = {
-      instances = {
-        git = {
-          enable = true;
-          settings = {
-            BIND = "/run/anubis/anubis-git/anubis.sock";
-            COOKIE_DOMAIN = "thehellings.com";
-            SERVE_ROBOTS_TXT = true;
-            TARGET = "https://gitea.shire-zebra.ts.net/";
-          };
-        };
-      };
-    };
-
-    haproxy = {
-      enable = true;
-      config = ''
-        global
-          daemon
-          maxconn 20
-
-        defaults
-          timeout connect 500s
-          timeout client 500s
-          timeout server 1h
-
-        listen gitsshd
-          bind *:${toString sshPort}
-          timeout client 1h
-          mode tcp
-          server git-isaiah isaiah.shire-zebra.ts.net:32222
-          server git-jeremiah jeremiah.shire-zebra.ts.net:32222
-          server git-zeke zeke.shire-zebra.ts.net:32222
-      '';
-    };
-  };
-
-  systemd.services = {
-    haproxy = {
-      after = [
-        "network-online.target"
-      ];
-      wants = [
-        "network-online.target"
-      ];
-    };
-  };
-
-  users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
-}
@@ -1,70 +0,0 @@
-# Registration of new users is disabled for the public, but I can create
-# them by the following commands:
-# nix run nixpkgs.matrix-synapse
-# register_new_matrix_user -k "B9EoPr2WV9hzwc7uL2Sx1JmvCeKDEOGCpB0uginQcQtEH4wzRtkSIdo7lltrjSQa" http://localhost:8448
-{ config, ... }:
-let
-  domain = "${config.networking.domain}";
-  fqdn = "matrix.${domain}";
-in
-{
-  greg.proxies."${fqdn}" = {
-    extraConfig = ''
-      error_log /var/log/nginx/debug.log debug;
-      proxy_ssl_verify off;
-      proxy_ssl_server_name on;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Ssl on;
-    '';
-    genAliases = false;
-    ssl = true;
-    target = "https://matrix.shire-zebra.ts.net";
-  };
-  services.nginx = {
-    virtualHosts = {
-      # Server the '.well-known' files to find the Matrix API server
-      "${domain}" = {
-        enableACME = true;
-        forceSSL = true;
-        # This is needed so that servers contacting hellings.com can find
-        # the actual application server at matrix.thehellings.com
-        locations."= /.well-known/matrix/server".extraConfig =
-          let
-            server = {
-              "m.server" = "${fqdn}:443";
-            };
-          in
-          ''
-            add_header Content-Type application/json;
-            return 200 '${builtins.toJSON server}';
-          '';
-
-        locations."= /.well-known/matrix/client".extraConfig =
-          let
-            client = {
-              "m.homeserver" = {
-                "base_url" = "https://${fqdn}";
-              };
-              "m.identity_server" = {
-                "base_url" = "https://vector.im";
-              };
-            };
-          in
-          ''
-            add_header Content-Type application/json;
-            add_header Access-Control-Allow-Origin *;
-            return 200 '${builtins.toJSON client}';
-          '';
-      };
-    };
-  };
-
-  # Open networking ports for the server
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [
-      80
-      443
-    ];
-  };
-}
@@ -1,58 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  age.secrets.nextcloudadmin = {
-    file = ../../../secrets/nextcloudadmin.age;
-    owner = "nextcloud";
-  };
-
-  services.nextcloud = {
-    enable = true;
-    package = pkgs.nextcloud33;
-    appstoreEnable = true;
-    hostName = "next.${config.networking.domain}";
-    https = true;
-    config = {
-      adminpassFile = config.age.secrets.nextcloudadmin.path;
-      adminuser = "greg";
-      dbhost = "/run/postgresql";
-      dbtype = "pgsql";
-    };
-    settings = {
-      default_phone_region = "US";
-      overwriteprotocol = "https";
-    };
-  };
-
-  services.nginx.virtualHosts."next.thehellings.com" = {
-    forceSSL = true;
-    enableACME = true;
-  };
-
-  # Otherwise nginx errors looking for the nextcloud sock file
-  systemd.services.nginx.after = [ "nextcloud.service" ];
-
-  greg.backup.jobs.nextcloud-bkup = {
-    src = "/var/lib/nextcloud";
-    dest = "nextcloud-backup";
-    pre = lib.getExe (
-      pkgs.writeShellApplication {
-        name = "nextcloud-backup-pre";
-        runtimeInputs = [ config.services.nextcloud.occ ];
-        text = "nextcloud-occ maintenance:mode --on";
-      }
-    );
-    post = lib.getExe (
-      pkgs.writeShellApplication {
-        name = "nextcloud-backup-post";
-        runtimeInputs = [ config.services.nextcloud.occ ];
-        text = "nextcloud-occ maintenance:mode --off";
-      }
-    );
-  };
-}
@@ -1,38 +0,0 @@
-{ ... }:
-let
-  homepage = "127.0.0.1:30080";
-in
-{
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "greg.hellings@gmail.com";
-  };
-
-  services.nginx = {
-    enable = true;
-
-    clientMaxBodySize = "25000m"; # To help with uploading container images
-    # If there are recommended settings, let's use them!
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-    recommendedProxySettings = true;
-    recommendedTlsSettings = true;
-  };
-
-  # Actually serve the content from here
-  virtualisation.podman.enable = true;
-  virtualisation.oci-containers = {
-    backend = "podman";
-    containers."homepage" = {
-      image = "registry.thehellings.com:443/greg/homepage/gregs-homepage:latest";
-      ports = [ "${homepage}:80" ];
-    };
-  };
-  greg.proxies = {
-    "thehellings.com" = {
-      target = "http://${homepage}/";
-      ssl = true;
-      genAliases = false;
-    };
-  };
-}
@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    podman-compose
-  ];
-
-  virtualisation.podman = {
-    enable = true;
-    dockerCompat = true;
-    dockerSocket.enable = true;
-  };
-}
@@ -1,63 +0,0 @@
-{
-  config,
-  pkgs,
-  pkgs',
-  ...
-}:
-
-{
-  environment.systemPackages = [ pkgs'.upgrade-pg-cluster ];
-
-  services.postgresql = {
-    enable = true;
-    package = pkgs.postgresql_15;
-    checkConfig = true;
-    ensureDatabases = [ "nextcloud" ];
-    #initialScript = pkgs.writeText "create-matrix-db.sql" ''
-    #	CREATE ROLE "matrix-synapse" WITH LOGIN;
-    #	CREATE DATABASE "synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" LC_CTYPE = "C";
-    #	GRANT ALL PRIVILEGES ON DATABASE "synapse" TO "matrix-synapse";
-    #'';  # These are done manually in order to set the LC_COLLATE values properly
-    ensureUsers = [
-      {
-        name = "nextcloud";
-        ensureDBOwnership = true;
-      }
-    ];
-    settings = {
-      log_connections = true;
-      log_statement = "all";
-      logging_collector = true;
-      log_filename = "postgresql.log";
-    };
-    identMap = ''
-      root root postgres
-    '';
-  };
-
-  services.postgresqlBackup = {
-    enable = true;
-    databases = [ "nextcloud" ];
-  };
-
-  services.logrotate = {
-    enable = true;
-    settings = {
-      postgresBackup = {
-        enable = true;
-        files = "${config.services.postgresqlBackup.location}/*.gz";
-      };
-      postgresLog = {
-        enable = true;
-        files = "/var/lib/postgresql/*/log/*.log";
-        compress = true;
-        compresscmd = "${pkgs.xz}/bin/xz";
-      };
-    };
-  };
-
-  greg.backup.jobs.greg-postgresql-backup = {
-    src = config.services.postgresqlBackup.location;
-    dest = "linode-postgres";
-  };
-}
@@ -1,60 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ pkgs, ... }:
-
-{
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-  ];
-
-  # Bootloader.
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-  ];
-
-  greg = {
-    home = true;
-    tailscale = {
-      enable = true;
-      tags = [ "home" ];
-    };
-  };
-
-  networking = {
-    hostName = "proxmoxtemplate"; # Define your hostname.
-    # defaultGateway = {
-    #   address = " 10.42.1.2";
-    #   interface = "enp6s18";
-    # };
-    # interfaces = {
-    #   enp6s18 = {
-    #     ipv4.addresses = [
-    #       {
-    #         address = "10.42.1.8";
-    #         prefixLength = 16;
-    #       }
-    #     ];
-    #   };
-    # };
-    nameservers = [ "10.42.1.5" ];
-  };
-
-  services.qemuGuest.enable = true;
-
-  system.stateVersion = "24.11"; # Did you read the comment?
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.greg = {
-    isNormalUser = true;
-    description = "Greg Hellings";
-    extraGroups = [ "wheel" ];
-    packages = with pkgs; [ ];
-  };
-}
@@ -1,50 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "uhci_hcd"
-    "ehci_pci"
-    "ahci"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/507251f1-efe7-448d-8de8-91ee582a9afb";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/7115-EFA6";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
-}
@@ -12,3 +12,20 @@ spec:
  tls:
    - hosts:
        - gitea
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gitea-direct
+spec:
+  rules:
+    - host: git.k3s.nebula.thehellings.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: gitea-release-http
+                port:
+                  name: http
@@ -13,3 +13,20 @@ spec:
  tls:
    - hosts:
        - matrix
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: matrix-direct
+spec:
+  rules:
+    - host: matrix.k3s.nebula.thehellings.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: dendrite
+                port:
+                  number: 8008
@@ -62,12 +62,12 @@ in
            if cfg.cache then
              [
                #"http://chronicles.shire-zebra.ts.net:9000/binary-cache/"
-                "http://nas1.shire-zebra.ts.net:9000/niks3"
+                "http://niks3.nas1.shire-zebra.ts.net:30189/"
                #"http://nas1.shire-zebra.ts.net:8080/default"
              ]
            else
              [
-                "http://nas1.thehellings.lan:8080/default"
+                "http://niks3.nas1.thehellings.lan:30189/"
              ]
          )
          ++ [
@@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }:

@@ -18,35 +17,9 @@ with lib;
  };

  config = mkIf cfg {
-    age.secrets.attic.file = ../../secrets/attic.age;
    networking.domain = "thehellings.lan";
    time.timeZone = "America/Chicago";

-    systemd.services.attic-client = {
-      enable = true;
-      description = "Attic client watch-store service";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        Type = "simple";
-        Restart = "on-failure";
-        RestartSec = "5s";
-      };
-      preStart = ''
-        set -x
-        mkdir -p $XDG_CONFIG_HOME/attic
-        cp ${config.age.secrets.attic.path} $XDG_CONFIG_HOME/attic/config.toml
-      '';
-      script = "${pkgs.attic-client}/bin/attic watch-store --ignore-upstream-cache-filter default";
-      environment = {
-        XDG_CONFIG_HOME = "/var/lib/attic-client";
-      };
-    };
-
-    systemd.tmpfiles.rules = [
-      "d /var/lib/attic-client 0755 root root -"
-    ];
-
    # Open Prometheus exporter ports on LAN-connected hosts only.
    # NOT in baseline.nix to avoid exposing these on internet-facing hosts (e.g. linode).
    networking.firewall.allowedTCPPorts = [
@@ -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 = {
@@ -9,12 +9,9 @@
    "tailscale": "100.64.0.0/10"
  },
  "hosts": {
-    "chronicles": {
-      "ip": "10.42.1.4",
-      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBecZUva9OnZuXLaBun6/1ITo5f9p0YMLPD+q0egLRS",
-      "external": true,
-      "ts": "100.119.228.115",
-      "aliases": ["s3"]
+    "builder2": {
+      "ip": "10.42.1.17",
+      "system": "x86_64-linux"
    },
    "exodus": {
      "ip": null,
@@ -31,6 +28,15 @@
      "tags": ["router", "server"],
      "nebulaIp": "10.157.0.2"
    },
+    "gregory.hellings-mbp": {
+      "external": true,
+      "system": "aarch64-darwin",
+      "user": "gregory.hellings"
+    },
+    "gregs-MacBook-Pro-16-inch-Nov-2024": {
+      "external": true,
+      "system": "aarch64-darwin"
+    },
    "hosea": {
      "ip": "10.42.1.7",
      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz",
@@ -39,10 +45,6 @@
      "tags": ["server"],
      "nebulaIp": "10.157.0.3"
    },
-    "icdm-root": {
-      "external": true,
-      "system": "x86_64-linux"
-    },
    "isaiah": {
      "builder": true,
      "ip": "10.42.1.6",
@@ -57,12 +59,12 @@
      "external": true,
      "system": "x86_64-linux"
    },
-    "gregory.hellings-mbp": {
+    "ivr": {
      "external": true,
-      "system": "aarch64-darwin",
-      "user": "gregory.hellings"
+      "system": "aarch64-darwin"
    },
    "jeremiah": {
+      "aliases": ["buildbot"],
      "builder": true,
      "ip": "10.42.1.8",
      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0",
@@ -72,14 +74,12 @@
      "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"
+    "kuma": {
+      "ip": "10.42.1.19",
+      "nebulaIp": "10.157.0.8",
+      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIhr+LmYMOk4Hixxew2FiAvL8sycgQvnhK8PBGjfnkJb",
+      "system": "x86_64-linux",
+      "tags": ["server"]
    },
    "lithic": {
      "external": true,
@@ -93,10 +93,6 @@
      "tags": ["public", "server"],
      "nebulaIp": "10.157.0.1"
    },
-    "ivr": {
-      "external": true,
-      "system": "aarch64-darwin"
-    },
    "MacBook-Pro.local": {
      "external": true,
      "system": "aarch64-darwin"
@@ -105,38 +101,10 @@
      "external": true,
      "system": "aarch64-darwin"
    },
-    "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"
-    },
-    "pve3": {
-      "external": true,
-      "ip": "10.42.1.16",
-      "system": "x86_64-linux"
-    },
-    "pve4": {
-      "external": true,
-      "ip": "10.42.1.17",
-      "system": "x86_64-linux"
-    },
    "wsl": {
      "external": true,
      "system": "aarch64-linux"
@@ -151,5 +119,57 @@
      "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",
+      "mac": "00:25:90:4a:d8:2e"
+    }
  }
 }
@@ -16,12 +16,15 @@ let
    adblock_update = c ./adblock_update.nix { };
    brew = c ./homebrew.nix { };
    create_ssl = c ./create_ssl.nix { };
-    dockerCompat = pkgs.runCommand "docker-compat" {
-      nativeBuildInputs  = [];
-    } ''
-      mkdir -p $out/bin
-      ln -s ${pkgs.podman}/bin/podman $out/bin/docker
-    '';
+    dockerCompat =
+      pkgs.runCommand "docker-compat"
+        {
+          nativeBuildInputs = [ ];
+        }
+        ''
+          mkdir -p $out/bin
+          ln -s ${pkgs.podman}/bin/podman $out/bin/docker
+        '';
    gcc-tune = c ./gcc-tune.nix { };
    #gen-build = c ./gen-build { };
    hms = c ./hms { };
@@ -29,6 +32,7 @@ let
    inject = c ./inject.nix { };
    setup-ssh = c ./setup-ssh { };
    upgrade-pg-cluster = c ./upgrade-pg-cluster.nix { };
+    zim-updater = c ./zim/updater.nix { };
  };
  x86Linux = {
    qemu-hook = c ./qemu-hook.nix { };
@@ -2,18 +2,18 @@
  "en": {
    "gutenberg": {
      "name": "gutenberg_en_all",
-      "version": "2023-08",
-      "hash": "sha256-OXmdHdsLZcW4nCUQsy7sMpUssS8NV7ztkCgS/nsISuw="
+      "version": "2025-11",
+      "hash": "sha256-AWd8jVVKHKssv9AgrJnryn3Wx0084NE/JmorpgPfryg="
    },
    "phet": {
      "name": "phet_en_all",
-      "version": "2025-03",
-      "hash": "sha256-ARuUzU2o17J2/ZedHc2acXl33dtHCbQJEb72UQUEm1Y="
+      "version": "2026-05",
+      "hash": "sha256-zAAq/X5rjQUiYmjMpBtWP5z3J2ZHJMmIxFKnxLAhOlA="
    },
    "wikibooks": {
      "name": "wikibooks_en_all_maxi",
-      "version": "2025-10",
-      "hash": "sha256-ONBh/ze1Fv2Ffm5b9vDzYS/i2cWSa4pM4MLZnozr2n8="
+      "version": "2026-04",
+      "hash": "sha256-wt7Zr+RkfCsFrOudMCYBADacu6IvPQDkZ6Y0VG2j9hA="
    },
    "wikipedia": {
      "name": "wikipedia_en_all_maxi",
@@ -22,40 +22,40 @@
    },
    "wikisource": {
      "name": "wikisource_en_all_maxi",
-      "version": "2025-11",
-      "hash": "sha256-p1Jio+PMTZVSLIDIOBeMG3acXJg83CwQM7zIWDUyozM="
+      "version": "2026-05",
+      "hash": "sha256-OA4b+U8mxpcX3fst6hrMyctucYTQOlG/b4qZDiVlcf4="
    },
    "wikiversity": {
      "name": "wikiversity_en_all_maxi",
-      "version": "2025-11",
-      "hash": "sha256-IG/gAUdc/vHRrIWGHhw8vMJdLWwqrNbfh+SiclQRIAI="
+      "version": "2026-05",
+      "hash": "sha256-8mZ1CSUcF4QnDIyN0M2KedQ4pcSUCmzHBlOm93MYpCE="
    },
    "wiktionary": {
      "name": "wiktionary_en_all_nopic",
-      "version": "2025-09",
-      "hash": "sha256-Ghcb60qeGaSJtTKQkJoMx/XucX7Lt1XY145lD3gHlMg="
+      "version": "2026-05",
+      "hash": "sha256-Dwiz+viVQt0zb077R9KQRgtUtxG9ixA/DeXAkCdD4rM="
    }
  },
  "fr": {
    "gutenberg": {
      "name": "gutenberg_fr_all",
-      "version": "2025-10",
-      "hash": "sha256-gLHxLXJNwwcxM/mZHtoJ8ojbGQ1fugxgni/+RXccwhU="
+      "version": "2026-01",
+      "hash": "sha256-sGn1TeKwBK0+Er5YOJWq6g0itEm4gIGvKxv/PW0DIao="
    },
    "phet": {
      "name": "phet_fr_all",
-      "version": "2025-03",
-      "hash": "sha256-CSboZNTIowLLhp1u9wkxH8xmu3LvQNx5q493AOYJRIc="
+      "version": "2026-05",
+      "hash": "sha256-bJmchFnaPcofE/hy3ZcRggMT9osHqXwLbwMLJ+cpF28="
    },
    "wikibooks": {
      "name": "wikibooks_fr_all_maxi",
-      "version": "2025-09",
-      "hash": "sha256-KHCc/73L5Bd9iZ47SRV6vpI8fVM1v9hk1TpEvTro2uo="
+      "version": "2026-07",
+      "hash": "sha256-csI+E5UFGi42BLGWWHxQhVr5KSihCFc53KGKwo557Ck="
    },
    "wikipedia": {
      "name": "wikipedia_fr_all_maxi",
-      "version": "2025-06",
-      "hash": "sha256-ve7Mbh96/ObNbV/KVNYZpfLN+HdWlJ7C5LItEdVkRH0="
+      "version": "2026-05",
+      "hash": "sha256-YUAbGzYYr+c2RQqGjHIF9XL1kNsxDgRKnHK1H7/PtDE="
    },
    "wikisource": {
      "name": "wikisource_fr_all_maxi",
@@ -64,25 +64,25 @@
    },
    "wikiversity": {
      "name": "wikiversity_fr_all_maxi",
-      "version": "2025-09",
-      "hash": "sha256-55fdtw/cRezq6nkRp6wuwkukBiqsQKdwh9QWVAgFcBI="
+      "version": "2026-05",
+      "hash": "sha256-nVDHtkWIOJkoiGixnA1zVR1QS58thjc12FJyagK3Ec0="
    },
    "wiktionary": {
      "name": "wiktionary_fr_all_nopic",
-      "version": "2025-11",
-      "hash": "sha256-P0CJptee5rDzccxyRDBzyRLuuFOcaLsJYi6DkBFUfIc="
+      "version": "2026-05",
+      "hash": "sha256-7UXByW2IIL0hec8RPT39jpg5IEGvRMD47hc4Y4vFkJs="
    }
  },
  "ht": {
    "phet": {
      "name": "phet_ht_all",
-      "version": "2025-03",
-      "hash": "sha256-bHrPzE8H7ptrP6r5wPlXSsXNlTiKxJ9KatABC4kwx+s="
+      "version": "2026-05",
+      "hash": "sha256-GiJ1jllhioyMYidQ7+Lcbdd9JN2yf04ZQgnO8XaGAqY="
    },
    "wikipedia": {
      "name": "wikipedia_ht_all_maxi",
-      "version": "2026-04",
-      "hash": "sha256-qUX0pKxIyNsWX4V6kNIsP4Z9nc6TDhwdDR0MmpDOQFs="
+      "version": "2026-07",
+      "hash": "sha256-InS9cMRaIv9ArlKVwKUypz56m4DgSR7Tl6XpSTMzH+o="
    }
  }
 }
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
-	"path/filepath"
+	"reflect"
 	"regexp"
 	"sort"
 	"strings"
@@ -17,27 +17,144 @@ import (

 const BASE = "https://download.kiwix.org/zim"

-func getTypes() []string {
-	return []string{
-		"phet",
-		"wikipedia",
-		"wiktionary",
-		"wikiversity",
-		"wikisource",
-		"wikibooks",
-		"gutenberg",
-		"ted",
+// ///////////////////////////////////////////////////////////////////////////
+// ////////////////  THE BLOB ITSELF /////////////////////////////////////////
+// ///////////////////////////////////////////////////////////////////////////
+type Blobs struct {
+	En    Language `json:"en"`
+	Fr    Language `json:"fr"`
+	Ht    Language `json:"ht"`
+	dirty bool
+}
+
+func (b *Blobs) Populate() {
+	done := make(chan bool)
+	waitFor := 0
+	// Launch self-populating efforts
+	blobType := reflect.Indirect(reflect.ValueOf(b)).Type()
+	for f := range blobType.Fields() {
+		if f.IsExported() {
+			//fmt.Printf("%s:\tBeginning population efforts\n", f.Name)
+			waitFor += 1
+			go reflect.Indirect(reflect.ValueOf(b)).
+				FieldByName(f.Name).
+				Addr().
+				Interface().
+				(*Language).
+				Populate(strings.ToLower(f.Name), done)
+		}
+	}
+	// Wait until all languages are completed
+	for d := range done {
+		waitFor -= 1
+		if waitFor == 0 {
+			fmt.Println("Completed waiting for all languages")
+			close(done)
+			break
+		}
+		b.dirty = b.dirty || d
 	}
 }

-func getLanguages() []string {
-	return []string{
-		"ht",
-		"en",
-		"fr",
+/////////////////////////////////////////////////////////////////////////////
+//////////////////////// The Language ///////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+type Language struct {
+	Gutenberg   *Zim `json:"gutenberg,omitempty"`
+	Phet        *Zim `json:"phet,omitempty"`
+	Ted         *Zim `json:"ted,omitempty"`
+	Wikibooks   *Zim `json:"wikibooks,omitempty"`
+	Wikipedia   *Zim `json:"wikipedia,omitempty"`
+	Wikisource  *Zim `json:"wikisource,omitempty"`
+	Wikiversity *Zim `json:"wikiversity,omitempty"`
+	Wiktionary  *Zim `json:"wiktionary,omitempty"`
+	dirty       bool
+}
+
+func (l *Language) Populate(code string, done chan bool) {
+	childDone := make(chan bool)
+	waitFor := 0
+	languageType := reflect.Indirect(reflect.ValueOf(l)).Type()
+	l.dirty = false
+	for f := range languageType.Fields() {
+		if f.IsExported() {
+			ptrPtrZim := reflect.Indirect(reflect.ValueOf(l)).
+			    FieldByName(f.Name)
+			if ptrPtrZim.IsValid() && !ptrPtrZim.IsNil() {
+				waitFor += 1
+				go reflect.Indirect(ptrPtrZim).
+				    Addr().
+				    Interface().
+				    (*Zim).
+				    Populate(strings.ToLower(f.Name), code, childDone)
+			} else {
+				// TODO: Figure out how to set a value over the nil pointer
+				// of the field, so we can auto-detect when these are available
+				// in the future
+				// waitFor += 1
+				//z := &Zim{Name: f.Name, Version: "1999-01-01", Hash: ""}
+				//ptrPtrZim.Set(reflect.ValueOf(z))
+				//go z.Populate(strings.ToLower(f.Name), code, childDone)
+			}
+		}
+	}
+	// Wait until children are all done
+	for d := range childDone {
+		waitFor -= 1
+		if waitFor == 0 {
+			close(childDone)
+			break
+		}
+		l.dirty = l.dirty || d
+	}
+
+	//fmt.Printf("%s\tFinished populate\n", code)
+	done <- l.dirty
+}
+
+// ///////////////////////////////////////////////////////////////////////////
+// ////////////////////// A Single Zim ///////////////////////////////////////
+// ///////////////////////////////////////////////////////////////////////////
+type Zim struct {
+	Name    string `json:"name"`
+	Version string `json:"version"`
+	Hash    string `json:"hash"`
+	dirty   bool
+}
+
+func (z *Zim) Populate(category string, language string, done chan bool) {
+	//fmt.Printf("%s:%s\tBeginning populate for\n", language, category)
+	// Look for a possible Zim file
+	links := getLinks(getPage(category))
+	link, err := getName(links, category, language)
+	if err != nil {
+		fmt.Printf("%s:%s\tNo zim found\n", language, category)
+		done <- false
+		return
+	}
+	//fmt.Printf("%s:%s\tFound link: %s\n", category, language, link)
+	// Extract name and version
+	re := regexp.MustCompilePOSIX("^([a-zA-Z_]+)_([0-9-]+)\\.zim$")
+	match := re.FindStringSubmatch(link)
+	if len(match) != 3 {
+		fmt.Printf("%s:%s Matches: %s", language, category, match)
+		os.Exit(1)
+	}
+	// Check if the name and version mismatch
+	if match[1] == z.Name && match[2] == z.Version {
+		fmt.Printf("Skipping existing hash: %s\n", link)
+		done <- false
+	} else {
+		z.Name = match[1]
+		z.Version = match[2]
+		// Fetch the Zim file, if it differs from what we currently have
+		z.UpdateHash(category)
+		done <- true
 	}
 }

+// Helper function to fetch the HTML of a given type page
 func getPage(t string) string {
 	page, err := http.Get(fmt.Sprintf("%s/%s/", BASE, t))
 	if err != nil {
@@ -48,6 +165,7 @@ func getPage(t string) string {
 	return string(pageBytes)
 }

+// Helper function to parse out all the links from the page
 func getLinks(page string) []string {
 	ret := []string{}

@@ -60,6 +178,7 @@ func getLinks(page string) []string {
 	return ret
 }

+// Helper function to get the most likely link for this particular entry
 func getName(links []string, t, lang string) (string, error) {
 	candidates := []string{}
 	prefix := fmt.Sprintf("%s_%s_all", t, lang)
@@ -79,44 +198,39 @@ func getName(links []string, t, lang string) (string, error) {
 	}
 }

-func getHash(ch chan result, file, category, language string) {
-	// TODO: Only call this if the file doesn't already have a hash
-	// in the existing file
-	fmt.Printf("Fetching hash for %s\n", file)
-	cmd := exec.Command( "nix-prefetch-url", fmt.Sprintf("%s/%s/%s", BASE, category, file))
+// Helper function to get the hash value from the resulting link
+func (z *Zim) UpdateHash(category string) error {
+	file := fmt.Sprintf("%s_%s.zim", z.Name, z.Version)
+
+	// First fetch the file into our local Nix store
+	fmt.Printf("Fetching hash: %s\n", file)
+	cmd := exec.Command("nix-prefetch-url", fmt.Sprintf("%s/%s/%s", BASE, category, file))
 	out, err := cmd.Output()
 	if err != nil {
-		fmt.Printf("Error fetching hash for %s (category: %s, language: %s): %v\n", file, category, language, err)
+		fmt.Printf("%s: ERROR fetching hash: %v\n", file, err)
 		if exitErr, ok := err.(*exec.ExitError); ok {
 			fmt.Printf("Command stderr: %s\n", string(exitErr.Stderr))
 		}
-		ch <- result{category, language, ""}
-		return
+		return errors.New("Error fetching file")
 	}
 	hash := strings.TrimSpace(string(out))
-	fmt.Printf("Successfully fetched hash for %s (category: %s, language: %s)\n", file, category, language)
-	ch <- result{category, language, hash}
-}
+	fmt.Printf("%s: Successfully fetched raw hash\n", file)
+	fmt.Printf("%s: Hash is: %s\n", file, hash)

-func outputIsValid(o map[string]map[string]Zim) bool {
-	for a := range o {
-		for b := range o[a] {
-			if o[a][b].Hash == "" {
-				return false
-			}
+	// Then, convert the hash to SRI
+	cmd2 := exec.Command("nix", "hash", "convert", "--to", "sri", hash, "--hash-algo", "sha256")
+	out2, err2 := cmd2.Output()
+	if err2 != nil {
+		fmt.Printf("%s: Error converting hash to SRI: %v\n", file, err)
+		if exitErr, ok := err.(*exec.ExitError); ok {
+			fmt.Printf("%s: Command stderr: %s\n", file, string(exitErr.Stderr))
 		}
+		return errors.New("Error fetching file")
 	}
-	return true
-}
-
-type result struct {
-	category, language, hash string
-}
-
-type Zim struct {
-	Name string `json:"name"`
-	Version string `json:"version"`
-	Hash string `json:"hash"`
+	z.Hash = strings.TrimSpace(string(out2))
+	z.dirty = true
+	fmt.Printf("%s: Successfully convert hash to SRI: %s", file, out2)
+	return nil
 }

 func main() {
@@ -125,90 +239,31 @@ func main() {

 	// Determine the output file path
 	var outputPath string
-	if *outputFile != "" {
-		outputPath = *outputFile
-	} else {
-		// Get the directory where updater.go is located
-		execPath, err := os.Executable()
-		if err != nil {
-			// Fallback to current directory if we can't determine executable path
-			outputPath = "blobs.json"
-		} else {
-			dir := filepath.Dir(execPath)
-			outputPath = filepath.Join(dir, "blobs.json")
-		}
-	}
+	outputPath = *outputFile

 	fmt.Println("Writing file to ", outputPath)

 	// Read existing cache if it exists
-	cached := make(map[string]map[string]Zim)
+	var blobs Blobs
 	if data, err := os.ReadFile(outputPath); err == nil {
-		if err := json.Unmarshal(data, &cached); err != nil {
+		if err := json.Unmarshal(data, &blobs); err != nil {
 			fmt.Printf("Warning: could not parse existing cache file: %v\n", err)
 		} else {
 			fmt.Printf("Loaded existing cache from %s\n", outputPath)
 		}
+	} else {
+		fmt.Printf("Error reading file: %s", err)
+		os.Exit(1)
 	}
+	blobs.Populate()

-	output := make(map[string]map[string]Zim)
-	comms := make(chan result)
-	pendingHashes := 0
-
-	for _, t := range getTypes() {
-		page := getPage(t)
-		links := getLinks(page)
-		for _, lang := range getLanguages() {
-			if file, err := getName(links, t, lang); err == nil {
-				if _, ok := output[lang]; !ok {
-					output[lang] = make(map[string]Zim)
-				}
-
-				// Check if this file already exists in cache with same name
-				if cachedLang, ok := cached[lang]; ok {
-					if cachedEntry, ok := cachedLang[t]; ok && cachedEntry.Name == file {
-						// Reuse cached hash
-						fmt.Printf("Using cached hash for %s (category: %s, language: %s)\n", file, t, lang)
-						output[lang][t] = cachedEntry
-						continue
-					}
-				}
-
-				// File is new or name has changed, fetch hash
-				output[lang][t] = Zim{file, ""}
-				pendingHashes++
-				go getHash(comms, file, t, lang)
-			}
-		}
-	}
-
-	// Only wait for results if we actually spawned goroutines
-	if pendingHashes > 0 {
-		hashesReceived := 0
-		for r := range comms {
-			if entry, ok := output[r.language][r.category]; ok {
-				entry.Hash = r.hash
-				output[r.language][r.category] = entry
-			}
-			hashesReceived++
-			if hashesReceived >= pendingHashes {
-				close(comms)
-				break
-			}
-		}
-	}
-
-	// Verify all hashes are present
-	if !outputIsValid(output) {
-		fmt.Println("Warning: Some hashes are missing from the output")
-	}
-	ret, err := json.MarshalIndent(output, "", "  ")
+	ret, err := json.MarshalIndent(&blobs, "", "  ")
 	if err != nil {
 		fmt.Printf("Error marshaling JSON: %v\n", err)
 		os.Exit(1)
 	}

-	err = os.WriteFile(outputPath, ret, 0644)
+	err = os.WriteFile(outputPath, []byte(fmt.Sprintf("%s\n", ret)), 0644)
 	if err != nil {
 		fmt.Printf("Error writing to file %s: %v\n", outputPath, err)
 		os.Exit(1)
@@ -1,37 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 87huqg LKhlbZI1BygDI8E4kkzhw0/Y1BfWnzekf/URa/Bma30
-uT7QzE8DPX8j3us7oNRKwu6hPUFpQosbcMRmMNgS/Gw
-> ssh-ed25519 8UnW5Q dDAJI5EnPMIhs5H21wLT84GWhkROEJRXE1QVp1aOH38
-qZJt4Kip5qVZl9QoIFEXgrhtrlQEpbkfLarCgaHugj8
-> ssh-ed25519 UFfTmg kbrSoge204JvRPBszhAfMewPM4oHg0HkF52BNeb9kx8
-E4ASRdn0pjF//GiFCjmRlgXRS2wiJxIXDFSjldMtTdQ
-> ssh-ed25519 xNtnoA 7b9/Z/qUEmRnFCiCYzVGJVvxvV8onjZemSg6sllaDyA
-bQosZIGbaSsUqFO2JuRpIhm3FJd79JyYS43A9+zr+1w
-> ssh-ed25519 aY2AXA m4gIzzAX8pkBHHzsSykIy24E6Kru/I4uNnjihKH3JHg
-S18CWIY5wNcR5PVkCqbjp1FJRrGxco6fdoykQeHhyX0
-> ssh-ed25519 AQhf1g LBmvyUbKRLKtPGIEqt+NwOSrtGwlFt2zqgdmRDHu9n8
-zb8OnKRsJBEkH6eJ76mlKvJmtZ8NvVwVS9/0tsZlMUk
-> ssh-ed25519 mOmPfg TuPbRMlX9eRATxSbv6v88TtzGhOKWn5FOkIg4xR6FH0
-NLNzJM/9r2jZ70Y2r5Hsc36gcRTSPw40Aabn/H7OE+4
-> ssh-ed25519 YJiRbw bVMyOOgBcFFRNulym46YwKAIPlOkbQhmQAo9kl4dRx8
-5W2fIxGXCXbzULOismGg4NxE+VQ8LDEbODlJ0OpFMiI
-> ssh-ed25519 Nl/5yA ydFS0bVjjDzymhQFaBJ3YqDREQDpVO6VzgS2MBtuOUo
-tNzj/85BiYe6th2N6A9ZkMSPKduwAIe/qnf2NVJiHOg
-> ssh-ed25519 GdLgCQ wmfT7bCzwnkwEtn2mRnElIM75MmdRw+33MhSegSHJWk
-YHrCYB1wF1njNjzpIy3hKZ9l1cj7m5yicLuj71TvKr8
-> ssh-ed25519 tOH/HQ z5/GMQOtkpMWwWdMXqxmf12MM84xkgXL/OLliq3RHh0
-mVhBt+uc7z/YkoIAyXTqBgv00cJOrZ0bsBP0lD9S24c
-> ssh-ed25519 FpzvfQ D8N5JQ+3rGdSZIPmzlZqO5VpS90v6r99WMXtyUqCGiw
-A2SSvI4H5TRY13R/iOa60bCdc0zR6lUAHJVHfAUR5mQ
-> ssh-ed25519 2UotMw eaM1Kkzw53Oq8lW0BFn3rqWFcTQaTz9jcDsULDg/fwU
-3QVYFrhKnvwWDpIdsyTp0amontUXePko8z8PeUub9EE
-> ssh-ed25519 kdPvzQ 08LE8a24S5cvuK9DVWD2ta0GjJMNzUidmgYT4RfhQDA
-cRFH8vOr2y1/C9F2wZWV2deUxUpoL34IFRyOBHPYifI
-> ssh-ed25519 onmXpg J5MKGIovNwv4FyTN4ofExlHV8qYzU/J9O3MI4tZYcTo
-iagT0Ypo8gTwvGpV66XNuNPedefx2S72q9hyeB2Rz/w
-> ssh-ed25519 CnhD0g se/N4hrYxOiukByYzsIhxToceXNuBO7J7VmM4muJ3Dk
-cW+WW8iWjj3eXDqDO8aEON1ZH/+6AXQGAEXkLRbL3AI
-> ssh-ed25519 4ep2UA uyjvubY39oSGeCNsX3/VIdM5CzNBlrnRpkF+YN5MBCo
-xiNuksI7olV5Db392Vjz/7uDNDIssGmI9bez6vSOXTk
--- VsGbd8K7JzHe/eoYUeTMwcg/GrY9SXVzNxL4HZ23tKQ
-£_÷t/¢ªØËVÎÞ}7J'%?™Á‰Å0“¤¼^õ¿-„ÏÛ„äu4¥ù‹íäóü0!®ÝîËðMÜÅ·
@@ -1,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg CsPCBXcVp7krsPi1k0WbjKFZxUzuZNJkkpOImMDWNns
-h6evECCNa5VGBe1dtbVwOBFBPkzwUKPFyVdQsTNMUXo
-> ssh-ed25519 8UnW5Q 1pioLo4kA+RJ6r35H9FNCQ5LZqmYUmxZTVyTdD0o92Q
-4r/sOb3IcQElEJnKAgmYeHtubm1Hk/cdiY6gUI1GkHg
-> ssh-ed25519 UFfTmg ruMzDG9lKKSHo2I1L/2wigVZs1Jhi6aTNmrr4zAyEiI
-3gsAmzM6fE8RL/fLL63pPIH75P9TW954nw11/JpU77M
-> ssh-ed25519 xNtnoA eTZoJFu1SqUoUGPcdVDw/2wW82xvRiSCnAmQSZPQT2w
-Y9Cf+/h80vn2w6G9n+V4uNV7bj3tpOT1KWRKajM7d5k
-> ssh-ed25519 aY2AXA c4MkdSio2FFkulOBKDSAG3Iq71ghRdw8/SQF0B98chY
-lvT+m2ey5+HqipuC7MrPQIKu8KrSsLHM0XRK8c0iS8w
-> ssh-ed25519 AQhf1g vLig+8a5jPo3cQhdmQw/C/P1hgzKHiVkVwUTkMBNmTk
-N5ROr2EtHpTwti7NByDiR8R3pOQ/STwlIuNeY1pDA20
-> ssh-ed25519 mOmPfg WcbxDQfraXfxkN1+IGaArpIHOmlUlhGjBijQt5ZYSxE
-6KHLewxXWwo8fVIuaTuY/T/igsI6CKqEl2tyM/gkn6g
-> ssh-ed25519 YJiRbw IblKWpY9DeDSWDfvlEmNeWSV1lGdz9aHcv2oQVmKQFI
-qPcdGcA6Z7YaLL5umR8ZOKzOyNIUJVHRBpV5HyAJeqw
-> ssh-ed25519 Nl/5yA wr0Q96yztc+Rf88q6ooiDHlKqpVdWPkRWApfJsc7uQc
-hQZTwZ36mkajMcSbxDsL+TtAezJIY+H+J7VaU1QOqEo
-> ssh-ed25519 GdLgCQ LiwfxrAh9dLjMeo6FglQzvUQ3hfWRAZr2naADkB5/WM
-Bn4fnoqTvKPd73qi28NAgAN8AZl4EWcr9e/uhuUwVgI
-> ssh-ed25519 tOH/HQ x35ypXVDI9C1wpquWxDUFYXYHxEsD2NJ0VIDosRONyE
-Aa5eZt98GQQZmKlBDzRC9KRyMCy2z1htSAsjKNGCuFw
-> ssh-ed25519 FpzvfQ jlAbIzsWi8eX+PTKn100NaiSoezN1kXzZ3gWUOKfQVg
-NQARp2qsxIdSG3OLJyP33A97r6cBRaMSaneT8NBnhDI
-> ssh-ed25519 2UotMw 53sXK937St2F3MzVIhmsjH6WeCSRdkpv4oFa2ZBaelI
-lNsjlQzS8Szj0FcAvrQno9rDO17iKDjMN7VwMLvIleE
-> ssh-ed25519 kdPvzQ YdeMlv40jR9bFnXVjPJDpvCnqn091dCKAB60m4Obwgo
-vgPAO0evfCXQUX7Tu/G9ERUhLO3KiWXqpxIqATDl5vw
-> ssh-ed25519 onmXpg mrDB6F061SjeYOZuUJVvZP8SzOVrFdpAAEfgPOzp608
-AzAEEHK6Q71YxPfiljl7ZCy0b3YBdSBMKORJd7Opkck
-> ssh-ed25519 CnhD0g Ov3v97PyY79WoXUDAdvXEZvTE7ruIgDeXVz3jD5O1HY
-+0rSmiqdxP6PgplxLkim4AJtKPcjn7OlkXpcu0BsI4s
-> ssh-ed25519 4ep2UA bDGTw6Msbh9sOp66l1VKGrT53AlrPv+QG2T6ZJv1pDk
-WvHFJ3LIlpiuVhHUxY6egKifWNepzIB7Ls2R4Kx1Kng
--- Ec6/6bQEn4GQOedrSzE+Yw1xRjQA34sj29Tr3zLFgZo
-NïP¢uGc!WcÝ¼¯£ \¼ìæ—K-©;]Ðu¹!,ó$#nŒ¶dZ‹«¦yž“-kX’BÕÙƒ°·ªc'‡Lò¯Fl�Ýªš6L‚nË¸n’Ý£f$ƒðÀ´ê
+-> ssh-ed25519 8UnW5Q MDrURGpcaqY6DVIURK6dJs7xKCGLtFS8+hH0UCRT7G4
+qsqMoWCrssVlJ2kP1cvP9+Fj+c07iFvbFs3Cs+RYVLM
+-> ssh-ed25519 UFfTmg lTHOOV5/G7IPaYWqrAwM9Nb75//N9O1wMDFSUtyo1gI
+kEWctDmQRHNzxMIwONsZo9EEIc/wkPxqX851BO6ohYo
+-> ssh-ed25519 xNtnoA lm6OHoKNa8wB1ML5lA/xl13Xp8WUSF2UY89bP8BZP0E
+iPDWUaoViQ7faVkUf2V1MQxrklAw8lJ2KXfJZTYN2X4
+-> ssh-ed25519 aY2AXA 4E8FsRsfsEKsLNVvBRTAoxghfex8omAQcy8NKzJ17kw
+uzZQp9nVfyVH3dz0UinqZjsZ0Kft7tPVSk1EkE6NvA8
+-> ssh-ed25519 AQhf1g rgcA2UeG0s75kSpok9+VR4ixNyZUqD+8ye1TJsMMA3Q
+rfM5/54WWHrnG1qfex57tGH97lbvKM+J6TGztYOrU+c
+-> ssh-ed25519 r/3ipA 7pNJRvOFO5v2nlMPbXP9oad6jp1pPAsByfiEhdCTAWI
+Vh+iyg2P6fvNWyCS+V4087zRf+pCIBj0jsPX0DtPp0c
+-> ssh-ed25519 mOmPfg 9WuzH4QasTe0NNcIf+XSremq5GuBZoKP+7t4MJNAFA0
+5E1Rbupw8IUnTuicTubXWmwkJ2xVg5K4BpkZCsUj5UU
+-> ssh-ed25519 YJiRbw msPFM69Tuy/luxASGVA8ey77vqtvXNy7ytf2VxQWNi8
+oD5vRs439A/YT5FxkSltl1Qf56NNhiKt17++vlFvwPA
+-> ssh-ed25519 Nl/5yA C3zn641k6eFQePbp2q7dwlIu7Iiw2aU5dmSrH2HCai4
+v1/XJRKIrIgHWfFtSDaFCvOKtcIR84abUZHPjaxP5bw
+-> ssh-ed25519 GdLgCQ ZztOWiw1ao1pvJ9REB/wBuxq00uyO+JAkIWjLUMueSc
+zXSv3MauG2E2el+Yv5oocTgDQjQ1fKXLpm6y2OTyIvw
+-> ssh-ed25519 tOH/HQ /eEgAf2KH1Zgd4yQf+kzyESkvPI8GKJC0MAJl+8+WD4
+H35T+ulGSCrWAuIsZs8ISRJRj2wqpRrOGlaoq9fnN5o
+-> ssh-ed25519 FpzvfQ dRq/NtT/TxJ/k9WlaMl/PrLTvPzkhV8LpF/LxjqjGmM
+LJN8xxnNF3EcMmXKdLhc70b2Y6n9qS3A5wdFXY6hUjw
+-> ssh-ed25519 2UotMw I+kJsu4GAflSfMjzE/8+vp6AZb88OpiCREuxfAnQPis
+hRu7IbLMdc3U+NQo1PDhc+O9uyd/wJZyPtfTv9z9TvI
+-> ssh-ed25519 kdPvzQ uOLSQFzsGSNg1HsiJLCYi2Lp8pasc7H/jhUBlf6b0zg
+KbUOl2WOsc6VuAC33SjEJS3tM3o82A3QO0bA9wd0rbA
+-> ssh-ed25519 onmXpg NKdAvcN3TStWYtQeLW1oEn7+shQuuNBndHaQRAU4f1o
+vCuDnPc3tayIwDbHJneLQNoENyfA6GRpQi6+OZ34Jjc
+-> ssh-ed25519 CnhD0g Co6fy3fm8BUi2qn+xBY1X33N2m40jEM7CJhSQcLokR0
+kwrOzTRiVe1aQH/P+ua3xZNgNRZh2pfQrQl2k2Y727Q
+-> ssh-ed25519 4ep2UA /f1HxU62FqhDJyJ9fPMKiqJdw1m/UjASKuYhY5Aq8D8
+tckIOvPq3Qid9Z5ud2v9syaed/h+3GrackXKZonDYEg
+--- FHj/yA6RDV1VYPsi84z5Y3NrbfVUthwdtuRWqiKC57Q
+Õ=Â7T÷Ü`6¦K./	¾¿àO	Ö¼‰R•Pá€K…2NYqWÖ¹£®ê0v{±µi'¢žÖVûÆ!+‘|ÎÕ0¿ŽšÆ¼ú´Ìi ½†Ä?Q�Žq¢2Ô5ÖÀéŽgÜ/c_
@@ -1,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg OP0JAd66/SUS9oBMmOAUdDc+zLgKJ90OUrfO5fhf/zk
-YUlZvlaZF8o7BBPEYbxDeqiMmOnV3HdUUX3aUdhnPKk
-> ssh-ed25519 8UnW5Q VD5yOGQB6wS7ChQwaLFCEYEF5Yt6bCA7mHrytolI8WU
-Jphq2HxVsMJD79yZM1SlxpD5RuJnE05OfuH0aOIGPvk
-> ssh-ed25519 UFfTmg 1s7VkQEbq1L9BCAOVlCQ4NfPfwYjcqItN4PMatuSTjE
-EOj0rFqARHPeBRKP0chH5BJcr8lyLCFEBZ6wfAhYbbc
-> ssh-ed25519 xNtnoA CKFIZ8blJvm+vT2xJxBz5xzp4afsIU56Z5gP6cxba3Q
-scD+SuipcZkWT2WERFEnjwGdbA9XrXfsmIZ7r8bmM8U
-> ssh-ed25519 aY2AXA f6Mt6J6Iqdex7SP0ngYwFrQFOObwNx/kLp7QVsJkFVE
-KtF/G7BBmgg0eonne52KN/hRSfc7muRg+aqllcaGZTU
-> ssh-ed25519 AQhf1g sKGPNRD/rgVQj0/wModKct9dFOr1Nm20GJV44HLn7Es
-rr4SInqIn8tUamEBACummSzUvq6TK/Nnz4M2zHY6dRQ
-> ssh-ed25519 mOmPfg sGlYKhIISYka5/5mVBGoCwEUk2j+6tcYRiDBtvKosVI
-938SaOYsIjFpJZJAfRV9JWUoCQZ2nm6NGn0AE5RtlM4
-> ssh-ed25519 YJiRbw D58sw+Z+YuSoTg4pZeGOJcFCuRDVqA45R/r9MntQWB4
-fpV33ShLgn3XuPxD2EZ3CQ2WdSdqmCQyfVOmMCPl9zs
-> ssh-ed25519 Nl/5yA 7QHmS3lFG+cU8+Ik9iRvaXyf/vBPe7wa9sAYekQKB1c
-dHsGrtXNbt0+reajFztW8SlGuz+0PTMsWbtUMcTaF2U
-> ssh-ed25519 GdLgCQ c+IZuoQzLMbn6N44w/SsCGaeL9KxwIe1Yj1iHLj0TQw
-KzWUk7/C1xDxZXSu5YKFiwctg0k6Vee6PmudFUPoEq8
-> ssh-ed25519 tOH/HQ 0W8zyXYP6RzIBFfFZl3Z/b5IphG0OUZgJDgjvDC0FG0
-WojVazNzk2mlfUCsNnJFC+74nYCEjO1fp0pvsq7FHLA
-> ssh-ed25519 FpzvfQ mMziPqzzRrQDf0cYJS028icRScECfi8aCxPz3Xe/w1I
-1TzjHZYunhMmZCPMjam7LpvGtvw40hRuk0IlUUe45f0
-> ssh-ed25519 2UotMw v8kYr544AHHIv1C5HJb47sFYAhLLPANZ0r1nWLjYYmo
-Yr8QHe/V0LQJroyJncVabqS8m4YtF8mrMBMIaiZO7r0
-> ssh-ed25519 kdPvzQ 7Uv+ltj/EOX/jseUjGXAryi9r1w6uO39ao3yeH3z0V4
-oVp5cJCiDi/Lb6cH708QanulTNI7386GalxHfYiZQWY
-> ssh-ed25519 onmXpg nFhA0zvOJYDK8C7DNNIbJSi56UrjgHaXyhzQH+pNkmY
-Mrl7Urw2EJ/SIF+fnf4fqNMJ9QsF1YzKQLRIc4kPNPI
-> ssh-ed25519 CnhD0g slBtQIp3uM2x2NhUz+yt9z+4Y5IoGeohW03j/B0VSUU
-yY1IRFJEgtNuKG6nP05XOiwPUZXTFxOgttT1gXBMBcc
-> ssh-ed25519 4ep2UA Xe+tcFe77241jAAyj96ShjVsdCIA2ECNp72rJdefSj0
-ruNsQAjf3dGmIxV7qNYPQAPRTWi18UDNOAETfMBAd4s
--- FoB0CBe8heDBXHuPn056QFz6+RTC+AFPyRBewoI0cwo
-uú.(\û*0›UÝ†P€{CˆL9ÖÂ„ÕGèÏ‡±£9�e!‹–5)!¶j¸bÞ‘nmðÅ–b1_¨Ocþ–ÝsW¥¹6«Ðˆ Î†‹šÀ©è ˆŸÉ]tÇSìngç-ž„È`ò‘_ágÇœc‘$ÐH¾&úñwo[lÄƒcßÐrz½u{€öÌ<÷åDƒg�ç>8<#
+-> ssh-ed25519 8UnW5Q /cVdlKHdFUszYMCldfAZVCCHSt15HjcWFtz2TkiXyjY
+DWQdhHSYXFTHJG21uhDMlljeSqCKSriFtDW3LptRtK8
+-> ssh-ed25519 UFfTmg 4ezUQ1CrfVmPvm/B4twGSqbYgN5aOKe7TfOzJCwzJXQ
+MiEugBcdP9lcO/nP1mpuf7lhPXKbUUd9zVu0gmeXasU
+-> ssh-ed25519 xNtnoA I/664KfHWJsCcRxQC47dccXgl31HoxnUlt697f5cID4
+DwENqVKt4GxU+ynL99K0kIj/qeT+krZvPXZefbij11A
+-> ssh-ed25519 aY2AXA 6VlRolPP+GvsEzSNDtY6NtqsV/fCLwkKX2frsVx/e34
+tBlkTlDE/iEOhO0zfgto98hiJzS4pEzr29iuZXL9nnM
+-> ssh-ed25519 AQhf1g rjIeZ1pT0WmkWTxA27HfHLJRWNOSJXH1hWEFQaTWKk4
+4nPriRa628dVznIoL2Wqu7rC0h/34OCNgkrbqfewiZs
+-> ssh-ed25519 r/3ipA UsT9khxY0QbCgjsjVq6C8w1sAc14ldHA47QIZ/z2i1M
+DHf6CipFevIS+12XXO4hU8uFC9RtpDe8MZoTrdjM264
+-> ssh-ed25519 mOmPfg uVhT1cO1hfr9FF1vX01AVMfcuL4Fne8K21llW6MKAgc
+QJWSUgpSKCM8MionIw2uFM7sz0zrNhwPZUftDMQWfaU
+-> ssh-ed25519 YJiRbw Helxk3oufur9cbJSc5PLN6/LmIRCBQgD7WZqNyd292I
+9IKaKUkrJr/hWSq/+xIzYqbOqnxBBfVfBV6A+TEz/o
+-> ssh-ed25519 Nl/5yA QDrpal6sH+qykRk9RbmNJVuQZnq1fU2KD2DfADBQFQM
+XLPBHeipZz2TiS28SmQGsPikGyfhvCJCFPaFyMXtFz8
+-> ssh-ed25519 GdLgCQ EIEU+UNtsnnIDg9Cz/aUoCuLpgGysnpjMuzeWTHsMCM
+d6a83uoBqes28e0KTjxOulwhVPwdJ4K5dsBXAGSrDI
+-> ssh-ed25519 tOH/HQ ttYI97W+nqSunHhEHhaHrGPxIRmhKKyyHDgoFF6R5U4
+sf4VdWrsOTWfi7OUKET/OucniwkvctcyqP3eCqCI7E
+-> ssh-ed25519 FpzvfQ hJigNhU18mMxIlIx/NvuZc9bi45PplnROyyDRzEknSk
+b0aFC/vUi1CgRO3Dttodv3R/VBI5HJXk5eAb1PXY6rY
+-> ssh-ed25519 2UotMw 8IEuY5An4B2NPjSyawKN6YpRlutsOjZdYpmr3Zed6EQ
+R2PhWVN+HL+Cpa5UCeZnYDhUCDn+8wbvvHgWDyRWR4A
+-> ssh-ed25519 kdPvzQ xBmYNmttCwRBMQCyfvb16p2wuHrHwqtUo98RSRWiUCE
+oapGMLXigHx/anDaV2s9SZZosccqP1a8/2t/4yMLodM
+-> ssh-ed25519 onmXpg hH0VAFzTN3CezRdY9KhLkYlHnrlvCo/eHlvnuTzVtWQ
+vIyTINNw/pHL1gEl7MA4J7GvtL+8/oPjG86uDvET/jk
+-> ssh-ed25519 CnhD0g XBpQYVj4CX7Bv64cFxR3YevKKW5Oelt1uFoQCZVR4kQ
+prmdbQuuTNMikogdkdhED8g9oWUXPP5u3Jn3qbqq6Pg
+-> ssh-ed25519 4ep2UA S2PhUuDTrNBtZDdLUnnl6Ck0jAq+duWdhzAKtRNpuhQ
+dsEv7lSU0G6RAUBtqv7zg7nYt9vfTXzqvKjtTCgF0nk
+--- mNxL6onhO2/m3dfTuAosml1qIMtfUkNlucKPmG0t0so
+ï*Ò\¾©w+=)É2@ú?&M—w^;{‚G*?¹À÷n/™*ñ‚ð?×óÝ*¬ß1?�Z8(ld:�3óß¾•|ìÀßK½�eû g^Ðä{âFPš€òídCŒIHÔBé¢Mg¡¶Þ®�¿K•"¤w%ìW1GóÇ§<HK␍Fž(àqf�xt¯1„/–
@@ -1,37 +1,38 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg ua9lzblqM2d0AmRbEj9c6p8LVBxNkYYr/vH5+HFoDEI
-Y08ot6KWTZdHXjYUsc2hcKnQlJBtcmE1oD5+OX86J80
-> ssh-ed25519 8UnW5Q QW+RWL8RfOoPfZEb+m2XHNgvlUoLZqPSDjx6riMCXDk
-DyJSnhbUWRCMUWlHYnz/jbqBxazGXEaxe6/T6CNtvsc
-> ssh-ed25519 UFfTmg XcNVYggkFQmj591cbFEpz0ishJgp90W1Eu1OWphmj1g
-3/GL+Q2euyXgcapUXDt8Mw5Q2+bbk2C2voQgGuTtiUU
-> ssh-ed25519 xNtnoA CYfNyaWgYlM4oe/G2sI99gvldiKY9ScDsi7XPLnDTjU
-h07PCdnOUF4o6YggrJ27Cdc/Gb9cu5CE0cZegyqLiKc
-> ssh-ed25519 aY2AXA NxBftj7RM1QeZ5Np3Mt/xsxZ12XMtgHh/foWN2uyyT8
-nXUQI/tjhtPSYH6GFDxw5oIQnrLrQHYfNpriXXqH5fg
-> ssh-ed25519 AQhf1g 8BTUwRGn9xPBIO+Ez2viFtp1B0LzWR69Aer0B/OfhS0
-uKAkoOTpuyLFnqKPXgTPYBriaNCQZz/hwSLkUKypBwo
-> ssh-ed25519 mOmPfg FNLltRffV5bNxipVpxAOkfviS/RKJfrZ1TBWIVSspHM
-ML0HeuZwms//wyIBfXspWQPLh/DSbl5YkcyHHJ4vZ/8
-> ssh-ed25519 YJiRbw rgJDr6qSeN679l+aIfDuhonxcoGw1h5C+nVGS0ce3nE
-c5xynEMZNtHuPb3wc9d8QADay6Pgf5dhSw9jLw5jkjw
-> ssh-ed25519 Nl/5yA /5IxJynZ+oP2iBZikH1dePktiwHrjYMSSeEn0wR4ywc
-My8esaXF11AgCEOeyNX+JRgLGuMlSPYGHqJIbxG3XWk
-> ssh-ed25519 GdLgCQ zKBABsXQE98vU0BgEj5onnfHs/Ta9qWwMgKKPFI//n4
-h0cMTFqCZ3pON8JwZBfJz1E2HPWVEqH9fRc2ry59HaM
-> ssh-ed25519 tOH/HQ oPtW9p3QZzva2unDORMZURJAl7VVbuGF91HCe+wbTzo
-9bTm0B3q1tFNVepL20MIU5hWUFK6uUn3781NDqhWkv8
-> ssh-ed25519 FpzvfQ R4ZCZsgf2tlN4h07M6mzgR/lhaZnP7uyUxajO+oC+UE
-iJnJWKYrushgkegJPxw7M2aimtQ/dqOB31BHnMaFTm8
-> ssh-ed25519 2UotMw eIow72TygjpYbhJLCqt2vm2X7bu3NjY6MFTOWjl+pgI
-2EgimzYzga4FW5c79N3ppEMVvREAmh5wx3lI8gh0/BU
-> ssh-ed25519 kdPvzQ 5XbOccIDpMFKcCaBWFRWWCaUh3p1LBJ0ayolQroZeA4
-Jb+n0HeR3gDYizA0kta1TBvEiZryKlDwbuoa2u8PyKM
-> ssh-ed25519 onmXpg PZR1T8ylkM55nGIBYiCroNWNTwBcEA5PZU1YWH3tsWA
-LsOHqiryBJkA7b463zyg3IToKy1Teo/miyPfENewGnQ
-> ssh-ed25519 CnhD0g j8T3e67+tDXJFRsX/gC9qqQn6YGFxgAMwWsQ9vlDsGg
-KAOrCxfTTo4uB0EjrV6VwAx71hbrNiJuP6G8F9lOr2Q
-> ssh-ed25519 4ep2UA wC0BaXPYM2iRPRBhQlOo2QRM0nX084cDp6brzKWjkzo
-wNBztDXiPi6K9q+HJRXsr56/nf6k/aQJQIEpVCjQjQE
--- IsVY/KsFoTGubmdpOdoTI64+O40RJplehy026aS1RJc
-]ÌƒR…ÊYávŠ½²1ù\½LœÙkœ”“¡Q:ÙŸý6	š¶¥b»Ø*ÙIÝZ3ýAóQÆ%HÑ4Êða0,ìvÇåÙ÷ÄÄþ7�ð-
+-> ssh-ed25519 8UnW5Q UlSvWFtyzP1itr1QuvrEQYhvw1oMjOgXyR1H8Geyc30
+m7GOH/FvAh35dmtU8SrQUcHre3QjrHZ/rvbSzq+DJFI
+-> ssh-ed25519 UFfTmg 4ifiDuC+WyaZCJEWLkUogxEFz/3CnwlMbBojSznie1A
+qgeDtFVdt2+WGGlYJL43iIdu3+nmtHZJEh5R1PdwL/g
+-> ssh-ed25519 xNtnoA g73KMG80Xe8DP3ou9YllkmG4f5RtTu70md3WG6XVkzE
+gUylPhlmUwx2y4Ld2ibDFdIQHHPYGkbI9ghT/YBYuME
+-> ssh-ed25519 aY2AXA VHCrb4MI+LIY169KZIOqlRoRHl7qeqeweI5/Q6IFq24
+hA1eiydZmy+A8FtX8kPP9biAzI7SUPRzaJAMvayBXvE
+-> ssh-ed25519 AQhf1g Ht0O8KwIzi4FSjj3Gsx3d6tR9L1VWDssNw4MI0JH0GE
+6xWDy+DXY3etU3QSNs+6nS2vQ/zO6tBUcMKlpyCnWlA
+-> ssh-ed25519 r/3ipA CkosmEHp1uLBUzMTWkQLLT/2HicXU6QNQhbe2hyK3xo
+rHAaWdoqLtK7awKgXixVudFkzvvuJLqW0esFFJRTxOY
+-> ssh-ed25519 mOmPfg z/D9xXbXsI2O4kOtHnaB9uqA7pAB6q2mpNzkQInNxRU
+ELp9idvf6ytjUlwXcwjDskx/nNxWzZBAu3z/35H2raA
+-> ssh-ed25519 YJiRbw PuTysdLGmt/N0K3HirjfBRv1v+rvnfXOl5EOZDyKOWU
+XQitNgPuduUQ0/kYD2oKgDaDAkM+eUsRDtJimxulE2E
+-> ssh-ed25519 Nl/5yA F8xymke/81LlgOQq4IZtpUL8zAYIZLDU7/hYPbDW+UQ
+BL5pks4vXzbM2Obzmb3vEUdYe/dEP5cm6490o1MjpMY
+-> ssh-ed25519 GdLgCQ J7fDZ4MEt/A8jhfCM8Qq2++v/bwhpSvykKefrp0R2Dk
+E8BrcouvDsBTcAITuhUyENKTR2U3SlyUFgHThBkZ5NU
+-> ssh-ed25519 tOH/HQ 5pbs0Qpugt2Z4GnERpgG7V1E+u/PqQZ8jmdhxiGAKmY
+B6HXWpicDrESt1NcCrpjTTmWla11zRGInKpe5EqRKK8
+-> ssh-ed25519 FpzvfQ ErKw/iWsCByk10H1SRr0771IsOF5kuKZYYynOI4NIhk
+DXo1XN6lRhGcbZ0wOn4FKK+k3Qx8jp5jY2GYJ+5S/Oo
+-> ssh-ed25519 2UotMw JvfWHcMKFS/FNr6dpLso8xDEmtKrd+bf6W4FSU+9vys
+MSHnO/7jZUAo/7FKWOYzaRWbLAC1Sn7JfSyN0Shoo7U
+-> ssh-ed25519 kdPvzQ TqAXhvp06kZR6czrD0ZKWRlyqU6kUYoZfP8gakziS2U
+ad0/vG0CRQ7sHiHvzedRAkdWarR+vHfgPMAjvXHBk7M
+-> ssh-ed25519 onmXpg ndkl5ubOnF20q+1Cd5d8b5Zy6KZ88EjWlmhGzy8+70c
+18mzoHrH0VHlDfia5ch2+pLy/EA6PejcVEkV1+cWQnI
+-> ssh-ed25519 CnhD0g JJ20jASeobaaiVJvg2m/JYp57UeCs9P0ddDJbE0I5E4
+uxGbgcL7CA+Gk8p0jRtc/1uXMM6fflOJKKvCCscsYMw
+-> ssh-ed25519 4ep2UA Gt5+6tALjGgyLYln/5GME6/cyX6zBIIoKEbfU3k5XVo
+8+jhXYNZqIGP9gxYPTEUAeclc2yOoi1iPc0Wlsb2Fw4
+--- C93ywGKoxGqj+uUh7M8VrRr9+6/sl4jbUWvIUlwOack
+8ÕXÛêÐÞQŸà¡•$Œ“¬G¹„Ön.
+2sÏÞ›n®êÂ®‘&›XÙßü«?‡!Ñþ`g7Ó§DÕ‘ôëMìÓæŽi‹ÍŒáé±è*ú 
@@ -1,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg 0BPWYqZmhRyvis9uvGwUUSW+ele+l8IeF800BDyGSzg
-5VjgpSd1sFRNREuv1C3MYCWhDs1a9xiXc/PhvesR22g
-> ssh-ed25519 8UnW5Q PbSyI0V2Yi2zGhgHhi7bFQzN8nGw3YTJaDCltysRJmI
-m3o81t3eHybGoyid9mCulXu2TiCXoYZgEJkeMTVOIGE
-> ssh-ed25519 UFfTmg EefXcU4i8wJ7Zxf3tFkjcZhnAuJRl2yvx3+tmUZiJQQ
-XSsgWWZvEdyEZMluvbPr5WkGBCPmyQDMejtzwf8DNI4
-> ssh-ed25519 xNtnoA 30K1t7yvl8xp+r3G048X4dTBBt7yuIJpSsirj4TuhT0
-TowyK2GWXSO4k1Y/eYA3jrQow1j8Ti3JGNj+KGEHs7s
-> ssh-ed25519 aY2AXA 0CcV1pMMlaQpvuba3YVvOAmGKQbMNn3pciGhUsU9rGg
-BBsUSmzFL4nlyHeoDGCplOCNcgCGVXyw8ZcdY1V8UU0
-> ssh-ed25519 AQhf1g w7CyGajIHe+QtVcxd7LkmAfoViCGlETXUzmdfwAnfUg
-k3pttObVlS9U+k3AaSmr5RdteuV7KS4FoD+jKP+ohjw
-> ssh-ed25519 mOmPfg TdZUGOwl8iLES+lLOOUS5z2vrmzn0UszNTAsoY0KtQw
-jEV5asKniZYCzdbALXyIcF/leiaV1e0Xo50Qq1ni5VM
-> ssh-ed25519 YJiRbw SQsOrXQaFPTKUWSKIjluoWbd5Sg0wP1ZVMOOiVilN04
-2Sl9esKTW0hAI2QITOM7tCXmU//86i9qIHqbzmT1LQw
-> ssh-ed25519 Nl/5yA Y+rlhRD1PNIUEZhdfgZTcWe8qY0SQe8V9OavljXjxQ8
-oEbfC1+We251iuRBzQOFS0mb0QrPuP1184sqEq6J+As
-> ssh-ed25519 GdLgCQ 7s9Jz+QDMx/VCpauGudchhYmdozHi+Drk1FTJkCZIlQ
-JpNnTmbMZuAq1t19usJeaFk/XWIvI/E6O2XYW9xk1lo
-> ssh-ed25519 tOH/HQ bQjSTr7z9m0FnCwcwVNvXb6q7b7N8waWzDz2ext7xQc
-fkGOxszYZbvfEgKCf8h1bSFDdhTQudWahW5GaoRvKwU
-> ssh-ed25519 FpzvfQ WA8BXVcevPVZHqAQkcMuPygLD8qqFtNWU3tJYpwHMHo
-BMemxjA6UjegYD2DK0wmOc0ULYukqyDsRBAFYDeG7lA
-> ssh-ed25519 2UotMw KYrj8o6902OrxXaJf1RFG8H5HIVeRKwaTBiL/aXbWlU
-J3xUYx69EUnyZUbzeN7X/Eh/J2Spva/3hlemM5171j4
-> ssh-ed25519 kdPvzQ 4mJ/cUrhX8UQa9+tStk81pxyJZiKKEv8nA1S3YIWbxc
-JAhwjDcn63KA56ArrgCfb8ImF4+gdYb2t37RDHzREC0
-> ssh-ed25519 onmXpg BaBbFKcLHhk2HmvWuC8oCv19H/gGplhQrYI3jhJSiC8
-DffAJpgSSISvUe+fGjiV/0ZD7ilpRjVfylbBgmzvwu0
-> ssh-ed25519 CnhD0g 2pIX282qmM1TjcenouThl+EVDe7liSf48Xty52ryjzU
-AdRqyALk3xZoG6Q26y3ueB6HgGBvojUfBmVVkI+/GoY
-> ssh-ed25519 4ep2UA xWUwvjYFMJhMtg4hS4D0FOpfs/yPFZkNdVv8xhQgGEE
-tBCKF5X+gYNbCik4j9YVXKkPA8BVb/pywmmVPEByUDg
--- 38S1jD1FbeM20/LKFLWepHbatAh6Kyy+wKS+Ptz5qtw
-Öþc$Kf”æ£ß�r%Vù]U¥�Šä#Þ¡2m’$c …ï÷	áév2Ü< 6LÖƒÏ- nteºPöÄ‘Ô³Ûªðn„¢”Ý+¤�3
+-> ssh-ed25519 8UnW5Q E0Cdhbg4mRNzzHLghvg/dgtXcgt/1kuQagBhFjDdfnQ
+gEByb0FlQRO3RvqS7uop6kvyHCK8lkkdApI7KKDiLLo
+-> ssh-ed25519 UFfTmg eCt3JllYLv+BIRrfHTNvOVY2bOmvU7Vn9dgdSETLxWg
+RYr//nOKClYqf6wT2ZfaUdWUvhZwdnAd9KuQRIAog/o
+-> ssh-ed25519 xNtnoA ZD2sNDXV39GdAm0H5PDB1glXHjNTwgpmy03B/tX1G3A
+v4HNBA77JAAOjgOqIEmgvM9TaTcX1Pgsh4mA8FJbDJ0
+-> ssh-ed25519 aY2AXA Pgw8zantkYPSIlEVtApmrv6FANvJMScFlGn7XuVINnQ
+F55HvsAjccLCDXwsnLtiCTzqjCykI1LgNvrBPo/9Hhg
+-> ssh-ed25519 AQhf1g ocWSVOtSSwziSbHLpfzt9onAo+f20CnD92HDmHuvjms
+RfduLd2K1PXzXbjfBUsvSlErh1a7HcWq1uEmYccwOQ
+-> ssh-ed25519 r/3ipA GHKAUd/EJW/fhYqlZcoMJvDN0JnxOSnJ85zaWHCoEj8
+VPBMtl/vSBUuQka53xmUtmcZ7Ug09rmVLr0zz4J7qa0
+-> ssh-ed25519 mOmPfg H5wv8RYDXisyIbKDEfmy5qYofko73JLPEdwqW527q1o
+gzykZnqY4Rxvnol4k24zrcSrX+Rhb5I5ueGSsHM2do0
+-> ssh-ed25519 YJiRbw TANfFv+VCX835WeB4xwzE+7bSzOlNcUiiWeTc7ZSVWw
+W4IJ3e6KMPEu4LGpPYNedPpd7yYM2WDwpO8cFOKCO8g
+-> ssh-ed25519 Nl/5yA 5A04J8hrMgo+Zc1kueTxjEWOiLhXS2Z61Bt1Ykz1+0Y
+iGHr1oYbfYjuyrpgMBZSg8O/GGlx4fsBZGI3xb/8010
+-> ssh-ed25519 GdLgCQ rqmXK9UWq6h8LYNhwzZv2JVEpO9pTWPOEZ07NEdftB8
+Pow3I9bqgjbaWzq+HPoliD2ZWe4xp4YROGQsv9WPxy8
+-> ssh-ed25519 tOH/HQ VJSZ0038Bq3VtvV9fG0rpNp33dozSAYUE7ILBG0KjGQ
+dSwc/Kf7sC0qah7UKmXgbvKah3CiIABSS9e3SwVnf4g
+-> ssh-ed25519 FpzvfQ d3qVUKv1cKsoeuXK0KcDyViMExlsF4z9Zod6T6v5eCM
+UyYVI9cPFMr5XRETLWcO/eqSpch7zKJElwuBU8CNGwY
+-> ssh-ed25519 2UotMw AiFjRIE+vsMZP1oF7jSlXK2VNRthzXyUuBvbhZIcAV0
+xyZ79tTLJ+1QpEVfQ+un5Sz3CTKq0T7wuF/Qka/NBE4
+-> ssh-ed25519 kdPvzQ IRv2zsdpO0axmwXMBicAAgN8ebqBPgCmCK177xwU6Qc
+v4HbNhr9Ma4f5UIkNqgdXLylmOyg42sa2NOLz9Sisgw
+-> ssh-ed25519 onmXpg 4TlZ050M+oJdS88xGgMjSYjIP4tcekkxKYBrs59FVzs
+yH8FE7Jg1r/vxNYXYlZ688A3tKdFuner17OvZNTZv0g
+-> ssh-ed25519 CnhD0g EkUxGQbJ9/B8KkXYnhSniZUhCIkuauilRhpC+N1HTBk
+rf0m3TU0xg9ch/0KEJcE2NGFqW3Aumt1NbnxCtAEjHo
+-> ssh-ed25519 4ep2UA /1we2B4B3jY/ADtXPYxNe5bRoRbFHeSDzIR7qu3BA30
+f0wku5YBXpggzWRsYs1rs1EHwOjWygyjLIM2xSYo1MY
+--- vhT0oAaUS7BzF6k2pSvO08EILvWQcl0h3X8IBtnrUrc
+O0T :LÇoV|âžezÔ~PôòšüÔÁé‘¯9Qà\ÞÇ¢�p‚ºg'jëf;Õ�jŽ{Ã{àª²þTE¸dÏ;*›0¸k€¼O
@@ -1,37 +1,38 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg iZk0mtBXNJEHptCG6sm5Bre86Ittrbshc7mgBg8lHwA
-YgWizpWE1BvU8p4A2nnVM+KEW+pP/VQfeXNyn2C+RkY
-> ssh-ed25519 8UnW5Q rWJlpARVcYaUwReRg3WP0Lo5EK1WHXnDF281NfRCTh0
-6JMBB4BVRxh4irXU5jR7NEtGgHUKEnATl05kPLkIJVk
-> ssh-ed25519 UFfTmg r5QfXMP2yX1sT5/NSZOk81uKuUD2gHKCJ00OUfMstxg
-9vQme3i/ip6BdyWXSqKf9KtBciD/xWnlTfU5bF9n6KM
-> ssh-ed25519 xNtnoA kiD+2ao6nBdkn3Us43lwCK4FMTWUX83AXZTdNS2ct1k
-BQaO2/DuYW42uSRu9XLz8A3N7H1H3LZk8kz1Za12qTk
-> ssh-ed25519 aY2AXA cG0+CVmbBoR3El6TwvwrJhHbuLKpO0FNLMQQuAMU5XA
-uedc7XXzPp1q877M4Kb2AfGAafp2unNIB8Hz/15hSbg
-> ssh-ed25519 AQhf1g ZIT944IUaACBEPFVv0/Q3Era9425gfYPDHTKQDFj0TA
-nJsuyOXfhNqejnljvd07tiGAH/6cVebb8N9op+yUkaQ
-> ssh-ed25519 mOmPfg O+i/JqV2MSpDtjq2fGYsZk4cGe4mY1IMxfFiVsZX8FE
-mqjMKCEPYrP9T5QvrPgrqpuQj90syD5Nly3xcZzlu+s
-> ssh-ed25519 YJiRbw cww2VvvXfFmWdspOqp0fYNizYF5gOJoWo2z0cmc2Q3E
-t746Geby8GdPXb4G6PSnYWxAYHhwEygAy2kWOTNlQSE
-> ssh-ed25519 Nl/5yA /sbUMK+/aNe604RdYYGhC76NUAUV0zWC/d/BOFUMdDE
-UYGmy1Cq4aZCJ6XghmqJVgCI+Q50NXKzVTbDV0cwCVo
-> ssh-ed25519 GdLgCQ 7DVn9soiWBMSoWH8s0vJh9CxTnOGqwT1kCD2kKJffXo
-1S3yC99Gp7im+ntDy5BF6Gbja0qI1iAcbBnUGBOdG2U
-> ssh-ed25519 tOH/HQ HjMJb09INVPg9p6eFWDq0x6aXxtv3e9WHns/b9dRq1w
-rol+78bs1kWGNNT9uGgpyhLo8Qg2KFZOZNV40o9ngjI
-> ssh-ed25519 FpzvfQ DYtu2GOhQMVefKgpFzGsUwQE93AABG7o7zlYBx4Sax0
-p9aaahOTOcwTwJh887brzzAz0K9eM1Q2okGwS6wcPWA
-> ssh-ed25519 2UotMw XrenSoEXsC9g8pF+nIYu3/mEEE92h9NsjQlMHWf9RVo
-c3GnMhYdVXnTZ4zBpp+ZOL47i4iQ7PKKreWCrLz1JC4
-> ssh-ed25519 kdPvzQ wKe++MlxxvHTN1fogMxxO/Ek8ytLnUY4rS3/TGwYun0
-yERY9pzUSb7/YSkVPuhX9fJ6SHFZhgBztvx42wRU9i0
-> ssh-ed25519 onmXpg fccql4vrSXq2rmGNJAwNmnXXj/6rMp9rQL2/T19AeAs
-41pFfrrmas1ttzD/wpQjJIbzgi27p80hJtuyXhpwE+4
-> ssh-ed25519 CnhD0g cgwxIxMn6IFqHIaFhTrN1ycr9d4B+sSVcLZeiHaVn28
-WFaOrcE8RuxatVGWCU+EAYTOZmks9bfKTme7s7VrDpM
-> ssh-ed25519 4ep2UA zStnhLrVw1+BNhOd+LQ1euusmCQnyQx7/ukUSgEs10w
-NDzx2fwKDs+of+62Gj9dE3l1+Wh0aVQAfjXPjYFjVc8
--- 63bVjaHZOWE+1hpG5yDQN8vMspyOOfw3NnXLCYSL3eE
-Ú![„•j-C3[ä‡æª0µj gÄÑ³ª‚È(Lv¹•Õ¬›Øþá2Eý+qæ%ª�Ñ¹PÃŒíËÑL�s;3˜ù,³7]\¯–
+-> ssh-ed25519 8UnW5Q FRrvjiuNlnu4/DkwfY2K5p3MdQ5bDF3+u+JKrYiHzGw
+9dGLw4PT4OapoTW2GnoJ85GEWgO3Aepj7hl0LpPZylk
+-> ssh-ed25519 UFfTmg uMTPiCPPoVqt/3SOr+y5oKGTxpFq2UNGrwaRVmnZT1Q
+Rn7dRYCGZwYN7sCmAsne6kAuKmD6CFlGXR130ELiJCA
+-> ssh-ed25519 xNtnoA FW0dLFehc2yVvpxIDEcVWD1zHspZuvwrn2qgYltdp1Y
+1zYm+LF/8lvfEhQVr4cbyDF5CfhPu/fNBYZMQLtTrqw
+-> ssh-ed25519 aY2AXA aNRD8OIqKluKhHQZCGkW+kS71vlU2N8K6k590eLO7HM
+PZHX6fqbX0U+55MtJ2iSur7TSHFEgQBiAgpXiGlHbuU
+-> ssh-ed25519 AQhf1g cIhfdle1UsPx86LETXhB46evMenWtypO4GmL2/oLbXs
+ezwVMUSz5KbBymwnZlKuLD7RbNBJigfkb4sOpHAAnBk
+-> ssh-ed25519 r/3ipA Gt94r1I1CUMKrGQKBVgq/FLlOa7V3weD6N1rv/dVIV0
+UsBIZfHiU17IjzhcKc1kvSEIMIk7I/DizSdBGhXNwqA
+-> ssh-ed25519 mOmPfg b3/Gwqh1kik/AuBzcpqsuSuFcK0Pko3hRu32wFB/yks
+X9AXKVJ3d0IV7wkV2ZibScIV9En9uJNyUIPIk7WFKb0
+-> ssh-ed25519 YJiRbw yDkwCFtGXgS18DwqMCBied8+Jt8u2GBWuFQSrajij1s
+eSeFTNbeOT/tDb9iQo/YzThtQeMgNYmEK61o8hjG43k
+-> ssh-ed25519 Nl/5yA ee68eLzrRi35az65YmfA/WF9VliRmnlPEbGQAet91nw
+2KdTnyBTyJu8q03eH5s4oRyvhTQ6f/qvwrLabvk3C3o
+-> ssh-ed25519 GdLgCQ DAlJqI0uIBSrFpPMfl4FkrpjCO5qkzvJU/PBOWFh+XQ
+S5tkvMrTrYbOK3U3wWxLn3MuJTfrP8vUIYe6nBpixQo
+-> ssh-ed25519 tOH/HQ zQMhFkG/vkqosDn3VvzuKt4xagkUWoqE/DW6AsYtBGE
+MGQA/Jxv/YTny5CyqfQBorfwIUVPZFf/hAcUTFrX9vk
+-> ssh-ed25519 FpzvfQ d4cgnsFfo5xGDUFyT65HJ6S6vtzLmvB0eugwq6t0nGg
+0hEFjipS1Jbp6xycUsZYHzcjQVJ22JlGMUsjPCkDfbI
+-> ssh-ed25519 2UotMw C8ukSysPTKrwKCVnqjBzspXLLyJyhn2YCHcr1n0ulRg
+NErsgu49C3ElHmpsz4q+zR/0Oj+9jBPnC0BErB/48Fc
+-> ssh-ed25519 kdPvzQ oreOkf0nFgkgm5KuEjP28nbbqRZTA/b+bj7SSBmAslc
+OrQ99MlWePEk5IVeoC/X4UYLhK10oTLFrS4KqzoVOE0
+-> ssh-ed25519 onmXpg v8MQUHZj5sSu2XqiUH+8wcvEJmrGWQqs0e9evQKkzHw
+ffZTIoH8stR+ZLhoz8GjvGG61xVbv4+VkHbd25Jyc/w
+-> ssh-ed25519 CnhD0g Ja9KftQBH93zJAl8nOMQZXHbXIFIs9W4UqXwYr9gdDI
+StRE03gMP6QQ+fCuhE1Q5ptCpBrUxrWINgCrWzwSqxo
+-> ssh-ed25519 4ep2UA fbcuNM4FWkTOVSNSJGAwncdkjLN1K2Uv3dxFsnC60VU
+uVbHhoO/IXfakiYFJ4yrtReK9uvYLsj4BTILRBqbRgk
+--- dYPR49CT7omcJ7jDRNUAoc4t7az/pEg00aqPF00OlA4
+„Ï¿Ÿ ðç(C›Ø
+I'ð^¿mc¶bßH…¹«Cû�K␍0ýÄ‰wé¯;lú¿P<üHã›¬õI¿{àÈ|øª·ý Páy(Oì«81åÐß
@@ -1,38 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg 9bSltGjltla8XkrCzhfU6yqy/Kb73jHmaaxpgE/mYjc
-q+UwMDloa3ud2r09prz5/nsIF98LI9xDqnxW12GPx0k
-> ssh-ed25519 8UnW5Q MjKIEX54pROJm4wMTQFP9vc1uhz/gN81zyy69zQA2A8
-B71KLdMEXUgyD1lg1nyJPXnZXxDSKyvRb0BBOMN/y6E
-> ssh-ed25519 UFfTmg fk/DRRcki6qQf/TnwBA+FIgLVdrYdktLR9yf9r/82Uc
-PUpzNkavVk/VfO8X+mb2IfKrseA1yJJ6xNnap9W+FUM
-> ssh-ed25519 xNtnoA 8wXxop/HSkpNJe2W+Lq6J1dPLk8P1w75xHKUxUjv918
-may0BdqkiYxgaUGxv80Udz+UVCI/+pFgzlCZetEzLoY
-> ssh-ed25519 aY2AXA /GeX9PATA0svXJ2cq7IIoWAx+Jap36OYFFw52mbtZ3A
-BEOqSa4F8PVxGkVT4lSsP8FiloINw4mEjtZ+Dq6u9Kw
-> ssh-ed25519 AQhf1g URV4/G7uUPxZNpP09qyS6Tok7KlcfjYCGqEGftwkM3o
-+l4j3tVMj8TcCE7KobympPIv3fRlLu7UGnZFeNZP4xY
-> ssh-ed25519 mOmPfg NoIRVRE3P4/nnerdYsAw+S9csK6NB+AhnjYQj7NZZk0
-GUuYluAhGcuiIfB6oh9rvfcd1Trhb/Jeyb7FAz4Plcs
-> ssh-ed25519 YJiRbw n3/TMqijUG2LdAsqrq13Jelw4hEenbjMu70YknGrtCE
-LCfUQDnpe2a7dD5YOKcteXQ4K8FyZNQ1gZi1GPkuCYs
-> ssh-ed25519 Nl/5yA W0IMc+9Mpjehqib77k1LLeUoKSp8QwJkz0aEfAttMTo
-0yrHlLQR3g5JGAuICMYQ8UBQ1SEdkPCiVq/j4PBLm+I
-> ssh-ed25519 GdLgCQ W1evgMNEDrmT5cgqRPK7NsTde8igIIiYbjRPBu38WSw
-5gDQVJxEcChyAGak31Qh70eFjOu3z4iLXZejBRXjUwo
-> ssh-ed25519 tOH/HQ iGA0Bf0Moa6UsXC484hFHp+4by41o8QhjsrCtnlnjDw
-YELtzO3zBhul4CCPdSaOm5KctPAoU1y27Jgfrs1H7KU
-> ssh-ed25519 FpzvfQ LcehUBu0dDyGfYKqbdfxS7d6aTtYTgpokG+GWHnjtzI
-6Rcos5SJmbUXXtMFqge/CRUb4RVYaHrt/H9V9tprBxQ
-> ssh-ed25519 2UotMw Az0wVK6RPjD6Mm5H+gvCZDRuNbHFmuVXRGMKBgL1SAY
-hf/DmLzyPoMQIYoV1A7CEifAdKQD8nOy7kWfpiJnuN0
-> ssh-ed25519 kdPvzQ mP9FISgXfkj1Vflxun3bgnlwwqLFhL/RI7knX+Qpml4
-ax99X2ePfqnYIsA3knPz19lcEv35pTF3YgEAI7FI/Xo
-> ssh-ed25519 onmXpg 1Hg7Hf+HW28fBH4fMvrNUAd1XwiLOFGDQ7Tscqn7UzM
-Cr1Y/Z60BwLm9b7GA94QnlNBwgmUqe8X8ksAZMHcgCk
-> ssh-ed25519 CnhD0g TR6lw5KiTVLkgoErQMMTbgDAhV/Vdka35izHR5SJIjI
-EJs5EOZlprrfpQfpJgE4//VI3bAWE/OPV6bNOF7O3s4
-> ssh-ed25519 4ep2UA pSDKM7BZFXY+6BAfJYTar/eZ2eE2U18iFGdfmb7xPzo
-0Og+gnsiBQcoCJzLIDSfTLRbnPf9ZqF62HKbtNcknrI
--- 8adV1z73QFaTnpZABU9wkK/QfvnFdsVamSgndB6aGx4
-\!Ïç>ín;¥.\¿±¹üÆB�sCÒ#é!)D}ÆPx	ï`
-O±zø�CÙFB¾tèÞÝnë½vÂßÇxÊŸ÷Øµÿ @²8+Ê
+-> ssh-ed25519 8UnW5Q mCwgPdwCWzi8QXME7vc1nncnCjUdhXJfHgz5CI2ppWI
+rnBpIQ9WYgFs65Rh4eMICoesrg76o46AjmtY9fTbCl4
+-> ssh-ed25519 UFfTmg EW1P9WRcH6esoNH098Vj4E+udGzKWYw+HkxaHcRpF3M
+t3AsT1kOCeDbpYotmYAFQA5/k0NA9KJ+R1DRnbLX63c
+-> ssh-ed25519 xNtnoA shOVkNxHyvKcLRYAAIW1C6UPAGiwxZl0Y7i73DkA3j0
+MgFo9Gy+24rWvIkqQKDogakf4q1nE+MTdmXg2nYMNR0
+-> ssh-ed25519 aY2AXA dXi7BYpOVSGbbxI5KOQkElq0GQj3vmbU8AA9rzqGIE0
+GlpXrUk11XX6zirXrTK3uIhLBwlTKwn4/cyCWjPBVTE
+-> ssh-ed25519 AQhf1g qV41Qx3onxW0Z91xCiUwse51OoEU7tBAi9t6MrwF8Fw
+rFXGO8JG1HE916LMS8xMLACVqHuQzP/SAgM5Ngi9tLQ
+-> ssh-ed25519 r/3ipA u1cHvRRt6JrScsmCY6PtybjU80VuU7NuRwtBW+Omc28
+ztXCVbWHTMBY/x6dDdSSPQmTWfLCGNG7xkYBtupKRQ0
+-> ssh-ed25519 mOmPfg jCT547k33Dxx8nTS/WVe+Peo1eViKVSjLumucXempBc
+X2SCtafedtleUTQoYtKN/85uUnWS3kuY9Bb90xHXXBM
+-> ssh-ed25519 YJiRbw j16MQ20JnMktKiREpNRx5qed8jXXKCAq+8b5AvkW0gM
+KovMsW55OvGyjSJuAN5M0Ga7ln0TOQoQEQKvCkODJJs
+-> ssh-ed25519 Nl/5yA oYGAT0greb0CHjptVKt1vPBhBX1KXsJAVlU4WoV0vjo
+SI4ZXY4pHqYEn2AKEX7MpcYT71LsVUGiZQd0LmwGywY
+-> ssh-ed25519 GdLgCQ rEB3gHJ+MovVDQsQd3X4pGI03itwoUGeHg7aCQ9oUms
+mAVXvwQqslqP4sm7uG9LXfNvD0XtnaB5W37esGyRsgU
+-> ssh-ed25519 tOH/HQ XPExYlY9j8DKCZwviAAgSvJ2+xpx3lUBsktfMPwo8U4
+v2PV6wtTTQINJ2XfCcA/0OpNkOHr4AER3lG73CJL7J8
+-> ssh-ed25519 FpzvfQ RRpPZ5GIdzvRimAXe1ybhxs+lV+SSigyyvEn3qmkOUg
+z7QV/M3zO3tnOO3XiabL62w7Uphs9OxARpGbND1tm1I
+-> ssh-ed25519 2UotMw JfTnR9wed+1B9Hung4FdV3Zvx8eQ+lrweFiFrhX8B2g
+k2KYxpsSoTBaHuXCCl5fBgn/jyi4KDKvg2QShU0Awpc
+-> ssh-ed25519 kdPvzQ GrUGPXTVNTMafGGfn2xA5pTIBEnEfSKmDtQ+W/QYpUU
+eDNGzwGWhnZ2kLXzDLVWJNvl6F6vZBTFZ16zrh87bxY
+-> ssh-ed25519 onmXpg LiArSCT2VCCbEE02Q9n6fsWP1VtYL7OcahnM7CJyywU
+LUKTMk2IAFpg7mPpHjBBw8NbpbgpDGnH9FCvjuF9qBw
+-> ssh-ed25519 CnhD0g H2M/9h954AS4ROeJFDfOpwU2DsACwQ/20OdGVaeGxxE
+tSMsZUT079DdPhW1yvFbk4DBlNd6Lvhk4SAarFjYfpY
+-> ssh-ed25519 4ep2UA /FZ8+q7M90Iug7/qUkpmyL3uhUz2WTBSoc2O719JhBs
+y0dpaERxrnygXbDhp6v/rIZsoKx7kv/aQI667jt+/t8
+--- K04yLmYsJIXBing2v+tijM5K1vOLQy0hWu7TItk3xCM
+‡t	�Hëw’÷ìgn$c\ÑØG>T¤bÃ,z¿ì|~u§Dhs±KP©íÜ0c‹ªŒ–÷ÙþÔ{™w`ZªPODmüxOägƒ+FäCH
@@ -1,39 +1,39 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg 4imtB78FqoMY9NrpnUqx8laJYPvR6Y/4unT0Yx+r9D4
-dkFCwD1ZQHUVEbk3c46MFjfe84Gr+9JFY3cM4fX/qto
-> ssh-ed25519 8UnW5Q ZMebFCDpAO2tzL7QLHzyq9t0Q7Escrooxz1iZit+2Hg
-D/5Vtbq1xob13K1LRC978D+FOUqP3Mpeyc+JjFvsXxU
-> ssh-ed25519 UFfTmg h/ide1M5xfsiWWTQgq4fORUvF1tnk70PAgnmrBZC+1c
-citT/IavIS7UGO14JhnqD0cVeErVQYveoQzUn2XHHrE
-> ssh-ed25519 xNtnoA sGyjrbntQRxHVGceKHNxIZSoHMmQw7YeMI4xc1cTYiE
-aATE5RthE9VHbjNFpLqrZCA4nRqzzOtuX9xsG62Fog4
-> ssh-ed25519 aY2AXA cvoOV250VlD457rmCOBt/O2zO8tYZTARdd0DcfD+Mz4
-g5MPyZUtmYp9Xvr+SAB8XL7ru8becKN+gzsiCFSq+LA
-> ssh-ed25519 AQhf1g wijsxw0j4hCW+LZoDiWax8Xt3zx7KEx1FGykHWMURnQ
-ECB//PR0Q21RuXYaJ/3JQkVd9SKfs1NvmEea+06CbWI
-> ssh-ed25519 mOmPfg Il7TQ7PR83W6yQLsJZ/IuqX0xQqQCy9TKGMCH6j/wAI
-hy9/lPJ48v8W1g2lOuoArEm4BqT6broUy/p1BbSdO/A
-> ssh-ed25519 YJiRbw YlOmjiSm/Ppb4eFJkT8NAc0lrRWEq7h5sz8AlJHRaxA
-AlShI5xiA6lsYpURJL1GA+A5Q4RGQov86EswdsfBfOo
-> ssh-ed25519 Nl/5yA BhtmDI17gcP071u/keXn4pk8Lzk2RrHFUj5SA86YPjc
-w3klEe6jsFHxny1DkvsC8zHc/wwdPZsn3Ekxrop3Xws
-> ssh-ed25519 GdLgCQ kRBH7X+OONkYlv2av7y371WxkhRfj9gNBG+5giG3LwE
-amS7HHCavB5Gr3BtmFjntD0Sx+H3bXWtaoSf6jVmFO8
-> ssh-ed25519 tOH/HQ eER991bgNQRsADztOtmua6uiOQXEvnGLVZxios5ta3Y
-tEdCqRSuUtxpea8HfvgniwOsNRp5xfMqjMDIlErv56M
-> ssh-ed25519 FpzvfQ cuXaHencZnnjeehxIu6ly/RuyGmJpfUneO3JFE4dTlo
-OSWFiVWRZFfRlNqyb1uKaCf08MIs8vq5wv8D8NhTAD8
-> ssh-ed25519 2UotMw 5UnadpCeceAWgVt7fY1TvdQXb9W3s/IxpS/2KnkNOjA
-IrSCTgxIWW7FX5BswNjnWYHyLG8x2SSZ+lyfT+NGR3Y
-> ssh-ed25519 kdPvzQ /Rv/935vYmo0ZKS7ZSr2gV8f9PtfRND2PKHQ7MqAdSU
-FPLlv/gzTSKJUjXjUdU5wx0TOVEJCsCKTNXdAcuv4MM
-> ssh-ed25519 onmXpg mW/e5COuywLc37juvVAJisyj6BGwFIjWDu6PLSBiNio
-uba4LFRs/83aaylrJxCJfOYmYPkhb+B9OK8q3Mvjh9E
-> ssh-ed25519 CnhD0g yYdtSbtbhuqj8eFByPLuPrMwJ8/Y9l4MstlwwxN4m3k
-8Ud99nL6ss6a/qGvkvPp2ktqcPeCbC7QcPpubBDZmzA
-> ssh-ed25519 4ep2UA f1Qtpz9OfqMHwMErL9GFTmb/vQuNcy9z3wj8YZ+P9nw
-3iEe/oUuiwiaaOAMrFmxHkqKEBx2G7PiKHvYO5eGM7Y
--- zjpoq6iZ3w19eqyHXVOUDgJSNT2D2DqILWfKD4CmJiQ
-’SK&[|ƒ6¾ð‡!»|t
-»¬¸ËB^O†d‡ØzkrÃ™ð»(ÔÆ-êê²â¡+1R8
-BÍO¬L€gEH3Îiä\HÅqBcx'^gÑx¶Ûm·²v²¥Ýî�ÉÁlû}
+-> ssh-ed25519 8UnW5Q CqKPHehQL2BnMddbuQneUdwqNiUP7R5tJd6T6ziapzs
+RusP1Hx9OPTlwxDo+wUZMIN0uUkBvRHABx1YBtWX458
+-> ssh-ed25519 UFfTmg JUmMJZQepN/3eH7tm3xg0rPdcX2lKnKLnXz0BdTsQWc
+BWuon+vqjGb0FzRBLrF47zz+fCXrEm4Q7Rn145hGtaM
+-> ssh-ed25519 xNtnoA hA890A2iPMkKNVRpeoLD9f1ra7bTIyooNk8HxKihpEs
+Fhs8yKdEQBBnPKK71petL/buoQ/u5qQu9QUzPQk9kEE
+-> ssh-ed25519 aY2AXA Xh3Q/V4hhIzEWA/nyzm2cJl4Gc1CEjaGPzNkHsu5tTE
+epgPCd650QcZklIEvA2N+Fo2092nridRmOznqyhjEYo
+-> ssh-ed25519 AQhf1g SfFv871Bk8fNlYwaCdUGqX6CFHzx9yRh7CuVsDmQL3c
+E2iXIVWGaxBUpskndz2JzaxqpSPe+oHG7GoRCGy56ic
+-> ssh-ed25519 r/3ipA 3xGxebUpT7Pzy44AmTGKHARM6E4qMzWJftnYWrUtik0
+GZLGvM+p8Frm1xnW+KtvD4RDN6+NB/v9qSg+O9skLQY
+-> ssh-ed25519 mOmPfg jQSfjwVwDV5bPch7RxZen9ZgwkI4IgQ5L5uW+8HQm2E
+/+UkOQMpEwZClSiDYGNbRNO5C9IaNhABtzHAeFIu0WI
+-> ssh-ed25519 YJiRbw KV4Z8+jYtQ3WLijaT2ZsKwMsTXkRJt7bNSPZEj4xPkc
+i66H3Li7nT8FcTwrEnKhEhKjEW1uJcQ4GuZHYk38bI8
+-> ssh-ed25519 Nl/5yA p/qQ9BaVRLvRbKStTBCaH8Ntq7zi74JzmIDFTAFOgAI
+iTWXq8Ku1VHTn12P8zsoj4SnWvM63AKjt488t1R/cWQ
+-> ssh-ed25519 GdLgCQ 0ZOAYbrOH78UxqWRcOgNj0oRn8/AGFslaYSJ5PRUbAw
+xZCujxWQPdATjVRk1H9L0gNZ+ckXLh4yC3ceIW1Ml70
+-> ssh-ed25519 tOH/HQ J+0byujDRE/R+PoQliD1cibDyY5RY5Qn8OqNE+V4phM
+mtg7BbrYgCbhPmjr/O6xbh0js31eCxwoKqKsg5fgkB0
+-> ssh-ed25519 FpzvfQ 7P7MocdQ3F+2teb1l94cIyl5JyQUpXt0NAPwJMYZr2Q
+9vL3xZtGzea52omaxAFzHdx3Jw/yD/U5i5XTi8W0KHs
+-> ssh-ed25519 2UotMw C7tThItOAHfQyJ1MlHIDplHd8PPZu/5VgpGrxeu/tWY
+DR27WXj+eR0IEyNNdvMyQqy9qeWl0DlF/eulSJnLthk
+-> ssh-ed25519 kdPvzQ omZiV5NRshERdMvvTfdveSNdD8scIfN6w1/c7u7yyVU
+DZuLNfOnEhnZZupK3n9mwAt1WO+NnAasQ6hFQYJyOJM
+-> ssh-ed25519 onmXpg LMn2z/lokc1nGWRgqoy3MEjWzhT1IoZPjb6yeL5tMSI
+0EYg5UBrjCyNBTWleKanrOLed0Y5EMHTfbFmyzbv/uY
+-> ssh-ed25519 CnhD0g /U+AshTlGAoXgcMGSLxI+zgc8lqVZQ/GwdiNol0r8BE
+hKMI0WdzqScgtEChnF3PZbkjdtr2nA87HNHhk3W1jhA
+-> ssh-ed25519 4ep2UA qrrOtCpjyVdRPaWTFgfAQhZAwFB5q7DKVdj2qUr4VRc
+FwQKHyUNciA+kBB/NnIftVParmV7nEFSdYQjrOIr6xA
+--- lWmGHk4zxXa+0DmZj1CnYHOYWlxlQPSB8gTpknMFYQE
+ZØÙC
+Õ•Qþ,’��hëoK$Ÿñ�␍¸€²¯ê
+êB»`'¼#ä`k}�h¾5¯�MHäé2UÖ# s	yØ^ØøÒ7çµÞ†4mØÂf�8þ©â�sƒÃ
@@ -0,0 +1,39 @@
+age-encryption.org/v1
+-> ssh-ed25519 8UnW5Q AvtCfDMZZ51gAeWxQlfxp+AEZDM/54vKlH96kU+sgn8
+IE9cWU99bJ8RJd/q1NCLwvjBozHsKNVLLxj4vX+f1nI
+-> ssh-ed25519 UFfTmg jN40d8++rmq4aJ2MY7Mb2zrj4gWV67GqHjv29QRNxjs
+jJJx3pTDSQ/0QescNSbnWmI4aJx/mvqXg7YJeYY384o
+-> ssh-ed25519 xNtnoA MJrW1Ti4mAhq3b490wLp61PTe4IhEPokfeMxSek/7QY
+AdgEkxhMRWcswzmLFzbbIKPW4a40Vlrct+ivvNGYhW0
+-> ssh-ed25519 aY2AXA 5is/WyAjC4/oqlDIxAwq/Eaw6ZV9NLtQGFnBqWBm+mo
+gadDw+GbSmtYxI7DZUIWOLaH2i67eaM1m1uJakDTg8o
+-> ssh-ed25519 AQhf1g SSk081gv31ND5QM1V0KzlFQw05Hfx0UJ2EosCAzeS0k
+wpefMRyZgwWcaP5mZBPVnL3MZ2k+L5a+ChLqRGCa/4g
+-> ssh-ed25519 r/3ipA 5FoRCnYDLxjERHPTR+vY+2Y9ewOBZoXrvy+N6wnAS3Y
+7Z+5IwEeM1iRlr/cUWt+sfv1QEOJmkvEG91xq1LmajA
+-> ssh-ed25519 mOmPfg YMuWe/N8ZOrUdSnu2blap3HP+q1XJtVaK5pSUG44RBE
+bvvZrMAGJ4hj83Kl6MYA5IXRgJidJGpYHVfqN1w3zBk
+-> ssh-ed25519 YJiRbw fOo8kP29gbO6OI6Zq2YBvcX07Wjrm0qlZv+AS7KLcVI
+7CCA1UgDtjmQi4L58TG2qVxxiDuxFm70LgOFpG18d/4
+-> ssh-ed25519 Nl/5yA MZl/ydcywiEBzU2P396An7TVnTdtclNwsoItiSiUNRQ
+upyVL3DUnmIE61NWVu0+gqaHNfmWIToOwJzLZOCsyo4
+-> ssh-ed25519 GdLgCQ dva4KwyCz99k3Ah8WibFI2ez+hUdK6wFzMLS/bQJdAI
+k5rNjS1IszxzKy3t8FFNoclyYRpkaWRgyzP5D/RAdc8
+-> ssh-ed25519 tOH/HQ AL1zBCwXkMLNQWiD8eoGbTJKI6+ja22p5NH/dHitgFU
+qJPaXsp4k5g/D0/wmcHtAAqqCeiFDpRhftXWAhxzr5o
+-> ssh-ed25519 FpzvfQ 4IOwoeQE5od8jFEqWziCF2mzqCLoxOEdUM6sFOp8Zjw
+Ea5bSCfza6i4cd8nL5p7tcoYyHC0B0V9lyuBM/PR3LI
+-> ssh-ed25519 2UotMw 942H9PoyZwAfevk1yVlTLSUTQh17U/UjGfBcbHO0EEw
+UMLFxLUf1Xv31JCyri1YcYKezAy9p/C5gc3EJMlSIvM
+-> ssh-ed25519 kdPvzQ rYlwUzY8uJIe87A/x50Al3WMnPxnvxCOEZiYOvhPwF0
+WmP5r+aWqNkmO2PQwLPdxIKIUr2BYzsU0I8U+kwhF+g
+-> ssh-ed25519 onmXpg mIhPpC8xYbbf6DK0Upag73K7k+YfCE1S+ZgCfvu1fik
+XgJ655mD/y8bWwrhjdMNH/v0J9DWJQiXVBgGTsSRr+8
+-> ssh-ed25519 CnhD0g UvRupvnJ0zqie6y891Au6EBw+1YZ1Mc3rYWOOBZH5Ho
+WMBj6BdYtIxgzSCVbqRXBIbFQhmXCPJMyLxG8OgZXAQ
+-> ssh-ed25519 4ep2UA hyu7qF9mof2QhPfgMm2Xe/xsfJVQV03UK67b05ODeRw
+tb54Ihc54Yeew4pRp0Y3aKAy9W7bpw++VeT9trHq4oQ
+--- XXv9DYSwOiHB+rSASovGULreR0ZUVPr4MYYFrH9SnSw
+7µ¾�ø—Ó½{O�¼™y�Â—Ì?Ma§ß³2é‰y�à£à‰§8¸E5¶jdµÀ	�‚ŸBûn	ôgþÞgb,NØ¦H|
+cA,<»XFãò(Ke7þ␍Ný
+½ÁP‹Ò{&HK$
@@ -1,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg U8uPBXNbi62qdlf1E2o2FrI/fqVqFyXmu/ULCXnpHGM
-IunC0CoSgR95ajkrqox9fw3lMk05o0c5VeKklP+JLEo
-> ssh-ed25519 8UnW5Q VN8Pn7h65r1CCq4TX/0/i7CR12uNGYpH9a/wBwXzbgU
-Gzu05BaP3A4rwhsfAwDgNEa8a+qlYWf+BJpxGGbjIGw
-> ssh-ed25519 UFfTmg 0aRMaqK95Xaxm9jHV9VHDsTQRcQFE4861N0mtKIQNlY
-XJjbY5BMJKLFzPh8EnsuUGddKgY1Et7MfkXbtSeN2E4
-> ssh-ed25519 xNtnoA GhQ/AZC+5kQIhxOXJy592Dtk88yFsskT2e84p0dqij4
-AehOjw0IYQ3jFYvyeT+AoOr9KCgm2tPpEOb49JK+VRg
-> ssh-ed25519 aY2AXA WevuwuDwXqOST+E8+WmSSdRRO0AAk7zSrSCx7W7O9lY
-aHFYfor2DwmXelh6Bo8QNr+OTtku6jKnLOPK8MAVMcM
-> ssh-ed25519 AQhf1g r89DcqddHqaMsIc1JA3bRYcBEozm48riPGzDbj1edB4
-Xhhcb9EFo+f98nCQZcbGDsBSSPp7oaUpI7TbE3wL6fw
-> ssh-ed25519 mOmPfg 7HRNQ2uGBYTCEcNVzBYdV6EYY4uaWlvOyod2MHYYTy4
-kSATymc+CkV81UlULdmR9pcVlRQSPDOVPiImbProIuQ
-> ssh-ed25519 YJiRbw DN/cmcdvFuyWoadDv17T4VVdRiLxmGQR2L1pj4iCoBA
-50uR0WxUPclelkW34H5YHg/DwCpGXWKz/TpsLI/G7NM
-> ssh-ed25519 Nl/5yA 9ddHSHSnUhQSGku3IiGzSCSWm7FnxmrKbLbcCNaEBTo
-2tCo9JH6zGZI7WVQfyduLKzKjjxkvOkozhjweaf4iLc
-> ssh-ed25519 GdLgCQ 4wvfVoBYh0h16OWu3ZzRbr+dol2lngyvj1rJN4i1uT4
-biuW9V+AlvmgZ6mysvL1vhB9bixlaEHVtXIipHkMeyE
-> ssh-ed25519 tOH/HQ QfhF+jx9QwF+O9JBUAUR52KC54c+8uWAhyG/2QGYn08
-QJhHnuCH4lhLk+c6PRgdBxalKw+GnXSHemjANwzUPUs
-> ssh-ed25519 FpzvfQ KskGYGofL8Pqhd/w+lS1r0pYADgnl/YvsO7CIDBIgT0
-IhnEjqIe84snAczdB7w9Pu2oxfmSRCcIbLuFJvKPXwc
-> ssh-ed25519 2UotMw +enPlZd+vgBCBGOM0qiJ1ho8KIh27DupWzt5tD7Zl38
-ui1jDgw+mrlKS/6/2MsgHHhFnGpe08QdD2nwcnU6rWE
-> ssh-ed25519 kdPvzQ /MPjIuGxfLHPzo2nn1tjIzpFKpmifFYntyWJ886YUBg
-thzutSnYQriI0NxPUhEotCTWWZ6rjj9FhBv5e6/HCZY
-> ssh-ed25519 onmXpg uyfJ3oEuR8N3+gf9AC0BXBfkv43iSFmSqLV1qMLFzGM
-DjUnrn8uZqqOTgQ9fJK3mV1qLEbFfLSi0s6vJ0vULlQ
-> ssh-ed25519 CnhD0g 9nH5vKR7QFOhe/bj1yoiU9/NAwbx3X7eTlFcpfqjf0U
-nVFLIzj84ezlygoAQc/qayRitkDY+hO0PcMl2VJ8SMQ
-> ssh-ed25519 4ep2UA 2Oxpu+LjXH8IUEeIf5gTF6RA+btk5h24TpZuY4in2kA
-7QzWbGo4tbywGWfMi79f2deB+D8j8oWyNp/WGCfaMoc
--- 45iGBeXO4jCDGIXRimelAK5/mAK0GDxNkHzjEChYnS4
-ü´␍cïØÇyiÇÇ%ôËRÑ%[-5HÐ´àçó¢º…<‹>ø{í€93§z']qG#¹%h-ŸSPàn‰©oÈŸy'�64þñ`Tå
+-> ssh-ed25519 8UnW5Q zKwZaiVwcb3twBRyisICah2+RLb5NUStt0h3Ch7t/Tw
+9O3yKkWIOiJy6ese/ytnDRvyNbytQKDXR7HSZLNWNjY
+-> ssh-ed25519 UFfTmg erGwb0GnZV12BoEa1JYiYevuf3Uq0Tv73ObbDRvv+Tw
+a0YD87ft8y3ZTYWw38GSwbmIUHe3HW6FuaGksF5pi3I
+-> ssh-ed25519 xNtnoA KajAZC29v2JqZY+OPkeHpKv0biPJLDgnT2CN//WnjhM
+GJdu44xGefwsI0g99wuwTmWGVQD8uwIcyINRCHMb6I4
+-> ssh-ed25519 aY2AXA aQk0/BCQyyPCZCuaI8NiyjuDZBIRB+nAWZBKs+3Z8Wk
+KSZxNCGThfNjoSZh9hIRjP9o5cQ1FjZP4G7GuLbBZn8
+-> ssh-ed25519 AQhf1g 6usKpTxVUNIT92ugQl7Z8LFPFPStTgoPhEGdyXjmhwQ
+QqGWtkb4Bom4sKMrV347/jf6YptbQIm78zzNwxZN1UU
+-> ssh-ed25519 r/3ipA M77+oa8Kbvt6eGbAaq6/0oG9ggXSbYZeBOkced0F5zg
+hkEFOfMRY4iIZ31X8ty11lGkouOxHm2r/tLwPRfQ050
+-> ssh-ed25519 mOmPfg RohXdUXobV/fC3JYQ9IuVvDqdfnS2xodARJYmT1Ch3A
+VdDNZFmvud6FGSX/I1c4iKg+6uhWgslPKAk0Uf5Vhds
+-> ssh-ed25519 YJiRbw /xSl3swqNc5q0hsY+hO4nSk6PzPk9lRV7Hni/yNX4WE
+GXD3wBcBf6k1mjr14vIP58bjRWOnnVBxm1zunv7SVo0
+-> ssh-ed25519 Nl/5yA BAgdJDYBnUE0/8dR32V5D/ONiwLufRL9/9CY0YgpW1U
+aUgdT4MPYEAVjSuWm2lqr+r3xwlX35UyrbYGh5v5C6s
+-> ssh-ed25519 GdLgCQ fOAibyd4PSLdTsOM/ntG3/Jcz6TZFTlGk1oO9MLQWXc
+HNyui1pe4ZcrjHafzZtCad6Nc3MbzFu8YSMS6qae+mo
+-> ssh-ed25519 tOH/HQ oE4PbISWQe/kW2DxIkwqJKhKp/SNNa2OVje5iX21RA0
+lx0r//kRfV5df3+5cApTmpE9zxFjKoNBSguhoeHqgjQ
+-> ssh-ed25519 FpzvfQ L5a5UzaBYkaDLRKKu3z/9tou8SFmzL7615l8Ejyb23w
+Z9G1pnjjBk7H+XoNGNiBUtsZVQYiXe6/crYjUb4LIFM
+-> ssh-ed25519 2UotMw sw24R6i1jaa2t2NcPsXxeJz1FSNGY8dpTJQBPM4Y60M
+t+fZa71iWWxAqfusahrNV/Gx4RvlklnmZHgz4VsxGRk
+-> ssh-ed25519 kdPvzQ BevwDGBlvPar9elbiiFK5gnbF1qjXG4lsTSaOHdZwA4
+DBYjAo0HLsF7GzGPAw5wGate8QIpFQ2F/FNEITQqOrk
+-> ssh-ed25519 onmXpg XFXmGNe6X+JbLS6f26x8OEooWGCsSKdPXfNwFoSDknE
+zEKhchCyQN+rMBGXpnwMeOoRLDPiQSRQbHeG3V9ifLE
+-> ssh-ed25519 CnhD0g Cua/knFngt15egS+o7s848bfy9YM0/fFijrdkrreWi4
+tSj9HuyLRTiLPFlkNUHQrmY2scEBQvzYIXUuuUuYyjc
+-> ssh-ed25519 4ep2UA lZYn4isPidCnEz33aBI0Q+oONJqFy+a63slmhw2rBlo
+i0zEbwLS3kXVoqfMpdnti0UIn5pDEd7OJjX1cA2idWs
+--- H8Qm4uuJHlwWSBopEIN+ZUr0hZ5RndYYO2jQWAIDW4Q
+‘g¡CèæPÖ•ê²¢dW\@Mïs¨×þ‡[‚Á_‹ü±®¶ÁNÇžBÜïo§Í,0ƒt…d8Þ"Ÿ“Ã#¥ŽET¯t»‡h=GTOh’+Mú
@@ -1,38 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg vxxJYuYVAGUWKCo4CMkpZqmnNsEc8vmhUlR/4OOv+CI
-kMmbwKU/Mul9mi2YRbMLxS3A2TycCD0adiwfLXQtpOg
-> ssh-ed25519 8UnW5Q V8ZCZNP17Ju2YotNlpvZGnC1tqXzfgwEKAWIST1Xs0E
-aDd2d9hr0uRq8C8SzByScecHnN/0nvOUiD5VAxg6Slg
-> ssh-ed25519 UFfTmg 5oH9RDbIOKDEOUmvxtTqJhT1nJeN2j0/6f6CdOqfins
-R9C5BA0aOUwC9KSmh944RrZb3cYDOFa/ZTmvISNDgOU
-> ssh-ed25519 xNtnoA i4HShuPm6wOIRTuAo1Y7PbHTFJAoHAGDk1rzbdoQ3Rc
-SZSahEYgKfCrrBVH3I8r2axJDclbtcVeu1u0RDh6C0M
-> ssh-ed25519 aY2AXA OJHZCfYQUjHGhedjU0Tut4xB82gXA4ZMZ55et+thKjE
-NJsfILBLkrxEm4+3VptwD+c0GSyi+6kCldKeS2ZJ1UQ
-> ssh-ed25519 AQhf1g R3h0LqzMJbmJZkEywShDwpGH8Xl1GZO4T5hn6VjH21U
-ldwB27ZtmbvJ3fgf1uVX695ozeuYuvSNxrRBdSfNilQ
-> ssh-ed25519 mOmPfg o0KXv8SqQt8MXFokvOkTAHsyZOzOIt/4igwX5gZdmUE
-VKO6mc2E2AvkvoanRhBsQkXRPSBsYz3bv+32lrmjzC0
-> ssh-ed25519 YJiRbw jOHp5x3xeuNWi0aWlnscfoRRb7hYuJL9b+iMPkUbkR8
-wipv/qLWM1OzZANBW8SyqwYbSZZQTAfh/JFVbDlXrsY
-> ssh-ed25519 Nl/5yA zukrkYXaQl1VvrOZGlpXgIJGwCR3NRwumarhIdVFBkg
-w2HlF4T/n9g+M+xyF4jM5DHvh6waUcJU2e7OFvN+q+Q
-> ssh-ed25519 GdLgCQ e5kGII2yVWVxUHErS/wfkwBmTbjAHVwF4/gXWdUsDh0
-14885f8Ii0tf4sZ98SFn43LfGmgBZ+a67DeC94RXZfs
-> ssh-ed25519 tOH/HQ aA6MoMhE8EimHbt/MRahwSEocrq3UJNyQF+h98igvVs
-CAjS+No8uKd69bWROKzf58QiekD2YUaWMDUpj5HiCp4
-> ssh-ed25519 FpzvfQ cBPJRE565YgznijwB4KKtsBvM+sedIRMY1pOcSDwinI
-ScFyjKFl+W1qiYauuAwJn4V0CiajOJ/1MTOJAm14QzI
-> ssh-ed25519 2UotMw jD0mowh/pYuaGI0Wkfq0HAHbLBC7c2Xtc2jRzIH8/QY
-208T5wRJYpggU4JYBFyYtOCIN+nloce/goz2DrNRIGE
-> ssh-ed25519 kdPvzQ lXXPGLn2ARXCwBTrvWEjU6qKRs99wB6o1jbXJ8mEvXA
-z0GlVxzmN54zUWUw0fD/uTy+KjmsekmMz4qjwmqMt3g
-> ssh-ed25519 onmXpg vP2Cyn/4hjbJTaRwekv7O8DO3Srfk7t4nhfezEUeVlc
-WK4ccaVpkVub9jJL9S3gNk7B/DoJQ++f/2FkSCDCECw
-> ssh-ed25519 CnhD0g BshR8FqJo3NryNCnBrWGChM64BATOeXE+afUvn1EUUQ
-8Us+VEboP6sysgEyZhKbIWQcdc50PDqCnVEQGFzGhKE
-> ssh-ed25519 4ep2UA yhHUIaGDKbX9ztb5eoiu+CXZLm0fxIEGyzXWoJLBqSQ
-H8Yk+e63hoJ4n6WCLFLf2MSGGADPuypT8vkmQDamo0s
--- mAaldzUhX8Exw58dUPxKipXmz+5y+O6L9jgFsTsN0Rc
-¥'tºQ®‰Ù�K÷†Yh×#ù*Gf=Diô‡jÙÒ³>]oyö©Ñ«·‚¨æ`Ì×Bè‹&§®Ÿ {aýÃ
-|ÂHƒ¢Â«óñÒz0ø
+-> ssh-ed25519 8UnW5Q Z1Zt3ObMDbq7suhJb1k/O9dgrQN95vTIDu2STbO71g4
+UiyIVoagk70mtct1YxFQtUCHcGbfYhtA1QDUtfFz+eQ
+-> ssh-ed25519 UFfTmg IsYLw4pCTs1Xkels8aGAGSc6Lqx5Y8mWBpervFWsKUA
+eBFYqndg81YgePY0yEuKWDCD9LTnOxLevT7iy6m6Nfo
+-> ssh-ed25519 xNtnoA H5M7J8lYq8r5GuNNjx+1QHCtiTNw9SSWdWcpmRlTUyQ
+4N/qiG/TZoWIn2KuZwlrqxt27wB7HGtxJPxHRzeRXo4
+-> ssh-ed25519 aY2AXA wN6zKGGRfj9Uyib2+94wRnqzkltJbjn6LyOjnJGMXEk
+Rx5FQte2kyo1m05YMupG2LA6Ddzp0kAVFkoB2tpgV0w
+-> ssh-ed25519 AQhf1g ocOb67dklB9G6Pi0icJ6OuB0nvMsb3gyvSdkTulqbUI
+PEjigA1SVW19c/yyWxCNrRbxWNAowcQYbw2z9busLIY
+-> ssh-ed25519 r/3ipA vFM4wk+L8Wv04+Rry0brtnSLz/ChaNYup4VI1Fm/kmc
+Du849WnNg6E/CQ+ui4+9vFAZJ47jJ0L2o/T2Sv0j/UY
+-> ssh-ed25519 mOmPfg NrTgNtkHKFT+ZPmW4ga8DGrJk7tiDF8Lel3By8uRRic
+y39BsMv6CAjVU0EYdfMA9Z+Sc0dFG89Toz/EBvFLMYE
+-> ssh-ed25519 YJiRbw k4IxoHzHTll31zEQldtYFJLAZcoACKulR1L/ch9lRRw
+/EPni0kgRovc2cESxbAV9c8hCLXzxBqr5S8Lt4WXrqU
+-> ssh-ed25519 Nl/5yA uC1gIjNtYyoJ1bsemEJRFnBV7MAAVrV5beyDpIJj5nE
+K+n4T8IGULklGYuoCr0x3Q4sN1NZ3YwAyEORG1Y0YiI
+-> ssh-ed25519 GdLgCQ dljs/yoxh5IV8S1wjksMF3f3+xw3Tsqv3ZPj459KWjo
+SZclrcYwhgwyrG6Sg4iHjN+PbKvet3B0AcaWFlMvdpA
+-> ssh-ed25519 tOH/HQ 9zHh+cM1vXMRx3zZwfOCkyQ2eBobH50JcWIO5UmoDB0
+lEA2DAb0UuiRknrKfmKjEpHnuWpSYEWw5Qk0s1JB3bY
+-> ssh-ed25519 FpzvfQ WxXIAYo3SVayrHVhiIS0enua5l+1LHuEYLI2ZJcrVkE
+5siODJVz1gQxoZgeUfl25Koqt4ilTYIYqxOGGwyh3Gk
+-> ssh-ed25519 2UotMw 7v7u40Gn57E1M/VNNTpgFhg7nsa0JmcZvOBjJ+/Y1mc
+yT1hqZue6sN65PnKgRr/upxXQlloD5s1WS/sosBKH6k
+-> ssh-ed25519 kdPvzQ Ey8yhg4MocBop8aKb9Y5Vulz26NleTREH0O9ga8kgmw
+eGr2QQasypgk26uQVwUkgjHGjgYVtJfjb80y9fht3qo
+-> ssh-ed25519 onmXpg Gk8NZVb+7qaAdps/C5u1CG+2DIFtHFDhAu+m/43Gd2Y
+A3WMc+zyVq2ra80T8SeXWxe+eeN/SmdicoOGQJaohDQ
+-> ssh-ed25519 CnhD0g MR+oV7rqxoBN3Xkoo4FJeMpMamkbU8kAbIivnzQDDlY
+djQB7mKq8raqp2Yy/N8s1fcoQ4Xi7KoWgn0axihsPm8
+-> ssh-ed25519 4ep2UA Cxu6m1Fu9gmC6Y14Yo6nebc2tUyo6zc2RRrskhoavE8
+g56/R04ow0jremNusFjtkWahskNc4pfynVKG+C4WYIY
+--- yn/4D5+C+8iqvDcMNFOrozE6KeEjPq35cMW468nMjzk
+ôvœíJëiÀ~ö³Ä*, i¹þ®‡¸QkÌz�yµ,NcæBÔºœ•ìk—~$á¤ˆž2¼¤/[¹®Tª‰¥¢,þCchÁ$à
@@ -1,38 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg H/DKlkMJvCTrAyOatWBTUxz07PhActR3jU0VWNTX230
-B/Re9Q6j8wmXO5vqT3uMkDjL0onlwi5zIgY1o0+LMik
-> ssh-ed25519 8UnW5Q WPEhhyJUrj7NyQPk+YveNi0M4oiRj6KXFtls7nPzU2s
-V/1vkX4qYBjkrU1K6YaKIevtKU09UBA+8JzXoPK2Buw
-> ssh-ed25519 UFfTmg tyqAbdrn6cWfGsR5SJ+v/yjZ6sqgsRqIQXYQBi7N8hE
-tffX/243iUcemnsMv7FeJCaVB3Bu8Tq1KT5PbaOzwFk
-> ssh-ed25519 xNtnoA fhMD2iyPlEDxDYF+Nv96B/XO7Chej+qlVLcLAIOBkh8
-lHBYMrcITRGTdcP3R/1WicLLoo+t9LSAKccUosPXsEM
-> ssh-ed25519 aY2AXA aCae49UEevT72yF+noITuHhJI2hs4TPTfQWL4FTxxU8
-jGdSacqSHevNEbAgKMKUt4KmWLtDEtQoKknDuKs+lds
-> ssh-ed25519 AQhf1g CplUJMJ+jydffPRTQtLN7v8SZmgtr/MhWJy1h/KTEnU
-d17nuN5nzbpLZGr9UstzIfNnr6351IiSS4yopnyGVnk
-> ssh-ed25519 mOmPfg 8Ppt4dOFq+hUNONGarDhQqoScoVCCu1LBLUc2qRB8Vs
-+SmwsUKclbWWj8/1xmmaCQA0vCIfnu++At9LpEgrNrI
-> ssh-ed25519 YJiRbw oYUo3XEcMfETbDfKlULuNUmGDw3Co+3wum/SrghP8i4
-fAkWFlyrgbS9A7x0+G93vuX0QBKTGWlSUPnVZrBcfCk
-> ssh-ed25519 Nl/5yA D47Wn+HH+FO1Zt5RACp1yqsQUD4bpkyMsrVn5PsKaQw
-ge54JnSDRgA1F4klkzyL2TBgBTWxqFGOtCr7FNJCWog
-> ssh-ed25519 GdLgCQ HNxhS03p04Yfp4+tNDE+kr2z+Ol1cr0utxKGwgyBrEg
-T1MmJ7QxENwg1Tq511rwLXKaYcAfgF5U7qaFwRFcpks
-> ssh-ed25519 tOH/HQ LlG3wQJdvjVaVQ1qEaznsS4qg92Yhz+0d80GmzLJR3o
-kZ7Lx5k3a9+6B8e9wcD7iWIXk4Z6Vl/zW2iLr8YRBfQ
-> ssh-ed25519 FpzvfQ xG+5fr9yn4gkB88oaoHXiDsmQb4RueRjL4/97GGyGWo
-BVwZSswrKY5OVB1+8S7k+F2iv8iluWx/m5ZJgcvXI5c
-> ssh-ed25519 2UotMw VoX97iRr+yxKP5JT7bbM1Vm319ebTy5hAS6KjaLSaB8
-AH9XM7XnopkFf71lfrTuxZpHX50Vh/xlCWuijjhYX1I
-> ssh-ed25519 kdPvzQ t7RCE4fMpbOfHer7B0bmyKpPEIWrfFy5IZuMkpvcJhE
-5aLpZihgZJEGWd6e9lRwYFjMGjjCuUJPOvM6ioKSVhU
-> ssh-ed25519 onmXpg GaE/l9BuV0pYRccwQiH5ACI7Q0hmHsab14VTf0nrXHk
-q5FC6aDTuFBXPa7d3sxcvXDekNexm6RAXfVvi9lOmw4
-> ssh-ed25519 CnhD0g NKOglfGtpdxnyu1Dgit6SrBJdVTwHcJLlWTDXKYcfVk
-GL7TTMcbeul1mhZE+UQaXHJjJRtXd/PUianSXnOU/gs
-> ssh-ed25519 4ep2UA Tmv5PRRGPczoAwLvYroU3iDQji8DFfDI4qq6KIwljxQ
-y/a+RTJ9vGrnq1GyHj/82On2Q2r78xF+wk/rH/PH0Fk
--- +O+y+oEnUy7/2d80ZBM1YRuqMvw7OcCvuXIXPtE5Ttk
-Kﾅ�"8T�Iﾛ.椨
-3ﾕsJｸe␍餓ﾛNﾋvｿ[ﾘﾅ�
+-> ssh-ed25519 8UnW5Q y9PK+VDf73/nElH7/STk9n0ru0NIGJ0qp4eQTokEKWs
+8HF0hEGCfbmYfEj0gn2EWUOBo8KC9/znCo7nxW3rkeQ
+-> ssh-ed25519 UFfTmg piv4fjTj3Ua1VdM82I5B8BI0jk3Qh4S29PnKs9GmokE
+inY59fSHk4xAZn8xkBQQIoI7xnQW6rsRKCCnszngq34
+-> ssh-ed25519 xNtnoA vNufVdYaFm+k78r+ioCcm9EWuwCF+zoH1bffrOEmJTQ
+Y/NDZ01jQEJYAu9U7d5nRI9S67wj6SNz1FXNBoVzho8
+-> ssh-ed25519 aY2AXA pHfVblA8IhBLMiTWmq9KT+EBv5/AP3XSQ01bT2VY+lk
+kTiFQBOh2sYHx+CAHyduwVauYDOXtfPc4FrKeNZHcE8
+-> ssh-ed25519 AQhf1g uWlt9FLfTmlFmVlPx3o57lVQInTRuT80YZbbwFSAVjM
+3PscKZhny+pMuy+Q4C994e9o9sxsONdZCgewkuo4l3g
+-> ssh-ed25519 r/3ipA ksZgnGbPwj14xBftMDA4R2o7ui1KNOVVunBrA3xwjy8
+IZZX800pMneP/0SAMDiFlt2wlRqIyMW9bNm19E0uqtQ
+-> ssh-ed25519 mOmPfg 6iuNsMJ5qbGog2wMnjLJ3AnQpeTK/oiKmJFU4NmpbXo
+rWPbp574Zb6sU8RFXD4Sw1d6yatcW45LTMkT10FL2ZI
+-> ssh-ed25519 YJiRbw MutfBuiITaQ4zs+ELUihuB1Rl7LeAICL2+c5xbr5Rj8
+o0mGn86fAERZ8DQ4rSWZh1MOaPLCZ5Su27U+5XExxV0
+-> ssh-ed25519 Nl/5yA NKo72CIorQwlJ3vcfjWZ7IcEWgkrxSpp81P3k2nTk3c
+4/0XpBgS3C44qqU5zcWBqAzFbMl6DV8V5+xYxBiXCCk
+-> ssh-ed25519 GdLgCQ jJ99c7pKMPL9jGM45fbcYRv9k2aeXKFcBidMxinmYQQ
+6pA6kX5sxxQLY+IFpVnIp7ximqAsA2Ifo/d2gYTy9uk
+-> ssh-ed25519 tOH/HQ o1g4ibiZdld2EzoPUYsEJKUwMciJlqvzpv4hL42WfRk
+ZYi5u8ep38jxeHDKq4uCAB13wSb/oJC2+Lpyjyk4UHQ
+-> ssh-ed25519 FpzvfQ YN3SyUVugq1S/4GkWtnfs6qeQ1ukpX64k1dZNFV+UBk
+Yaq2dI1oBEQ228g9f3i9mFGklUbOk9s7DFDHTXZN/J0
+-> ssh-ed25519 2UotMw /93PQpOj4bxRoi7Z38nioyN0IHi8Fi9ERBqnZIZ7rh0
+M45TdKIss0NkVObm5T95npKzyBM7A1QcT5DORLORnFI
+-> ssh-ed25519 kdPvzQ v5oxUVW0nFpWJt8NFuVubwXhQrx+SHpJ38BU2kJKqnQ
+dYeaVnni5QQUg4CaNxbuNYzQsL/KPuQNgFtXk96adXc
+-> ssh-ed25519 onmXpg K+8SnidvOmL3kzDCRnJdHg/RFCLcUaWJ2HrA4Awe7lA
+iyYRzYexYHNYhI0mlEZyNth7LBYVW9pL67E+gxLf4Is
+-> ssh-ed25519 CnhD0g inYTXGWEAMNKTpK+uj1xN6jg2xfVzO6s9j5R/bUx6D4
+Sas1bzhaBLXDRkG0dvfEtXn689aLGih+NJ5IVoEAvC8
+-> ssh-ed25519 4ep2UA UokZFgeEqY3/7DABaODXVpxxhjhUrBx1ZWMv4xJdYDQ
+ral1UaG6TlRUVZRTYhpHknIeTrhRvS2LfZ9ET/LM6bY
+--- 5KW+UYA/aip08dG72P0VeJteMlK5lW3vfrCxoMV4+yE
+¯�ë›«	ž¦ðýÿ:¡˜Ü,ú.Nn,3îà.W3b‡%�˜ê$ê
@@ -0,0 +1,6 @@
+-----BEGIN NEBULA CERTIFICATE V2-----
+MIGloD+ABmhlcm1lc6EHBAUKnQAIEIUEal/riYYEa668pYcgg4lMYGB2VakRFO6b
+K9vHSLzjZpuqhBVQ7MReOwUHQKyCIFCN4I/nO1jII+C/GwY6XVW89ddkng95yO4D
+awC9mMYng0DNzKvg2r/X1qyEBzEPu101iikgcSJeQ4X7xkA+UQo3dmXsAiZH6RSu
+ujn0TMZqZpwGP/7lUTcUEjqO7nh/o2kA
+-----END NEBULA CERTIFICATE V2-----
@@ -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-----
@@ -0,0 +1,6 @@
+-----BEGIN NEBULA CERTIFICATE V2-----
+MIGjoD2ABGt1bWGhBwQFCp0ACBCFBGppSlqGBGuuvKWHIIOJTGBgdlWpERTumyvb
+x0i842abqoQVUOzEXjsFB0CsgiDh5M2hyejw6E2FJKlukNDuEBUWhctocJ3Zovyc
+x+HwE4NAGX+FSOpGbnZ9QFYBfq1FvRqXdyFtAyXWqOkq59j3hR5QSG7E7/KAHFFS
+1NJ60rKABZhTepqhACZRCeyoGfMFAA==
+-----END NEBULA CERTIFICATE V2-----
@@ -1,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg OrQU6PdMcCIa3LFbhyw0uruEXKPKjh3EEHCcT4rbiyk
-dgJuit2gMEnZBREW9We/YgXdKLLqchfx/DdKCE7VRHk
-> ssh-ed25519 8UnW5Q NhncgN+/uGdf9QtsW/87TnN+xWCsodc93pefacAzsWs
-TXOayo7PZSdN7Gjv23ayI/AUp0Ix3BjBG1apjZML3Rw
-> ssh-ed25519 UFfTmg blhCWXafW5PVXsZ91nWevv/2ydb8ETFRGyOEBn+IH2I
-tdpcfeFHrl3SqrqjVKKno13nFvPlI/+z6J1sN+REu/o
-> ssh-ed25519 xNtnoA 1Co3+zD8QXJ3+cwvUHz1Ua/GzAjiPhKTMiAHTSt95Ww
-dx5SESrOeBw4CqsK38aRXpE/ZloPR/AEH2X88WhV/fo
-> ssh-ed25519 aY2AXA SmalHmG3tZrwVXxViBtuPR4mdv82EOZJcESSvOKEB3g
-8t1YLmiQ8ctpP/HOLyJEzQp9+2zlnHcPtY1WGc9xhF4
-> ssh-ed25519 AQhf1g md3XNHVrQHRGPAYezZbJqwnxzgaQi21Wjy9DrhF+12w
-U9UB7d4VAayzFSwFJ3wxws3cLiPXdN3WK3B1tMtIW+4
-> ssh-ed25519 mOmPfg F53t7zXnR7tYXtTkLso/7z1gLrXe+xeHdDMT2KM13Dk
-pkHqGoA+LLivtZMjOoLScjEq8Omb1IeumbdCdQMdXS0
-> ssh-ed25519 YJiRbw q32M0uWWQZPcupI4tONjcjJrRnsgueZgiL+Uyvf9oHk
-QZX4bxyyYGx5tFGiSqd/iUWWtQOuRRGzk5LteymQgjI
-> ssh-ed25519 Nl/5yA fvwieHNfPldy7WXjP5o8ruYqBZFQof7xX9JdoKFJxHo
-pKcqdTK4tDy6EIpK5hi6GUNr9munkP4zbk34AzuWe4U
-> ssh-ed25519 GdLgCQ bCuIznwsYwctq6DjODQNfsS7vY2fyfwV/VwnTWfydHM
-ki+n+eEiCKfmLwqsJQ/AKNeUk4xYDl4NncIX73qxmRE
-> ssh-ed25519 tOH/HQ 8CRisN/dgZqvbNAoD5HqbLt+tHNBesVyKDlxPVCOpRk
-JULBuvGzpEKIgmtj0z+fKngId+hDOEkVFY4MD4zS7GU
-> ssh-ed25519 FpzvfQ 8CHuhhkjlcEWDyXdSd/tzREvtjep9VZ7OMAevY48cG4
-W1/Dp/eEAfWz+CSVE2cxR4Gt/MfcXURInEVQIdwUAj8
-> ssh-ed25519 2UotMw rNqoI3CqyjeeYwtCMHCcKqEZ1d6S1JW5LAe/df7mWBQ
-y4/Uwm9tKhl7ijc5334ono9sLm5wQd+dhMwiDr+Jq6w
-> ssh-ed25519 kdPvzQ weu8fLA1OeNms5N821SMT9F+0w6ZDsQUwTCYNa9ht2Y
-7Agj2zykLwIsG2pPTWuuBMw50rrc57Bdmma6oGTMkOA
-> ssh-ed25519 onmXpg i3bUv+Hs38JtY1Y63/bTkR20cRWd0inq3icrdQWt2nI
-Gu1XJtFA6W5dFvaorRGBacNE3uIEvtcMfLCQXCGwbg4
-> ssh-ed25519 CnhD0g qXkWhaf1HyzUd9iR4sB8y1i6AHCR3qqKTajDKt8XUHE
-Iknry4nOsgOzY/0HIPAH2tb7u70wO3g3CD6rFE05riI
-> ssh-ed25519 4ep2UA qvbd+Mq6yJ75Uqs5atLAD9o6iVr4XLqdhwuNEhmDQwE
-6+6iBJy5ebBsF7ryp0F9VloRCsD8luFiH4ftSUWhtuE
--- hMLItkpoqWAE0+pmuuk6je7a37Qfsdi+kUNgM2tcMXk
-tm-;ÒO�ý3Nt®ò¥Û@ä#OÀ)‹E™Iµ¤ÏÅWÒõ½Íœã(Ãä'¦Z:@¾\ª|Ž0àT�úU6Ô.ÿ·Ù÷fqñí™À³Ý+DTð¦[Ôƒez½:ù7�áHiüØoâ"áÊ“{é&Xú«Ú3.2¶«)_÷„œÇÛÔÀ¯¼vuÜâ¯]À‰jD¯Ò@0£z
+-> ssh-ed25519 8UnW5Q n9GImTATabmorvZdYfmlwogI19kDC2q0Pn36oIaHjV0
+LIbb+QWyJTMKeSb7brkPtRrp1Hzh1wAEoQaWjLd3faA
+-> ssh-ed25519 UFfTmg wsBWO0eruy1hTfDW+hRogrdBmCKwCBApdfWbl446tyI
+S4Di+tWvsWChYEcnIAvDJHBCKODEbwZfkhV7UOsLXs0
+-> ssh-ed25519 xNtnoA G/7vE3GJBDY9JrwnlHsR3WlaysDUpib8a3cqSNINE0g
+ckMLqrwEyf4/k9DN+sjhBsHiyABBlCAEpzjA3M3wzvo
+-> ssh-ed25519 aY2AXA PmlfZmS6gON8BtCCnklSE7iYyXtCwc+hYKZ8BeS9ohU
+A4bBzr+64i5VQo0TR2+FwUucODgCRWQGaOBQKh+DRzI
+-> ssh-ed25519 AQhf1g qvdgQJVD6LUcQ4SBp3QQv995bGS06StlMtgLkkwGVBY
+wEUduXnr2lEl1QSAdIi+U5lCzs2vXAxTTtFL116NxSA
+-> ssh-ed25519 r/3ipA idNoKxD2x/oipXYfx5BzFKMbj//odBWcodAKEhQ72Qg
+Z5Agpyxc6e5hhXfkW38m24apmdL0YQkA/Sv44NNBnoU
+-> ssh-ed25519 mOmPfg Z1dCxZcYXJtsGYQQ6T6Ua0B8oNiWM+KtdxhwpP7C/gY
+ZXlHq7tFJdrZBjpoaR5kWrwTHi0m0FaiMG5RHPs75vY
+-> ssh-ed25519 YJiRbw jb8zqdGeli0yTTabdv+C72UHd3F3Kf1VCeOGjqi6oxk
+y0OBqyi5Rgdxdfdcdrt9SC+rqUfwB/Db9YGx1jBIn1g
+-> ssh-ed25519 Nl/5yA XABrTPgqVEU+H3vVciDTE5cUOiLogPNtnKgc0hFfjjY
+PGcnW9bss2ST4sbM5c1OemW8sjZb4JmgjokAwICPR3o
+-> ssh-ed25519 GdLgCQ IxqW2RoEzka8OLv1t84UJ4QIZgdMC7uv1VC/1aOCKTU
+681zK7CVFrn692BsZ0nKnIdgv5lZteuzgX57VuTPds4
+-> ssh-ed25519 tOH/HQ ffHb95tfhzMnUOR3JzsN3SynReV7hzaS5CG8ETwS61M
+1WkVjlKTu3qHci8yfgsr1zifjvbZqAZW+KHWQv1z+g0
+-> ssh-ed25519 FpzvfQ 1I1miMxckl6r4MJlsaHUGQeRlF/MArYOvVpxWoR1WCA
+G686WbFoGcUrlSTqJ8ZhXxg57hgt2OwOLGPUUxVepVU
+-> ssh-ed25519 2UotMw 13+e9PAn6rScb8SlQyrpuVJGgQxhRF6PnFIAhmuMKhY
+0OBeqN1Lok4iVN3ybcKvn5N8PkysO2KOhLVxVm0Hp4M
+-> ssh-ed25519 kdPvzQ 05Mecby4PtXbMG6PrRkRCehFoX5+E+iElj0OhC28uFQ
+Dz1SW3MYl9po/wOJrvZP547PYxNy6g/nfdFI7+AizhQ
+-> ssh-ed25519 onmXpg dO+Z197lqZNCYj8QMjuI+JegkECteQUNO0N2WgcW/30
+SfhhHvb5j/BPHKksMzQwMF02K7RhlQ2T4dIQc+h96sU
+-> ssh-ed25519 CnhD0g qMU+iswZGN3HrgRTRLvpmZBspUhzOhxaB4IEgZGeO10
+kLLPnVwr7BNz3m0ZsXOkrWijQimiaNh85uhGFpvGZQQ
+-> ssh-ed25519 4ep2UA CEndKjv+s2dcIHFJaI60dB79S/HRiEVZmWaga3AvmH8
+oDfdLqU29FEORoqHzerZe6PRXomtfYLE1FrwLiaa2Jw
+--- U7vY+jp7wVpzuA640iJfNm1OsRfjQwbmvfF0z7VleTM
+O!PÁSÛ¹åQã×•"O×2«µL•—A¯rèÿ\6ç»ï9|qÑà:ÀŠ±q�ü½ÜdˆõF×§†Ø\JH¢1;ñ…l.OŸjcH‘e�Ú-¢Ë.ší:�¶ç�ê6žñÖ_òº&8Ý3‰‰5�p,Ý¤¶Ä€&4Ÿk„Ó¤y¿Í–3Á�½VNè”Sé½œ¼§)ÔøuD
@@ -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,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg PEtvh8PEuHGlD4VB8s1eqPRdplyQQTPbUyS9LIISp1w
-19A002e/ns1CIyyLdd2eBzGPcXJUmLygzAhEYsPgrVU
-> ssh-ed25519 8UnW5Q yYfBptSywDV+GVFpjzk0Yt0sW1W04WKSKpIINL7VTRw
-CDkbJsQ8cNvSOlQUMPaXJwGEhZJL3Xt1D43ZHxeQ5UQ
-> ssh-ed25519 UFfTmg KkoF90+YBzxuuO95aw0oD915hkbzcENX5oukq/rQSlU
-Y0PcI3TbW5obOAqapmA+yJffY1qkgll4LLCvyb+Zmkw
-> ssh-ed25519 xNtnoA F2sWqmUC3LNxsAnVwFz2XFNryH9aEJyXQHziAUyONDM
-/520TwpI+JcA/eknnr/QOq9vdQBZ1YCMP9YzWjt8Eyw
-> ssh-ed25519 aY2AXA 1cvhD3KulIgiXyHBK+69wGVXx14IpXj93yQrwrEbTgk
-W7daKFkpy8qeoI1Sz0VTco+js30v43fojWYHDZOgMok
-> ssh-ed25519 AQhf1g UGr+wlSGWdN4SXtqbf1jdhHox9gM83r8mQfqgM+J2Q0
-fUpsff0Z/WKqurVvtxztESabZN4Zk7xbHFF55Xv82NI
-> ssh-ed25519 mOmPfg 9soQ+JECpX8mPXL98lWqcSECG5SgF/V+MZ1k8aDqv14
-8XJwxlNhKMwlUqF9Ic8OzhFta6jamNBp7Qk9/FN+OR4
-> ssh-ed25519 YJiRbw fELH2RKHKBS72nocvQm/EXmQEFj5j4662ii8s5Rq+WQ
-s4g70GICUhv8C+bnTOs/drdCSUgool1y+z9/+6SfXBw
-> ssh-ed25519 Nl/5yA Pwqzc5pm7zsAif8anOkMT1lr09HZpNSKlSkPdrOkSDc
-DjoHmaOYZUW/ySdtvfGZJeasfFE4yFRlCuudk66hQYg
-> ssh-ed25519 GdLgCQ NgpW1OnV96FF2/BQ2q04QospRNbdv4iQLnNwHetX2hw
-R9cFJFgbrINM3pbo6LeXChpIS3gcPsk84QittcEA5I4
-> ssh-ed25519 tOH/HQ lOeZsrNxxEaRBvSzq63PKnW2UqHRWvgbzGdTAUMISSM
-oaQdyd09hfkpRUCdvCqM7lwU3mlroyMc1Pj8xvRcURk
-> ssh-ed25519 FpzvfQ YDc8rZ9h/G91Da3DzMFfSlz/rnnbJBnoY21/WRgICG0
-7SQqxPL63Z+oCfewET4RX40VQKo574rr8vX9ss9+wzw
-> ssh-ed25519 2UotMw maFDd5G2m48dAA8W7v2JVJv/IUMwzuUKE3B0y9eGAjw
-xrNn0EgGX7L4bZSwf7HywW+21EcZ2fAVMCQwdzuu+QE
-> ssh-ed25519 kdPvzQ 6sB4KMKUSvNWPfsqclu8AAO3hVoXNgALQm61HhiIo3g
-oGvlFdD4zE+kOZVyIFapkhwaYVQG0lnLWZEPD7MhQAE
-> ssh-ed25519 onmXpg Z6dmOnhmtxenWRCpHv/I7+3VgtaVPFh0D1NQ5TyDJnU
-dAgCCH9fhSVTzZm1W+75Hblx+JAzWwIPaZc070TD0Dc
-> ssh-ed25519 CnhD0g tvi5S97xj352t8C9T3/F+9lnqhoRtCEJ3RAcOGByC1Q
-Ie9JqXDmwjCFCbHIDXBeEFeu7ttxxJxMtIRuYjM7Ltw
-> ssh-ed25519 4ep2UA m78I1BX+IOnwjVHBmCyWsDVIlcPjxlGJdJXgcCUJfCk
-wlJGj1X3qnhx6EZprnyWXJ9QOXgwhP58SstVv0BUrDM
--- XAe5nZ1QP9qvV2QpTOuKJqhsZZl0KFHrS9B2QOuhyL8
-Pø|ð4Oúo†,«VC‚ª´Î¥´H0!±¬Ç6@8ÖdÊHœaS‰Ž–
+-> ssh-ed25519 8UnW5Q LRvQ8+42bvJAT2MOgqWSS8J+fmbRNCEM6YHKa3jjFxg
+Yyl9rQO5jXfU6kP9AaPFD9U86qJYJ3KoRKWcnfbJVRY
+-> ssh-ed25519 UFfTmg vtRUvGhG2wcgmH0OUUGt5FySPfpb3RlBcNPL0soDMks
+7U7vuIyXvVptLSUzBcLGVvdBIieucypfl7j/zQE4cKE
+-> ssh-ed25519 xNtnoA AE8W822QM3xRZcBupY+PX5n62eyHKhtKYfHVmMf5pl8
+1a5C8vdYt+jjM8Ynzja4cIkitn8CIBfpp49leDooCCg
+-> ssh-ed25519 aY2AXA VwO5CmrX4w+7C6FN3da632C4ODT8PWVsdFDmDPa36Cc
+tm0Ns5TvK2TT8k0pWdUFVazXOqAdkQhUtqnsH/Nr7T4
+-> ssh-ed25519 AQhf1g elDKAgwosKD5fplGb2imeKOz2xAubcKM2UF9brhSZ1A
+lBWix7EZiL3NUNJBfvmSX8rSzkjnJjlz78g3CowUFr0
+-> ssh-ed25519 r/3ipA Q36VYC3Ckdzo1tJvIHSFoXtDX771ajE13D3JDdy7jgM
+VxhKh5JMXfkIy/r9osMYIBZmyzwMg8Xv5S5ZOXhQY3Q
+-> ssh-ed25519 mOmPfg 78q+bNPxfpfa+Zu3t8JB/H8WCU4o9bKNzC3v2hpAGwk
+FXkTocxcJHBLkWtbZjK8C1GQCWJ9yGEeItxifDCXZy8
+-> ssh-ed25519 YJiRbw SKyKYiMkqumdiZaMHNIBtmjR6YxFN5w8zOtJUN2y9ko
+I3IIGNBfLYK+PGPak8iolGmJAdKScoUkYMWl75nBQeY
+-> ssh-ed25519 Nl/5yA RBxxSP4VcIYvOTB77GeqxQjJ/xlP0pwwXQteqK4OqAU
+nw8eBzXxsTx811GlrIlYBUAVcAK5mvRcq/aQYggc6vo
+-> ssh-ed25519 GdLgCQ +/McIrzLSB2b6UYj4Z5rLvbFki0VlLw1zXEyjw4xiSE
+yOwqVibA6P0gMDucd035F3FgJdVGsTShzRB2eN7WGEo
+-> ssh-ed25519 tOH/HQ cqI4xCjgQOtkackr6ePk34O3V5aFjsPaBo5oCb7OcQk
+jbPrD0oPOPwEMU2ULIu7fBykyKlCPZMuMylJ1GgP0W4
+-> ssh-ed25519 FpzvfQ K32LF8T/BFTU6FemV7WSNWYTJIN6nipDga6WDyO/2GI
+BTFm8nsGPI0jOJUng4s2BF8PnLL9gT+0pyNzpBmVkXo
+-> ssh-ed25519 2UotMw VJWGl59Jvze5lPcmylykXMH+Xmv1rP1zA+6ZEtsZxyU
+kvgE3l2WsoJS7HyiLO6WONfGa0odaixqRDkhGi0gLms
+-> ssh-ed25519 kdPvzQ UnD1nnR2KC9lPicQPuGKe1j9vbAnyPz8+X+H1QqlyG8
+sBaVB0r2E05V38znyhehorQB6IZe/B17sDO58JhHKyg
+-> ssh-ed25519 onmXpg ww4Plkb0njPIQoPXH5V3Pmz0ko/1hzR64T1S3P3EW0Y
+wkrx5164EA+gOP5mPX3QY0467CGl0E61xltHZT4j+xk
+-> ssh-ed25519 CnhD0g FbaDeR0/3k0565LIzeO8KuwQ0KJInmJm1eyLj8U8W0M
+ync9BVgY6Z0eeTrJ1rTBjHwRjBu8ocL2RvtYKo7fZXQ
+-> ssh-ed25519 4ep2UA my+YNWCA8Y6glJcGMroChKMP2CYXCMPKJCPe7F4G/3g
+u9gsSRBIwf+KO44A6BBP1rx3SOJIZ1mYKH8JhuP2kws
+--- aTzCD5KDcWPRhV8hAh4fdeDKHScvtHS7yuE9Th2xE7I
+ÌÁôq(s–½i÷þµ¬WûdŠ®�¶ÐÚ‰ˆûÕ‡-½B¯v a¥�
@@ -1,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg Fcv4iyscWSLuYEiRiOV8RgZGtHZtoMKIZkCJP5YR2Gw
-F3eG0amArmOnXjcMEHKq4llzzzL6HvdR96FBBeBPSRc
-> ssh-ed25519 8UnW5Q jIDiplAQdiKO+zO1ISMKzRq2QlWjlVyCssQ0tRA8Yhc
-RziMMP8czSLkKPpSywdiPpd+LVlVxnHOE4q7ZRWVQyU
-> ssh-ed25519 UFfTmg WB2/FdxOtkHdM7DjpqJaxdh1B6iUKGiXSFVVaBtH8Gc
-caJy8NGY8tVDDreuyH7KzhscX8MMKmduNoHlqjNPz7E
-> ssh-ed25519 xNtnoA ngp6gYhcc3iJI5pTw9lgS4YKrLc7nP5/UXdKO84yLXg
-YyPWu6zotgK3vW1QAO15bYCyOTh4atGoLmpAt3SfWyw
-> ssh-ed25519 aY2AXA 4HRHj5TGT4DQ1jcXLaJh1wT8dthFIjsTKCh0Fw3IkEQ
-BOpCp/vxIx27qYTEDhtj7rkP0aiTe97toUXcr8CQASo
-> ssh-ed25519 AQhf1g UldWfFy89pNcOue7EpBHT8GSF2TE51wKd/NcGDGT6xc
-qL6EUhx+jvsTsGWCoN+fUm6Ap3etVy59BZT2aPehcdM
-> ssh-ed25519 mOmPfg tmq3aJ3aCR28VJhIRSr6ERZePc2/+9+Of+d9RSyW0nI
-eIM8C9NqMbeS+FIW8jH23u5zt/sjYl73FugwJK0lQpY
-> ssh-ed25519 YJiRbw Pa0S8lvhkbfdkxzkNjkNS/2OmA93MgXK2mTNhOagS28
-FGYj/S9gPtivRdmqHPSdQxdFmqxSkBZ1sGuDS2BuXyw
-> ssh-ed25519 Nl/5yA lDkaagav6y6/5C7BkkSfGiflEyoJx12OFCRkUkxsh2I
-MC38+cxeAxntKduELG6Z8ZXWaKcrQvbgk3mA2mWI8rE
-> ssh-ed25519 GdLgCQ UF1Q3sbezvbv2xpL8660i7/kJSejNX91d3R1FxuHmwM
-rBtSK/nGj0CYaZ37nI4XHGcaPjuo6wa5XnBxYHsrU0I
-> ssh-ed25519 tOH/HQ lNMRiTYhBi+1exc/wSLvsh2w8GiNy6w1ytd5C459RhQ
-bvZkRsSP9cjeoR3NUIS/HidgbXsEeNtIqPZAHTwG9AU
-> ssh-ed25519 FpzvfQ KUyu0yiaw71amG/MKRjRdx2wmZYhdtoPEWCNjBG1YX4
-Wbzky/4xeXktm99J8xjG87+uGhg3rwvm3hpRPnWMhgc
-> ssh-ed25519 2UotMw PrBH6djDYD8BkmPlJ6cKJrJhH51LJkvtSwKzLpkKqT0
-6INxQjRRQS9jZCpVtJyrOKphvW8kEAQRHKZjpShEb5c
-> ssh-ed25519 kdPvzQ LbGymBhy4CwAkwfYlIQ94eiaxNft+iWkeCSo+sPcRUE
-Dod66XiuNzGohthLMSnUSSEWtP2PxiGLXdS3SS4xUA8
-> ssh-ed25519 onmXpg hslnAvjkGHjteKLSjns/QmgJH8cdfMZZSHKfwIR/okM
-aswZF8qOtXOtawo/U9hFjYDWahki9AQi5mC0IeU04YQ
-> ssh-ed25519 CnhD0g +yEGolSK8C/yNJn9Iku1OiWBIWWjoFxzWnPwMqJoeBo
-Qy6whmWRqTTnKRzW6S/ho13osj3artgru14BleShhFk
-> ssh-ed25519 4ep2UA Ej7SHIW+CTe/XXEVs+T5lE8KTCyy1NNewCN8dzwRQk8
-JkIH1313KTxeDIQTB0tvwGfZ0E589VOa2Gj+dMZCwzQ
--- SjWx56dm+E9TiZEqk6LeuOluWTkgzeyDg0mf0GVSTjw
-yšnô>ºI�ÞÍ~$· Z³ôÑ	 Ôub=yÚš‹üh©4äG–
+-> ssh-ed25519 8UnW5Q hWnvYf6T9vRDD2XG+coCogkbDCrNbSG0R04+gXbvcGk
+b3kOTTUw6nTjIUUtwBEWdeZimGJH2ZuZN5XeietSxak
+-> ssh-ed25519 UFfTmg Znvp9rdXiVQ5bWC8EOyzXAMd1eRk4uSUvRVaUNWib3w
+rOR3qQEp8xJS27bwnNfBZRPmhtWDQj89EdqNYZDiHs8
+-> ssh-ed25519 xNtnoA KXUc5/jRBHX0XDAoLEJlW78FMDmUSKOtqM/0TNwM/gY
+kFObtWnQ7TPJT+7YZtpcc8Rt1e2x1aYfcM2G3WiN4Go
+-> ssh-ed25519 aY2AXA 9QVcxSBm2R/9pZ1sXJ4Zj2YEDTXdyRfHIW3+vyFCVhs
+Ux/JCrEg3lKbbGKfN/ty6U+XFFtG1kYeDdsJyjjQmlc
+-> ssh-ed25519 AQhf1g bcL4xDrGIiyBxr0+IwPZ/OGqQgvf2EHwy3Byq7LyRj0
+O3xszobO00rucq7iOPEJh2iJFgrzyzmXSeNrleir8uI
+-> ssh-ed25519 r/3ipA V4oFmOd8KAMYNhekAsTZWybYeKNiHopO4TM8RhUZNyY
+52cHcJQmG4p7TS+YGSzXn9Pj7RHdCkHCpN+vP/HGGEw
+-> ssh-ed25519 mOmPfg Lx0xeor4Jo5bAJfJx5kWjFysmEP2HHURRp+R+ujZ8TA
+uMyFlFQ2KneN0i6lsKavnmAJzvvQh9wq/Gm5GQXz1rk
+-> ssh-ed25519 YJiRbw kDQyaAEWoO+XvVdp3HMNF/edm6ACwDJZiyMmf8TbyBY
+qjVn/ath5owghFpy+bBpoMdUyy1ea8mSwiDOkyi/scc
+-> ssh-ed25519 Nl/5yA +Z0kYtzVmWrTm8dtS3xOxtAwX3UBqPudd8P50zigZlA
+vKqCuh8XTFAFdFp1eQ+GuAFLZ+cWraNQ1RtjXfsEbuQ
+-> ssh-ed25519 GdLgCQ 6ro+wIkL61pRQ4BwD7npGJPKUBxNruRZraKrHEJbDGs
+V4YxtQfRkar3mwnfREQGcktoBGw8LVXMR1Q1aJuhgG8
+-> ssh-ed25519 tOH/HQ 77XQ6z+VNIXgHEE55jqR+VkGYWXex7J9h3K0LxJ+/Vo
+QO5lJcgEbn2qvf1hwcnuzvZzEndwk11/lM85Nw9E1W4
+-> ssh-ed25519 FpzvfQ TXju4tBTWoxt9dhlIeq99Vtx623kraBf4eJadhRCmi4
+mJNKb7iPKSaHElXOreZ7AE6yNaw9mieNuasGnyG243M
+-> ssh-ed25519 2UotMw l+qYlDlKwklw7ztyfA+RwSDn19gCX7DWGdbywKcfUmg
+TZAJCchrk13MBPKliPDEAnA574aSGp93hR8SZwsrxII
+-> ssh-ed25519 kdPvzQ 1wuCkbvP6iOJioPrRJpIVYuEzJNnQyFs+NtGLVH3znU
+WZEBDs8t5eNmruan9qO56RvRabFUBzLgCehUuFCP7Io
+-> ssh-ed25519 onmXpg subzLC1R50zrT1J7SLrcb83ojuxnFMnlNcY/ZO/nl1k
+AuBJOZs5zg5GmL+3+Hfd62nK6uJhjNznNlwdCaiRhMc
+-> ssh-ed25519 CnhD0g idEcQ4d+1DDdY7s9mkcvSxdGWnFUy1RFLwE9SMGMPTw
+TbEjJrudTxhEBISTF8CuBeFcRD4Sg5K/JHt/7quHE9E
+-> ssh-ed25519 4ep2UA yE7evj0r/8fXSioyBwp2+9iKBUzSeWZgVYDV1xVrfH8
+xkWr9Q6l7GeTsK/+Z9L1t1qQBeMUORW38h7lhE2iF8M
+--- o+QD9aLHHPpPL9B1vg3suKNiGDSg2/mLZ0nsS/N8IXY
+昼Axｬ跼bﾊｽｷｴｦｨﾎ�盜ｨﾁｾf衙ｲ彖ｲｰ{E�.I,;ｼ((bIwﾄﾓ%ｬr�税/ﾒ
@@ -1,37 +1,37 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg B464HcGfHRKtgayCD/zupsIp/WObeWMYQGewTG5JsQs
-dN2pbZ8KnspNhKI3fpluTo2YdjLcgBJ1fdNqOtJiXZY
-> ssh-ed25519 8UnW5Q 8lAP/79yaRSrUfxFogl5tDEb6mwEFqBFTuVfI1Ou+lI
-zhSYZb3bjEoCtgJmtaHulUljPrsglBi1FRXqWFp8leA
-> ssh-ed25519 UFfTmg 11PefFDbgjcuhcXVqWBIsNb6D1Uemj6J+XJuYSbSZCg
-8c0gb0FuLUtd6UgagaXrIS8kd1u2RRERCx0eWPGQ+wY
-> ssh-ed25519 xNtnoA OCh/ktF3ugxwYumjftV/cTku+WJ+JMBFqpyR7WaC6lk
-880Ld3sTtm+hKW9ppZsT1oXpBbEHKLY8EQUwML8dXrc
-> ssh-ed25519 aY2AXA 7e/W0ic87t8l116FnZVJLRMbiQsMGTuNxf1uy5ekGFA
-0AhFMNzj3DJL7cvh1l8PVSSWlZcEl6Jd/pOLFwfNWo8
-> ssh-ed25519 AQhf1g bkWk/7d5hNq9H8xMshgr1ncf41k2AhUrassHMIUJrgo
-v614U9Q6oHmoZuTq9cXfSBraYSmc0bp3X1jlhezvWqM
-> ssh-ed25519 mOmPfg tpzCZwqZVvb+gLrWswIr9ZEwvSehck3s14EprwXBcxU
-D+rSGAdhc7pechoi9KhZk6rXdd611RB1ewWQx2KhREE
-> ssh-ed25519 YJiRbw LP4uP/YHqt4o+tkGOnHYjvnXZwyZg5Go7Uf+bJGcfn0
-z5h+1mTBT0ZxFHxDFI/V6jTkCV7j5LZzla8qFUtDfYk
-> ssh-ed25519 Nl/5yA v9CrmcSZs85snB+YkZJV6uqw24SPWCDgIU9KDNKhDCA
-QbJkLG3ANONZh8Lri+1H8PoHvkJUjCAEI0DNd+RocgU
-> ssh-ed25519 GdLgCQ Wpv1CSGIqvNId/jxb1f2sDsU5dTBlkz3G1DrMlOQnTk
-tuaGGY9dsVZHUTVM0MiEWyxGpPETiMsP7mASgFa8IJw
-> ssh-ed25519 tOH/HQ i2IgeCeKBupIfhx77iDWx849/26Whb9/uM3HxvlKExM
-wqT6VaqWGx4+mDHW5isdOJIx22kgbl6U/ejVfMDzo18
-> ssh-ed25519 FpzvfQ v8m0HGNjOH6dqf3hWqWIx9OCkUJjiyIP0gaZMSbVPwI
-0gJbJPrkK6ztUoH1C0NHq1Q32ZUvXbfXJSw/HKNqktA
-> ssh-ed25519 2UotMw yt0O9svkNFu+JR6hqOtKUcktz7O1lZ+gsEN2XwudkBg
-n7nB04GkuVN9hcQ+24aV+p+xiooAmPf2ra6K2n37kl0
-> ssh-ed25519 kdPvzQ 2WdRQ24S9lU1GUr9ptfnjbQcayb4/NydLZN6Jp3w5WM
-mykZnuiYIB2kgIHWGZHkzYIpwUF8tFMX1EMl/yOc5pw
-> ssh-ed25519 onmXpg E0X72LcDTsLA9oRJCEQQzoyihs1H2xtK+hq3JritVXE
-XqIDv5XNXos57Yyk1hzJvhzLHWJgFPtC4XEXHBNX7vE
-> ssh-ed25519 CnhD0g UM74nnkhKgNxmsih/jSrQa+KefOb020/H2yH8S515Gg
-puHD7q8ZV2YwK41u6MDcG9usfbGsAysc41LTINXIRNc
-> ssh-ed25519 4ep2UA 796WViW4ndAgmUYm1lSeZ9GL8tw+VFo9LRupZl5nAiU
-kjeaZUld77JQkRB6Hw/3XwzCF3L4KSLZ5Hvac6gXVDE
--- jrjhNtbITkw8RT4viUsFAnhf3B6vr8jXhOC6Kb9O/K8
-êtIŸ␍2 4¡I-íGõÏˆ²ÏÙÞ‚û€üä“t£Ý Šã÷Éi`Å|‡]Îõ0^«’Á÷DÅrŒ:q3‚pQ‰b
+-> ssh-ed25519 8UnW5Q AcdMKyEzWSlLGOg1/cx17oIhl12aoAo505l9KETVKCg
+ORsf9759ZFDh4hig3H5fFpGho+PcJHR1tsBJWy3/4rQ
+-> ssh-ed25519 UFfTmg 8ZeuDDux/wRwpWj0VO3/V+ZsE14TeyqGg7I5jsDfSys
+D7MvCcadL5mPikJuMErOrZvqGBE/2yNZ9AUR+7nreGY
+-> ssh-ed25519 xNtnoA yDAsY8q+5Kh4nlpJIQDZM/cwc59pjAWSLxRqud/fbAs
+IocKx8A6Ju51xeg4fwfiorCFu5yfb0Yv/KcpC5U4a1g
+-> ssh-ed25519 aY2AXA qubkHd3H7Hk4NPuKNkcQtEph3FLvaNe7vaVlj4iY7wk
+bTqmVr6xjri5zlbK+HHmknmNAKWKN70ddUBD8f4lxoQ
+-> ssh-ed25519 AQhf1g exNQzhjDsm/j8JX3FrqSNtrB7tBJ7rKdETmFpan5h3U
+2HicSUZXocSL0YvjkdjEeAxp5m8MZB1pia9gaV8q6Jc
+-> ssh-ed25519 r/3ipA yXfURnmAsmd9Z+T1uuytKtYXkwiOLxWnHiEz+dkHpHE
+E27OVCZVyB/uOu1Wf4PPu4mmvgbP03rwOj6UJc46NRM
+-> ssh-ed25519 mOmPfg bT/wxUVo4vXcEXYo0CReKPTtbtc+hJpY88jtg5EHwxc
+oAQNJsnOb4Diuqn2jKeQkkmh1Cc/LMdq/P31FSyE2k4
+-> ssh-ed25519 YJiRbw Y4zprvZRw/+qV+1I8ag7vJHnodvGMAqPFy7w/+fAaDQ
+l2PXTGdKLv0lmnU/HppifU7aICm1nPQeMLDRRTzKH4w
+-> ssh-ed25519 Nl/5yA KE/02BGEMCuK2qneJ9OO5zmZbexXkGAk+uPP/IZHbwg
+by2Qjs24hSP6MB6rMdRbJcRWI5up5GkKWkRY6bjkRfc
+-> ssh-ed25519 GdLgCQ 1ct8q7FlSiN5en/KLCwGhOclvWe1Q5hmbPPc/wSDzCM
+eb08Kvv03cZ1i88EwUKCNFjCKSo31TgxFsg2GTBR2jc
+-> ssh-ed25519 tOH/HQ S9TPi1BlPvDB6q185tzr6QPZ07870x8NYsVT+oRB9jE
+PQ+RdOzO9tI+B/27iV54InjKFZU4kc120KFU51fzcqc
+-> ssh-ed25519 FpzvfQ 1OSqqzuvX8QqKuwk+1HEpmuKAh9bkD23oVN89Z1cjmY
+jcmxOdbt7cr3snpYJmbHinNyBbF+t9UAPIRWYbtUK7w
+-> ssh-ed25519 2UotMw CwI7Qx7GF08A6rjbRznIMjgJ0vWzCauu9D9s0tKs1Qk
+EZJiFsAvLgVgHUpa9vt/2ZriPUMxB7AjuU+caBfbcQI
+-> ssh-ed25519 kdPvzQ 8gCdeTn0TfvJX3+n4v5A964Vyi/QDSDyG8tkEDjTBic
+41xHK6h4H0be69rb7DiyHXNK4gh6rMHVYXAflf0H3GE
+-> ssh-ed25519 onmXpg cdJzRzoc6G+qm7NeuHjnx+rgr7SfCf4CN7O6Wj+kow0
+UoZij3gCX3IKLz267aZ2k6wh1RfopF+bI86Jn+A0ee8
+-> ssh-ed25519 CnhD0g ttdVRooKnuYED5QBFF1vkZ95QQwxsZa+gzpGOB2j3x8
+7FLkYwhbxUNHe5xstzFZNHHpskePCtdlInaL4hntS+8
+-> ssh-ed25519 4ep2UA /6qYTTXSvU9SJqQhBkZ2FFwVwUz/T3MM3Msy1/AxqCU
+589WRZ8GNUIYSe7RczY8FyQI6yFiUn/32UmpUUEIFx4
+--- hcN4RD61m5pXylHSf9zu0Z5s663YR2Lu8S5FTwtj8hs
+5Q"vßcˆíoS÷A~ÝÞ$lM«‹yUšÑ¦YžùÛ1Õ`EJç1!ÌøÀžÏêv\ûÛ+Ð;áá¥7ÐüŽÄI
@@ -62,6 +62,9 @@ in
  # Demo of how to create it
  "matrix.age".publicKeys = everyone;
  "tailscale.age".publicKeys = everyone;
+
+  "acme.age".publicKeys = everyone;
+
  # At the point where you want to use it, put
  # age.secrets.matrix.file = ../../secrets/matrix.age;
  # Then you can reference the file at /run/agenix/matrix
@@ -93,10 +96,6 @@ in
  "gitea/workerPassword.age".publicKeys = everyone;
  "gitea/runner-isaiah-podman.age".publicKeys = everyone;

-  "acme_password.age".publicKeys = everyone;
-  "ca/intermediate_key.age".publicKeys = everyone;
-  "ca/root_key.age".publicKeys = everyone;
-
  "minio_secret_access_key.age".publicKeys = everyone;
  "minio_access_key_id.age".publicKeys = everyone;

@@ -121,7 +120,11 @@ in
  "nebula/linode.key.age".publicKeys = everyone;
  "nebula/zeke.key.age".publicKeys = everyone;
  "nebula/exodus.key.age".publicKeys = everyone;
+  "nebula/hermes.key.age".publicKeys = everyone;
+  "nebula/kuma.key.age".publicKeys = everyone;

  # Custom files
  "lithic/cargo-config.toml.age".publicKeys = everyone;
+
+  "hermes.age".publicKeys = everyone;
 }
@@ -1,37 +1,38 @@
 age-encryption.org/v1
-> ssh-ed25519 87huqg nPPWV7NdVnd5EtqeojVgNir0hJ4+MGLHIRiHz6LNDC0
-1D3e/5qX/6QZr8duuZfL/R6eeJO6ji+EEOBO2dXm1Q8
-> ssh-ed25519 8UnW5Q Gcdgk51D01jJTxZpep7571z8xb5XXYvP7h5bC1DgqCo
-cEuDAlhLv6oVUuAHzUa01RYSMuytHfXF0AQwpzkfR74
-> ssh-ed25519 UFfTmg rTwO/FBAxLy7979aLJaYDo4yPGaQSrVCZBlJE2DCWg8
-4owq6eKfrH8xa49rzqlHRXqjwFi6ebVRngyBxHV3pAE
-> ssh-ed25519 xNtnoA fe0rjVIe/sd4E15hjcArDjw7E4x4Ru+WXxV52FtMMHI
-hhAgnhSB4N2oECyej02JJVeF07vYbI4sIdNmGGZNkZg
-> ssh-ed25519 aY2AXA M8sc454Y5S0+5djCHKQgVjcyBWC2DIZVB9F3e0M+5mk
-5LihPC6X5jkjvniIt6a+EnswYLCVXo95DS3ySGyl+6A
-> ssh-ed25519 AQhf1g VmmpbrNj4clZszcLNl2asmfwaO8uIxDgwm8Zp9QPWAE
-YAIesd0vcoV8gAZfDAJ52Y57Xy97PpvG4U2/7RhTI04
-> ssh-ed25519 mOmPfg TrP0hZznV8BcrPKFIzlG//d4d1lVXx5WRMwOcicsKgk
-zy/MCaDNZmt3+wD3oZoVKr10YpyWgcSUIsVu7qUg6y0
-> ssh-ed25519 YJiRbw 1srdghw5+/Suss790NU08YJtuXsRnaS2M00Ma0AsmDc
-6K9x0vmH+Go/N2u2LP+x60g3DHXys1CNoFVKyn85oGc
-> ssh-ed25519 Nl/5yA MJ+iZo9HLf3dERIqCW3A35atrl19O5Be7of5t7eHxW0
-RXTBM8OYVvh+FGiwLrVV/v4veLz1ni3na7sTRVaIFe4
-> ssh-ed25519 GdLgCQ kAslbi0IpOXkzN5+OZQaaWzjaSugfHC9VFqDzBtO4E0
-itMaQXbid++jfvNsE4OEbKedUW+hOQMFBl/BCDoVwA4
-> ssh-ed25519 tOH/HQ 0EecjEQGgbAf7CC1UFQ7+z/6pdL7B4PJ3YQmRS9lqGs
-kAIm/sXDEnO4rG9yEQASPur7X2jdgjVVIDG0M+fi5s8
-> ssh-ed25519 FpzvfQ OJA0MlcKJjnFlKx+F0LRHmxDrzmB5oZRWQ92oKkiJ0c
-YvTiu1uh2YkAOwOxtZDpX/59LeTxhh18K1GnQKNpQdc
-> ssh-ed25519 2UotMw p+6WbVawGzaeusdfS5pq8b6eCmIt2EG37gUbz1BB1B0
-6eKpuzCQcfT8EywdasHvYYt5RauLGe7tjslcOus7kSY
-> ssh-ed25519 kdPvzQ 5BMIiLA/8FQxfbtOVadKDn9cp/LddijbWfEwDvWv9jY
-g5MOA4TZtGBq7Js8c5fauu0sMQFLVXu/zOZ0VXCXAmI
-> ssh-ed25519 onmXpg A0g0qSlNxYaDOw0tX5IpN44WUpNT1zZ51KS43K32uGA
-qryNRUzKcjEhly+o9OmQ2lL/p64MmhKyr1GiduTwn2k
-> ssh-ed25519 CnhD0g /DFCrTAoBN6NJc4wuJ37RP887z9ULbVgWyvkMOFjvmI
-H38/5fAxkp7HcMRtGOc/21WLh5JCm29Ln1KgoGaa4b0
-> ssh-ed25519 4ep2UA mjESfxkM1RUSMggk8sQC4rfqS8oyvvM0U59JXMAfbTI
-JvyNLZL4Te9QAihOuNAVlbIhCa6O+ttbAIhdflCJ8b8
--- LmHha148XFLXsGsKsP+WVsMyTDM7s9Cq85tr4nqkwEY
-|SéÈ*Z�˜ûS+‰�6€É©§mõS.8˜F¶¼‡‚ß}jT¾(ªi	±?…5èïË%nÒÄéÖ{ìDwçuˆHMÊÛæ�â¼Ôa6␍`Œ	ïr�3û°ÕxûZùt7
+-> ssh-ed25519 8UnW5Q k8+e+6WGTQiMaRSE4n7qdsift2hfWKh6oPo1pZmQQQU
+bWB2EftaQgx0htLD+moTBzxP1YFxh6OdzO+6h1WYQsQ
+-> ssh-ed25519 UFfTmg 4P+sOuZxcNqGpr+V7HRofQ9mWoddaE0xEPXloA/SPjI
+yI7ojDIduU172VLjsd9G9A1GCaeeSRhZVNRQJGk8F8E
+-> ssh-ed25519 xNtnoA LJsEx9pugvzNybQlUELejjLhea4UXs7DZphhVnCg12E
+QHwtvnWXcSOHaz4eeV1+keyjCG5SJJH3ICiN8BAZOqE
+-> ssh-ed25519 aY2AXA PbzmTB71Fwf91s6sPg9U/FXnNEGwUtFXH+EJWH58Dj4
+Pg7YKoskjjcoHRvE2OfIZ3gduEZqcQoIF3z+mdQDKYM
+-> ssh-ed25519 AQhf1g Soig8J0UWHlvgJ7e+lZ3knx5lEsFywWp3t2+M1kH20U
+93lkfVu80v0MX2QGQx4vPKfQMSUhkJPqqzZO+BUV0eo
+-> ssh-ed25519 r/3ipA Q9MKlif9SI64qh7a3WRMEPIlmoghwhFptE2PLJcTVgk
+vNGHhc6ciMG1bkvhT/8aVn4A7LoUP4eTq8YuUafLpl0
+-> ssh-ed25519 mOmPfg qLmW+Ypcs3ICWL9pJx1JJ7c0zyFbAFyizlGagWh2FgQ
+/6aNzXDrRb7/LB+jCxtFaHA7fGY36oRge/crYjn6pSU
+-> ssh-ed25519 YJiRbw n9xkTcQUjKB8JmRjzbS87jSJA2xiFnOE8zUE/2OPIhw
+pnQ/sUMtOKXnK8YPbWrY0zh6GvxvFLMNPZ5z7uk208A
+-> ssh-ed25519 Nl/5yA UEuWNLBc7g4h8SJGN6EpFsHVm9lvnfTHsEeH2Xs0jFM
+DnqTgRzH6NWXH+VFW/L3tJ7hTT8D3gXdqHPhSgk93MA
+-> ssh-ed25519 GdLgCQ YseK5fZn+LThXtMNRcvxdDS3ahOLrfth9LvFaG9NGFQ
+o0h4D8rxjidg4umbXe0LpZpwKlRErg60IUDEupo2uzo
+-> ssh-ed25519 tOH/HQ KS7FjTNBvxqCe0jfbibtyIW3GUm7ieD2iyYdNu7tzwA
+eZVzPRzDvw5xGnUvo499r+NqH56NT/YxGcRjcmmV7tE
+-> ssh-ed25519 FpzvfQ KW8ktfk9ZCyxIuyp5IzOHzTCKGj0HYPEY8G3DDXrQGY
+GpkBaPk8+DkK8ahph5Qz8YG72smBbd+wNbLFKlm0zME
+-> ssh-ed25519 2UotMw CbYuC5XnCZZnpE7cQd/0O62Kd5kuVGUyLKg4gBxuTRA
+BnRl1lDzkWnRsfpsKEdi9H4g9I/NzQno2lg3XNn5jug
+-> ssh-ed25519 kdPvzQ WkZD6updv6hK8syQKEMKxZSnEw9jncm28DzfR6An5ic
+WKrPAw5neWpkYZZT6EV5Ooe+C3afWLb7KjCefDCsTwg
+-> ssh-ed25519 onmXpg i0Gqn1h/dqxfUzZ6eog+Hnpfrp4A/vDVUTRl7ID1JQI
+iOspmY1irdzxWr7GFOq7nN3DSqLpsBmipZ3uoN4CjWo
+-> ssh-ed25519 CnhD0g 8xdT2pnDl+D5RlB2g37PRF15WOttN505KP0Il2StiHs
+dGVyffdBac/KAT6sCygOonv0qJAhLBH+YrghHcl6PYk
+-> ssh-ed25519 4ep2UA 61EWM5FSVJZCgoR2ppkSLG35mR6c5OVZN2BnqIBjfVk
+yTLnqXIdSNx3NsBPsqKMbOLkcJ3H2+5oP7DqwVjMjjM
+--- iBRCXiCoLQbBi4gNZVlxFhQhzjxtJAL1yZb2lDTFGv4
+^mh&’�•&’“bÈa~Ñö_Ï÷/ŸjÃZ+ÈÌ£G‰�Ñ¦\.ÛbBWé)±ÞÕÓz
+›HÏ«”—Ð„’Ÿ%öB6�à½ŠÄ˜#ìë*ÕšqFžÓ5FâºW%5Ú-?
Author	SHA1	Message	Date
klaatu	f82a93535a	chore: update flake.lock 2026-08-02	2026-08-02 00:01:17 +00:00
Greg Hellings	21cb84ac7a	Major update for linode and Nebula * Consolidate Linode into a single file * Convert gitea and matrix to using Nebula connections * Have Linode proxy to Nebula connections instead of Tailscale * Update Acme to use DNS-01 * Update Flake to pull from branch that supports ACME 5.x client	2026-08-01 14:38:01 -05:00
Greg Hellings	1c52f8a6b9	chore: baseline nixos for proxmox configuration	2026-07-28 22:42:21 -05:00
Greg Hellings	d9334a237d	chore: first bit of local IP querying	2026-07-28 22:41:01 -05:00
Greg Hellings	93a847c658	chore: get kuma up and running	2026-07-28 22:40:17 -05:00
Greg Hellings	b9051d017e	chore: add java web start to exodus	2026-07-28 19:50:24 -05:00
Greg Hellings	b9dcd227e8	chore: fix wait-forever bug in updater buildbot/nix-eval Build done. (2 warnings) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-27 07:27:34 -05:00
Greg Hellings	2d816d50e0	chore: update zim pins	2026-07-27 07:19:37 -05:00
Greg Hellings	5f951c6c12	chore: fix zims updater Zims update script has been slightly mangled since nix-prefetch stopped working. Now it is updated to use nix-prefetch-url and no longer pulls from the Torrent sources. That script exports a regular SHA256 hash and not an SRI signature, so we now convert that to SRI as a second step in the pre-fetch pipline Also adding a cron to run the tool every month on the first, in order to keep it up to date.	2026-07-26 21:36:46 -05:00
Greg Hellings	42efe476db	chore: update framework firmware settings	2026-07-26 21:36:46 -05:00
greg	07e85d35ab	Merge pull request 'chore: update flake.lock 2026-07-19' (#29 ) from auto/update-flake-lock-20260719 into main buildbot/nix-eval Build done. (2 warnings) Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-builder2 Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-linode Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-jeremiah Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-zeke Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-exodus Build done. Details buildbot/nix-build Build done. Details Reviewed-on: https://src.thehellings.com/greg/nixos/pulls/29	2026-07-25 20:54:30 +00:00
Greg Hellings	b4ab1bde50	chore: cleanup defunct CA infra buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-25 15:49:49 -05:00
Greg Hellings	4e7ca2910a	chore: remove compose files that are now unused	2026-07-25 15:48:26 -05:00
Greg Hellings	64a253e9e4	chore: remove proxmoxtemplate entries as well	2026-07-25 15:48:04 -05:00
Greg Hellings	e4008a0beb	chore: remove icdm-root as well 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-darwin Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux Build done. Details	2026-07-25 15:45:21 -05:00
Greg Hellings	363098c0a1	chore: remove references to hermes 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:43:27 -05:00
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
klaatuandgreg	1d9921f1ae	chore: update flake.lock 2026-07-19 buildbot/nix-eval Build done. (2 warnings) Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.pkg-setup-ssh Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-builder2 Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-icdm-root Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-hermes Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-linode Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-jeremiah Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-zeke Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.hm-exodus Build done. Details buildbot/nix-build Build done. Details	2026-07-25 17:06:07 +00:00
Greg Hellings	7388715d30	chore: where possible, use nebula	2026-07-25 12:05:07 -05:00
Greg Hellings	b3304c0ef5	chore: migrate to Garage	2026-07-25 11:40:35 -05:00
Greg Hellings	e955ea82f3	fix: update hermes secrets buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-21 20:50:07 -05:00
Greg Hellings	067c00330b	chore: enable Hermes agent Matrix connection buildbot/nix-eval Build done. Details	2026-07-21 20:49:26 -05:00
Greg Hellings	60e2450c66	chore: proxy hermes dashboard buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-hermes Build done. Details	2026-07-21 20:04:23 -05:00
Greg Hellings	3185a5a375	chore: add tools to Exodus	2026-07-21 19:21:10 -05:00
Greg Hellings	348a1d7301	fix: get Hermes host built buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-hermes Build done. Details	2026-07-21 19:07:39 -05:00
Greg Hellings	33eda7d2cb	chore: add hermes key secret buildbot/nix-eval Build done. Details	2026-07-21 18:57:47 -05:00
Greg Hellings	34ca5aec6b	chore: add nebluaIps nushell function buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-hermes Build done. Details buildbot/nix-build Build done. Details	2026-07-21 17:17:04 -05:00
Greg Hellings	d2f7b85283	chore: bring hermes into nebula	2026-07-21 17:16:37 -05:00
Greg Hellings	d12ef9faec	chore: rekey to add hermes visibility	2026-07-21 16:15:32 -05:00
Greg Hellings	3e60f73251	chore: initial configuration for Hermes buildbot/nix-eval Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-darwin Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-hms 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.pkg-dockerCompat Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-create_ssl Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-adblock_update Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-gcc-tune Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-inject Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-inject-darwin Build done. Details buildbot/nix-build Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-setup-ssh Build done. Details buildbot/nix-build gitea:greg/nixos#checks.aarch64-linux.pkg-upgrade-pg-cluster Build done. Details	2026-07-21 16:11:39 -05:00
Greg Hellings	bc986f0e51	chore: add hermes buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-21 16:00:52 -05:00
Greg Hellings	214f6a4d2a	chore: add bmc IP addresses buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-20 08:50:03 -05:00
Greg Hellings	41d02d19ea	chore: forward ssh-agent	2026-07-13 20:04:00 -05:00
Greg Hellings	4f79033b04	chore: add Proxmox CT baseline buildbot/nix-eval Build done. (1 warning) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-13 18:18:54 -05:00