Hydra to Hercules CI migration

flake.lock

@@ -759,29 +759,6 @@
         "type": "github"
       }
     },
-    "hydra": {
-      "inputs": {
-        "nix": "nix",
-        "nixpkgs": [
-          "hydra",
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1679916613,
-        "narHash": "sha256-Nj9U0V7Zv7XoRDdO7ECphTk6jHfOgeZe6G0x4FQLpJ0=",
-        "owner": "NixOS",
-        "repo": "hydra",
-        "rev": "082495e34e094cae1eb49dbfc5648938e23c6355",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "hydra",
-        "type": "github"
-      }
-    },
     "hyprland": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
@@ -864,22 +841,6 @@
         "type": "github"
       }
     },
-    "lowdown-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1633514407,
-        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "type": "github"
-      }
-    },
     "mk-naked-shell": {
       "flake": false,
       "locked": {
@@ -971,7 +932,7 @@
     "nil": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
@@ -988,27 +949,6 @@
         "type": "github"
       }
     },
-    "nix": {
-      "inputs": {
-        "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs_5",
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
-      "locked": {
-        "lastModified": 1677045134,
-        "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=",
-        "owner": "nixos",
-        "repo": "nix",
-        "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "2.13.3",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "nix-serve-ng": {
       "inputs": {
         "flake-compat": "flake-compat_4",
@@ -1069,7 +1009,7 @@
     },
     "nixos-vscode-server": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1676501444,
@@ -1204,22 +1144,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-regression": {
-      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1671271954,
@@ -1332,22 +1256,6 @@
       }
     },
     "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1670461440,
-        "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.11-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
       "locked": {
         "lastModified": 1680487167,
         "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
@@ -1363,7 +1271,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1672441588,
         "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=",
@@ -1377,7 +1285,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1675942811,
         "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=",
@@ -1392,7 +1300,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1678470307,
         "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
@@ -1411,7 +1319,7 @@
     "nom": {
       "inputs": {
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_7",
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
@@ -1558,7 +1466,7 @@
         "fan-control": "fan-control",
         "flake-parts": "flake-parts_2",
         "kernel-src": "kernel-src",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_8",
         "nixpkgs-kernel": "nixpkgs-kernel",
         "panfork": "panfork",
         "tow-boot": "tow-boot",
@@ -1591,7 +1499,6 @@
         "helix": "helix",
         "homeManager": "homeManager",
         "homeManagerGitWorkspace": "homeManagerGitWorkspace",
-        "hydra": "hydra",
         "hyprland": "hyprland",
         "hyprpaper": "hyprpaper",
         "nil": "nil",

flake.nix

@@ -55,7 +55,7 @@
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgsUnstable";
     };
-    hydra.url = "github:NixOS/hydra";
+    # hydra.url = "github:NixOS/hydra";
     nixos-vscode-server.url = "github:msteen/nixos-vscode-server";
     helix.url = "github:helix-editor/helix";
     nil.url = "github:oxalica/nil";

hosts/default.nix

@@ -186,6 +186,7 @@
         ];
         secrets = {
           "rock5b-wireguard-private-key" = {};
+          "hercules-ci-join-token".owner = "hercules-ci-agent";
         };
         colmena.deployment.buildOnTarget = true;
       };
@@ -207,7 +208,7 @@
         extraModules = with inputs; [
           disko.nixosModules.disko
           nix-serve-ng.nixosModules.default
-          hydra.nixosModules.hydra
+          # hydra.nixosModules.hydra
         ];
         extraHmModules = [
           inputs.ccrEmacs.hmModules.default
@@ -227,9 +228,10 @@
           "cachix-personal-token".owner = "ccr";
           "git-workspace-tokens".owner = "ccr";
           "magit-forge-github-token".owner = "ccr";
-          "hydra-admin-password".owner = "root";
+          # "hydra-admin-password".owner = "root";
-          "hydra-github-token".group = "hydra";
+          # "hydra-github-token".group = "hydra";
           "cache-private-key".owner = "nix-serve";
+          "hercules-ci-join-token".owner = "hercules-ci-agent";
         };
       };
     };

hosts/mothership/default.nix

@@ -1,5 +1,5 @@
 {
-  modulesPath,
+  # modulesPath,
   fleetModules,
   lib,
   pkgs,
@@ -13,13 +13,14 @@
     "mosh"
     "ccr"
     "nix"
-    "vm-sala"
+    # "vm-sala"
     "vm-mara"
-    "hydra"
+    # "hydra"
+    "hercules-ci"
     "nix-serve"
     "cgit"
     "docker"
-    "binfmt"
+    # "binfmt"
   ];
 
   ccr = {

hosts/rock5b/default.nix

@@ -14,6 +14,7 @@
       "wireguard-client"
       "minidlna"
       "transmission"
+      "hercules-ci"
     ]
     ++ [
       ./disko.nix

modules/hercules-ci/default.nix

@@ -0,0 +1,16 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.hercules-ci-agent = {
+    enable = true;
+    settings = {
+      concurrentTasks = 8;
+      clusterJoinTokenPath = config.age.secrets.hercules-ci-join-token.path;
+      # Don't need using private caches, if I would ever need remember to use agenix!
+      binaryCachesPath = pkgs.writeText "binary-caches-path" (builtins.toJSON {});
+      # secretsJsonPath = config.hci-secrets.hci-mlabs-haskell.target;
+    };
+  };
+}

secrets/autistici-password.age

@@ -1,31 +1,31 @@
 age-encryption.org/v1
 -> ssh-rsa /AagBw
-SavKqjsDkmbSWGn8nFuPX3+V20g9ciJZGrnO7dk7rlnifGHqzYjFz9HzDmWsoZT6
+Klg0lEeYAlohVeUjeeuJpRPcNYLHpglVpV+7xy59WSe+O9ZGaUwKqHhe2fVwk/8D
-vhAeblNv0UenSZt6PpVwBAJP1vsXzCuM60Dx29PqvLs8BzyaWEDozL/SC/jVTRDz
+AFaT1ZTLTJhXnYPdBnwX0y8ALbjOaRRzvnWSeiC4upGW+cCxllwrP1A1TtHRQ3n0
-VGCwCSfb17QOOcdamGnJQJlHvWpuB9RKuGMwwMdhchHV+EzMBQnshBovtjIEN7rE
+KgZzn7CMo4AvScZtR/LBRDkFZSYTg7R1lwy0tRoGAbUZkpFF0628QadRKvwuWRNq
-tu7LahBKBFWnnT0ymCphYAIUif1duhSZqXYwZDMledV5nWyddB3WhaR2l6ZwaKVg
+BpHkvMxEt6f5LTnUz7AJuMp8IvpoY2Ixops8RUfANcgm4tBa+mUpo4vEPdaYRX6v
-UiS5ztqeXqVVATvxeOTCzUDH9NO8FBqdWYj5dmh8nTdnUPd0eOtiTXQpECv2wmGo
+2QM6/Y3lexxbvbuT+5Y8tQCZrNJ+mhx9AZtYEPS46RNv+VuEJvg6v8PRctvc8Zcf
-xaaOHKvSbrt7SUvdwjaQcYE5Ystqm6MUTzxrnFQ8GgINh0vCDnfcHR+gjFFAfBxb
+P0MED1QIrvJQdT0g67of2NZtPLdyPSVHBYlmuZWSlgQ9Ev52GsgxkR15foF7OHXT
-pcG34pnx07PvdVimJ/CojTd5wDHJtdM1l+HX8CGvmEr8hV2z7AaKJSUcpfHEQxKf
+iNTnMgWDQ40ogyEXMFg8PiLDsSpTVdaW+mFblCBGAD/T6I/VgmUaCFpduTiTIiLn
-mv02I5kVzFSRkI9MCUJpOan+G1b9lVDvEL8bhxmRy/V+iJ/QPcuj33SXFyynjmrY
+nPLpYgSkHPyxA5rQAfIroVaSTzc856mfSiw/ufW6uvnF+jh4IfmSIAS7eBPXh14B
-VgmSY0X3rd0+89FHaZeyI+KdEnh6YDBwwimh1+FnJV0NOJtnl04q578Vmx0LWFrT
+MgOavQeCwGOWJ9+3FSVem4ySmHXDr5GdygOUAsItCFaqvXYKRlIKYRtK7fQIS4Je
-yO7NNWzd6+EZPzRBMWtAD6Nei2OLJXH177778R4ntu639BFYm5MOqADB39jXbQBS
+GGBf6PMFN/L/dzO3FsWULVcneVT1NL5TApsZYTywTOkMv+ncKMX3y+vKoyth7feC
-RUZt1fMXDFEI3jNk5I2AEU6hNO6gxoKhngDdyiQyzaA
+F00108iy2YNo8ATRG0+vcJQbLA7Krzb/VJl9XtUp9fA
 -> ssh-rsa QHr3/A
-iUZBRkiEu/iEIVzZAGpDuHVIs85eCcen6rArUtXGBa1ZbsI2VGEH56GhuuNswnw+
+hjpOIFi3jK+XeRIb7GLOudMnOoM8QHRlHslUdQQDOZKfgmoAXW6XkEC2dx8GeEmK
-x5/JMJQ1JYbJcsxKw0u0cH0U5Z+hgg2XvqAuO6/UAyv6kHf8g1r+gvMke4+BOjKp
+KPn+5crZuPN34d/VZ3oTGCD4zNiAHvz0uDt1K6vysnVYyvCadiIyYu0ylympPjN8
-UshNLiVbbyqGPVRXqzj7tGZwE/z1UQHDjVpCj9f8j1mX7KvsTJvPl1Wo9LHXDK0H
+JUQRVXxAKj5S2QgfGiengsvo7cIwDO8K0JM22viQQRU4smxc/guf9/UVSH+2zm+Z
-/C2D9R29NymAEZW2x3Yol2Bv1xIK8SA6qsYaxmWrLfw/69iqurE49s2nx8tkjWhg
+yhlhZVUs8k5fAkJrn3Zyt5kKf4yv4XKvlNUQ65EG5czKsvNgxR7CQlHB1JYiwCFR
-jFPDyO8Lnyj5oNvnkA2XPsuVNUIDQbxUrPZecAhpMn8gAxKbaSgmqWTPMeK1cIU/
+W93hYDiLaRQaNLRJGLty2gmAGB6mmNsriAlkSyBtlKSjeQovVAzt2D57wGdbG300
-RcYhIisQhrC7E9jQXpscjHOwrc049Y42b2qjaqSxl5hs/9LE8f3avv+UzROsNAeJ
+lvRkGPdaD28qSXczJ1U5ZvMBxtpw8gEq92vZDS2MKv56Kscxg0KlFgaLzRupEEru
-ImiCmUkZqhizePciOx8HqS9Qf8wTrIPpHEzD/27TZABLlF7bpPn+cHz4XNx0WpP1
+wfaGoxUkUpTKLQMK+ZCnYwgJy0y9fDbDsXd+yid/yBcOUuoAEkpq3/dJcaTpCv5C
-bnlfn4sRk32ZKzy89GJbnfAHyyCx+eY3Gjgc8N1LWKG3Hl4sIziCMnR8XQEEnFj/
+b4ERHM0wPubyoscyk1InGP7zaUaBtOHzfwDamKZ2ahu86+skf/NPmeo85mdJiLSZ
-GcdVIaF4kRJasofFaoBWZC3HtGeybirRRl/e8v63Lkw9NJfHcmC85rdo1Q5UBYl4
+lZ7gs5X92+hgxdxr+8NI2AJxy72emVmGpKzr914+hIa0BrKQhtadqaZc2cqyMCmm
-wLmIgYK4d9WQMSNVXmBGX7Y4tlFh3ls2vI7hW8EL/4RG9QTSGDDYHQJlnHQ/a7rL
++jTwXliBY6PE5Uv/yrTPL+hJ5yfc4RM6T21BsKzqR08/496lvFWYY2uPEMAaubnZ
-RGQyHKUItB3z+QQuduYu2WBrwgKSXiwYVPgrH9zvJcM
+yrFX5ne4m4uXj0d2OcGa4H3Z8OnrLdfmgysx5IJIxj4
--> ssh-ed25519 GVMLQg 5cjQIFpgP28Ma+6/blU4w4HibLWXdJ0L0KdtvwfR0GI
+-> ssh-ed25519 GVMLQg 4Fd61NYElKYQqZacALS/QuQ2yL4vOLrSpuEVKpQAo0w
-6nXKmrUBM40PX29dnQqBxLz6VQu0BQiNmsTwLXisi1o
+OhnGd5pXN6Uvxblw2VIwWjFldc9t1BerpQa4KAi21q0
--> Gzx&jr-grease 6]{'em3l a^Ij~& !Ty~ZY WI'5
+-> j=-grease yOMTm"#>
-5w8dd5FAMwU7
+QQBUO+uWgj1YmqLea1rmUVRxy9hA/k7SCi7S
---- yjqhOfQNPT2npvK0Rjitk9BQywBCYpupFhOO8bVWGKk
+--- JqsFWi0axwaVJ2K4bxi8suyGdKYopsIl7h1jEw5ivss
-;ăSţ7yľ©¦ë
†mçŚ Ž«Ź:‡őQ‹±·¨<16>,ň罹Oą
+o<õH¼*&š6S<36>Í4«<34>7‘ÖÁ5ˆòöRêˆg%!å=Äk—îi

secrets/default.nix

@@ -10,6 +10,7 @@ in
     "hydra-github-token.age".publicKeys = [ccr-ssh ccr-gpg mothership];
     "cache-private-key.age".publicKeys = [ccr-ssh ccr-gpg mothership];
     "autistici-password.age".publicKeys = [ccr-ssh ccr-gpg thinkpad];
+    "hercules-ci-join-token.age".publicKeys = [ccr-ssh ccr-gpg mothership rock5b];
 
     # WireGuard
     "thinkpad-wireguard-private-key.age".publicKeys = [ccr-ssh ccr-gpg thinkpad];

secrets/git-workspace-tokens.age

@@ -1,33 +1,34 @@
 age-encryption.org/v1
 -> ssh-rsa /AagBw
-m73z4roKXoHfLZH2uJesip/21ytdiBw6LKB1lRS3gOPhBzYwIkUcsXuIfAEuV8zQ
+kR8vBBJWJ+n5oB5dM+RqqgYBN9y4IFIz66W8F6h+8eNQ7WLsp7qggwztqzkDveuC
-baESUwxFY5/Cq8b2LIOlrDFCeM6AlV6YfXMzmDWRkeCzRgHWOo60NQqY/yLFq98k
+yz37rnq7Uq8ExsP8bdBNoJKLJYGeoF2nX1/LsJQJg0qutwzxCIdqqFxGeLKB1Bn+
-I2YhSpim1+mRJgEedpw4+KWkxu8cjajoYj/EHQxoqx0+WgSFA19qrJl1Cl3RGKYJ
+n1XNdpoIXBbKajSh9uGGigPZDSlpS8eoAesY6JIqDZwCuups+Ajja1VQEPk2gFAV
-Xu7Je07532HMWflNpBl6BskYZ7bYs9DE5iDD47ZsI7a3BIqvLjo4mQ52fGZKe7KW
+3kg33xJc7l+32E3ONuixiIcz8xBnggs0n3zDKTIIigUoW4rrRnx6dI7urkquA7WX
-J8dY2gIuVPJCRCZ6LYztt6VUXmy9Y0PHBSJsQkKLgNdEiJ1I5IaELG3yaJqX2p9V
+8huykb2lchEIAZVlgEjSNxT8JjifmjUjouNsp79//H9sqpxfGW6GQYQa8uwXuIs4
-Fm981HnQaBq/v97jDFJ3RMrfeGQN32SFP+KDGf0z3ZIXZniOG+eCL7FCysrS2mfX
+cbDC/3TKalQBOnS91WrO2FUHFcgESsAySIeerbAIAwUarEAoYzIz0fA6rY6S5e9Q
-hKpIrg4m3GJy7ZwclfKVIBbxtwsAEEM817byoh2bCV91HpQNVQ3zxiW/ribRf7Lh
+whzHPS9TCx+Vk3rj5sJpfKaJctg1XkTdeYpwSbZQmvQHzFd6pwfnUVLLLdWpNptO
-GGRHvoz+xzRAsaexmBZ92M3V1z9PiumYOM712/jYxEI5zunR2HJej4Wx5bmG9zJj
+VNmtlqwkrQiy0JajyaObyJkdIrjxWq9uDGAGrNxyTpFJJ+KpcYXnGP2vIMxObtTN
-cmoo0542WkF/73vHv+TDu0gVYwjjkT1zv2FUdJKVYCTuACVHMMChy3q6EllpDQVS
+En/qWqPlMg7w7s8zoz3OHtjleLWVe1yy442XdLOtjn46KDBjMx1smpV3jxfsiq6Y
-AG+pfjo9nd73QdpfejbPEOiRWIIxb1pjlQj1pDkZtZ06RQ5naQPGJb+7xSWZYG6q
+I+VOMXZ9MscDrsfyy1L6r9VfLyv65e4ZZ8iu31UBmCwDQvLro9xkXCW7D3iTtCua
-6J8mj6Xug56novLh70dyv2r3o0QA3fa/hr/FEqpkXMY
+WgM9l3PqbrnrdAiqtmh/dCiXE2LBZOyoiNDGeqa1sUs
 -> ssh-rsa QHr3/A
-t0hJvp0CTxh7K5OAPR8AEhoQPfW8mM+IGkBBGk5+kA34BP2LX+gD1dE0L4DJ5tiS
+JUCBXZJFKzimFZC4mg4YFUXzXkXkcC95+wFutEqedZWCwnhYq/OZ3OG8p2GgVe7s
-cCL6EhJNcYYpktvUbzqWsp72WTTZX791w5XGirgcPGmHJWBxYio/NlQh86FI8MdJ
+ftIMkNSY2K+H25yKqubuhz+vDgtoTUOYnYkI9XHom7OmC/OAidVT1LTnXXwyGWSI
-38bdIJI+wcDb1pj1Sqope/jsePuNg2bDstRShFzdxpanZayTgE6bAKgyth4ln8qB
+uM3q+r+e79MFXJJdhYbDhgKYmaS6LmFN6RGx3WG+uGoSw0ZOLCs1j/SdCvDiBf3o
-nDmtGdHS/ZjadGM5lg0fSglhlSEiKeqnRkYsa3f8qi5qSqB0nZ+owtBZySg8fWlr
+ib5++OfsOHwtcqkgQMNhddQtle8vjuAdKBjuner2bMXwBuAsJLPVKMq4Edo+XHr4
-cDfW3yDy7r6ttTZNMQ3PVXyBAuwWMAPIAhWTcQyBo6C1d19R9gfsIh0T57JwJriv
+bYO0ZT38h7zU+IgWpkENNdgDoTglERih4D+7lMFy8Brw6Kr49gypv398BXrbvwtg
-9QRc9LhXedcAA3yyX+SpI/3Rh0bmEf5mJeZ4mowZIdguKvyAxpCkUGCdZJbnFtZZ
+8YPd5x4UNFWhMhZ0qvJOI2U0tm9FV1zenJQjsLcPmfOGGO3bSKuFr6ihw5ObJSsg
-o1F4jIgyOsNp3m9BupMklmG6LDcbVSgwTZsDmsNxtjfbKp+DZ7IFDFs1g9XFuzyy
+TTXdUob0FII3701S2074tstRV47GMd98rPJrQ6Crnqy6puLtN2adHkLr+I8agzln
-4S9RzhVIULAO4zPqoV16u3NsfpOIei/ji5TncAibvQ1hD1bZfO/CNtKqRsbotwdU
+bdPhQ9pYJhICRlwdyQe1Y5l6kgsn8yZVygmMQBF69qJSnnXBuMiRoudQZDzXMdtM
-pmdU7TQjlbijw6JAuOH1CcEQP3UUORGxVjNs2NEFbDD5skX6IyOJR9GcsuT62xaH
++cWntBt2j6uSno7jMsOR8DZLwZQaso96UiXxstBX5uYhuqEpUk12uIUDFPVcovzx
-BeU19TKz4KA6gq2hmqzHdSFMOwsQ9XeS3tjH++OuIszj16e2SJExIWiIwHfCWnXQ
+RBt6fNjkkK1nc2JXr5td3d+rfAJxiOGr8p5YHGWW3RE24qJYVg1doiOyCsHX2XEA
-D3woBgXS7vIgnFKMg4QTojiEo5p6W2MCGVdExyhi8eQ
+oImTlruNm8MJAuGz8l3L/wKe+v+lwqI94zBPrb/SYwc
--> ssh-ed25519 q+UPnA 5uFtZEn7wxhnFOtU1Xa8hLKr3drt+DY3eAaCKyk3BVw
+-> ssh-ed25519 q+UPnA j9rU2qfTAHjL/+wdP7PcsAu6QO96RPTPszS4qWjiBRw
-fYQCRS5249+O6nt6gT/slipU4t8fE4sKVC3nGCIrwzM
+8ziPmZ3asg/1tOZvI8k0jvNSjeAmhDXYVGtXCi2ShxY
--> ssh-ed25519 GVMLQg GRDDcNOWSg2DEDHJWHkx47yKQO8WXLnd/LHBrncU+lw
+-> ssh-ed25519 GVMLQg Pw0Rs0GhAEGADsd8tc/n5FAhyQHDO9uOh3A8IifHPmg
-/99NgBi4VcPQXyALpWqCIVJjVhtw0yUp41pTvYdPSBg
+4o+K44rs+0KVb2LWMf4AQ6JPp6pjUi5IeGg0SZy5Eao
--> L'-grease :*aX 8M,ns~&,
+-> g0-v_{W-grease P2 h/otU
-vhPrxCwtTJxSDDcoZZpIi2uD5M3qolG2C9T1iIb84aTkLMRVKsL/
+keMrgZKkqyoyTiCUR1bqG8j9++6Tl318j3FDMPZ14l3lNbYASe+esj6W1VVQLP6F
---- 39DVLa8A03sMDh7yEsaJqFUqi4yqhD80Xg2x4INj2qo
+CwOZP7mKvlS3jiNTLes
-0}×!…¤p<15>áˬ6׿ÿÇô|/?kÑz”b›;¹§	+¼­ø¡¥’m\ªÀº<C380>¶þ±™œ‰4‰û¶-OÎ<4F>[M¢8L™?çòòxìaƒHç<48>®s‡­Û
+--- hJiPwZY5H5IVDPi8eeVW5bTnrR2eMV22ldDzcdQzWoE
+wiúúþ=3<¬_äÉ3Fº.ÙŠÎ*
“ÉŸÄó4!ÁºU‰$ºê¥IAÅÚ®fú(÷03`O~ü;+F®³Á,¯´^<5E>Iî” »àQ•%‰;!oäFšžð

secrets/mothership-wireguard-private-key.age

@@ -1,33 +1,32 @@
 age-encryption.org/v1
 -> ssh-rsa /AagBw
-DXkRhGDz9k3L6uhx2Gmqg5ihAQEBVmtdwBFDIceLi+U0w+1nND1RHqTPc/WXEQAU
+ZyAIFd7Y1Gf2IPgt0CpjC71pUwSp+DlS+rGwQlB8IWXUULkzzbO9f/9VAK7NXScu
-2b+BtYi9Hze7zYPmWiiAggvmfip/1vndPIUpOoywsE+IHMu2kmMkP/dqYXzglzcF
+YaqY5PjgZ9rm7fztJU8LJR+BD8L3VxKSmNIf7UeRjAalC19l4qw4yBq43SPmEBxl
-il2mfsIshjDjCGTw9oGYy+pGCHu5ORc8W54QjVnvVsCg3O2kaLy2zJCVjLpjvXZH
+Uzql9M+w+Ad9hyM+zcZC9EBKC6NEgt7nY2V4Ar+xaZrK+422ZzoARh92UPyD2PRr
-WwCbvecZacBx3CiHy1ek3bCGUFOviyt4zD36WBTqKqEBHQvGli0B0Zj6O7FK1iZf
+NTk9SwJnuOUH6VjbtVeTgOumdc5+ervoG+OcYbSx1J8IA+I7sVSTLGIIfyksH/Vb
-2bKV5VqcUxjiBqX7ARO2Np9dpJxwJUGhQJYTUZUSqu5C0y94VkIZJDioJ0Pu8AYB
+ISHP6x9258HweDwuCevM6FGpSjo1pZ07vvTrwElCQTmyUI5VSsSivzBsxJW5vTOD
-RVhmNdhn9GA4JoeV0VHYPSybTDN4Ubrphy2kG/PVqiXMRNliTcN+4yjj31ymmZV+
+/ZSiNIbWGWaDzBKEZyirLtnx69ymYqQyAzXCH/Syljowan+7x92sAyNjKQ664FP0
-VqyCBV/6YdbOsl8OD8V5DYIKxlyq0PVLVZbz/Jq/aX0vPqn8K8Z6JGS20FtnCvp7
+BIkR2Xi/ICnws2v0YmPhQgRHzEoQXYG+A5opAO2hT2hIDGYtPh9bNBjZjXyr+Hh1
-qpWtFvYOeKVzoM/RNa6umOp0KbyKrIpVsw1u25oYpofHCf5qlITCNdgW/Flb39en
+KijGogGeWHE5SxGAV46t80tvo9BbUVhBFKkwezeCoZ8/pzoh7nzkFXyDK2zgWMUW
-nBmbp1D06w2uTbcC29wdTIdlp3p0pQemtmFbc6WwaFBN+7YUE16Av8i+wI6Kxn9V
+dEPWolIMLNbvr79oUnkZqHKqtsl/phdrziSt4P8hNtVctfEhChZuTLBHPLx9ac/e
-YAmcvnw+npSNpZX2IejGb2Gu4tXSHGh3SnGalTOwYnmXIra7nonJodOZYrmR932e
+EdU/7sW+XiOJD+BCRyCthAQADSJ4A6iZCp8iCSPts4AV36DFHhX0mG8TOCPF/Djz
-pO32ImFuPiaHn0QY5JCR8dX3gzmU2+j64OFMWYU/cKU
+t4nI0R/OugAlcaeIU7VBJplAXlwz32B5freu1NF+Cqw
 -> ssh-rsa QHr3/A
-UjF5zTysGertTmYVlbno0aNGZwCnC9pj0pFS7dY17Bs8HXKgQmAz/0Pz1Lo0wYxp
+nwxD/5nnhhfoFDrfvawR9j9+eSJzeZR4wdHg78iw/YKnz+CrCvlFK9b54WXeqt8M
-2NbnoityNv/InILUj5ojqA9r4fFWZf32YmRszFfQeaxIPIaMbeEcsMBpem7ct0lG
+P9bZurxpNsa1nG31MOmMQcyNKrcrjqfBSa/311FR1NvfvpMasUg3r0f1W9K0MkbL
-LOFOXIrNqNqkWTmhlPqnDaOy20ayqlLjzrf9ZiJG42gsZWeiWrekuMllXEEdxxMu
+VV27jyhurCS0AVH5xMZ5uEcH9gXWWkaRWN9mgZ9/kJtr6VqjJdIT/l/0KwXln/EP
-bjEPB7QUpDyFpcWMF++0Fi6u8a0mepKT6idi2D/WCJAU1oar1sGHWb2mItcYcIFI
+tPNkelQWIPhUCQ+w7+a2qg1t0q1b8MM+RXQ33+m9X6DvoNU1V0RKAl0YfBNrcVRL
-0Q8ICUborJ1XJbiJCxqYaNA2E61GDjwkOYRpshl6HESTSMwy/ZWiVkacjMx432en
+7FQbeZmJLjLmMeMbLzGdAZZIyoRlllZr9Ho8/q/KHDGBOsAaJt7yZHhHGvvdGdeD
-5OPXkCglSDP4wtU1dKczXZBw5fZzcuEeC5YC56rPMuXFXIALwc+Wy2IQJYeFkaaN
+2AXcx9u952QnuL07cwYZTSwh6yfYMvZ/oAdWfVLQ7u0ZLJG4KNyVEnzUKYaJsEgv
-nN+TmkydV4vChldLQi0UQuszA/Wlcz83aZO9Qh1WROoIZcR5tkS/VpEcqAhoJ7xZ
+97yvsUren+bgSa2xlRtCBDfbspxbjIC8P5pK/dDHoGbNS3dmO9+pVy1oucIBPOHq
-MdB32HtvN+aG1xXltWNvTIj+l1kVEB6Q6dAmzL4K9IMQyh1DtnYvFIzLJBzDPPJa
+eEU8cv4gR+L9JZ+ZyRISYKdlLX4F3rZPDGDuWI3xuv9+Wn5HmKEg6KR5txPR9enz
-eVvuzC+Nhb2sxlyadE2ey9ghcOHbHx/s/J9dUniqwZCeIwIK+IpK4mY6PIANdRzT
+A/A9M+ByRZfpSHcTQnHCEDVXPA/6s3U368c+97mQkn7zHkKqBz/9xDCRAZ1zJfmX
-Re7Q3Erbub+/xTFvNGFhBXbtDfjTIqmCvSc+iLLLlmwekcVas9csGnBmBFV0C24b
+gnxMgiu69hG40tcOt5lJ7l5Ub7JJRGcju+1LTsrk7dG8rerRcQGVD0RzWBKGs6MC
-n9R75KNS9ceG3pdCpTUC7v8vGwxnzk5iq/vbBYDnqEU
+xPI1UaTSifctYwph3JIE7zSRyKWEXNfIwGUN/IeJ5Qk
--> ssh-ed25519 q+UPnA XBenOEk4yVL/NMsmoGw8wofmXpLlR4he4AnP71TDuEQ
+-> ssh-ed25519 q+UPnA TodcF2hzoDbPkcGP4WvWQ+PtTVW2ae2Nf3kvqNrjuzI
-Rzo7H3oaCq9CNMiIqCMq+MTifAZ2K6nJniZO8WL3gBg
+ftRwtL4Gkjj5VU4mw15teicD0aa2qMOZxVUYCVtj+v0
--> 7p.-grease \<p+J s0s@ R8yiO Z5a8
+-> ;sH;-grease
-gH8mqg7ClI/Bp16+R8JDJS48yrZgVHuWAOBWGkBfLQADSE4Clvgnu9HplTc5ORmF
+ZcjMolRojM91kXtIOEj4C3BplSI8rSALBKn2ny2CfjAS2X5Ml0F/i4SJa7ElVBfI
-YS7/Owq0rewr2xIcGX/AiXkKfYUMetoPH3yGm281Ox/2geQSsekeMpfeDSjFREKW
+IvN6OcEf/o5awlcqAC0GtccYwv1X+yASx7HC7jb9Kjd83oULGwY8BuHx0sTm
-
+--- vnVqrDhP0rS+X3DDzDeDdY7Ah+a/+XGAjKabfYMXulk
---- EnctcfzAEZabu3FEpPHW+oUdYafDXK1iRtK4kX3JPXg
+™eôé>{Í—œ'f%îLë=ç=¡Jþ´@*aQÂ5ºO¢¯)¬¥Œå÷¼RßÙFßf†®ÏÆûcêPán*×D6‡é{8}.|¬´÷-
-Õ)V³…B¥C’1qå´¯§in7»%†°ÅQ’Šµsfáñå6E}íg<C3AD>Ò<EFBFBD>:w<>¡ÐžMÂÞ&~'·äEM1=¥ÐKfHG5—F

secrets/rock5b-wireguard-private-key.age

@@ -1,32 +1,34 @@
 age-encryption.org/v1
 -> ssh-rsa /AagBw
-Y3q/0GgMhQG33xiULXLL4bAGbkO4FJX0Vs4oMHRDc/Ho+HS6ae/VeZUEJnuIZpQC
+BFYnzNCrRsdN6BFF7lujlt4rk0eBMITxptFjrYh9mApIn4aSGUamfR5qHzHIWT2w
-g9HrtKW5VigMWszLGcGi+OwlmX5OYUPLWFT/UUg6MBBN7TmjDL39P/Il7m9qV/xP
+KBTlYpc/h/IhWEBVAI/XrpfxY7uYbzFAW5D9pn8nJOGpR23tI06F/lkBtmJbM6FN
-8phrUnJTcalQ2+pdii6wDtKlhHtVPyXPP8S+sEAU22DyL1lW2Bdb5PYEbM9Xbi9R
+c0iDzQS1EZGdDsTB42SqkWfBSMpiwBay3sQSdSjhtFP0yTLPwPL9urpAD/IRTe8c
-nnXGau6A5PwxrSNjrwx0zZpspuwEcdn62awC1CkRQg8H0ZoI8Ps8Aj9iW4a8ert3
+v2XK79YjgwUHf8S3dJdzRiqaxlK+v+eHia01lRuItzHklWb14bsaFgEpyAJXYEme
-8nggVUWK+ZAeoroUgnWSDe5INQhaMs3elqD4IdsKzWogaOE8xe34nIejrm8/kHAL
+e1L3xOc+x2moWwSEgnBiRzu4XkSohslSLM+CAswejW0i/YBRPveDR0YHIgqTjL7e
-y0YEzVAiFcqWK9tAU9wA/cdO9i0E8xbzN9VwurmAHqT87aIkwIiR6VBEZ3NZDlpt
+3s4qVo6p5Q64EDYlvO8Fi0hrz+hu0p59jpoPtrIAGjDiFJQmF1nSBLw8Q40gXy/d
-lEi5iPPShi3vBHg5+BZc3pM+qPG8wwus11g+aVSTDsNVtG/GzQaBdHmzzbJyqDMN
+jGCD1l7SKvrx4crwnzuAeMCK9RWi6LtNzXeDG2ygkMmKGWQdKM9fP0AtF1iQSFmW
-zk6PnJlbpoNOUNIzYH8Jb6EmgfL/sgmWyMVgakMGlwXwjnQWgsPfHQfiBmdz12xs
+Rj2JNCb7d67uitkovkwm1pcoVg0Nv3BjFTVf4dt8dxdWZcoPSf5Q2BQmKNuyScoX
-sHwimwKrkJQGoGww3M7+/22oBpkqMHtBZv2f5RZptcciwjhfazlvwkgmGGpE2HF7
+Cean8TdS52c87eEklhPOchJE4461MhMYTwJozRqdTWSlFJ7GIzxDKksHY7Xs4oOZ
-m38i2U+JzgMMXspTI74+c3RyDMNrFt3ZL4jX5mdz2HLlCdnIwHTAQceSD2wy1fe9
+2CmJjSxAntY13Xm/V6x5MCl/M9yRJ5p6eejzv0nrk63MJQ+9bXCrq4gGwRYDhng3
-tn5Yb8cGCxF/qzu/oKqGMcVM0emAqjIP4RyTtf3w9sM
+jWZOPSLwtPpBGCfPb8/mMmknF5QZBFMViXo1VxGlF8Y
 -> ssh-rsa QHr3/A
-Bq/6Msux5Bn0oRUNB7DpfROmwO29uIhQIdGQn40DdJzEVQVPCscpU2CSVp6BAVOj
+RYlsXMb4/LEvxDc75aP5Z7MjBkiAmJy+QB6XkJ/tjEPTxH4B97WguNCrmKd1TKkv
-B2S9fLjf4eF5kywqjMZJZeBphX8jwjsRuuaWDgC/ZhS/MG/xmMYK4UBNZQ+YJjO5
+NY5WW85mRj5xjcYNx21vXlz0y+NnTB1Jpg3PnxcfiD3F1M9E1kUKSY0Sv/bbi8KT
-Lp1Ib1NR5ek/VBLBu6PXu2bzMFIHlCN4GGNBu/ypqV20bWhW8Ee3cvUsNapFNfDn
+4JqPkkdbR55csNp76gsdRUweNPVLQCiRXyCYQbD17/KQR1e3gZ1nlHJyOzk8uwcd
-1M62m9fYxY6VnqJDIVBEsiuMUTWxtFgVJEQao4HbtKDbpM5SbXRbg4D3fGl4Wfoy
+6emM0XsVMjhzjwnoHy9rVvL4GYYTsRdMwRd+kDyve4punPKcEYdhnUQse7buaNJs
-Zgqk1qgbK5t/wFtKtCRyti8EWnvndO3mMpF1Xs/oRaGU6b5WtbSI/dtQnJBTGSjZ
++tbuMhfNYVSBw5vAXreMVe7Iw6aILQ7Jp7O87eJmefDB/hOSoiXkqPnQELpUwPQO
-NtWScWSmaJxSyjQ12oQzH63xkk9nXNm39k1vBgwce2JtXpMdvnOB22jfNhiZ9rLn
+aBVctDyRX0IoerFXx0/KMsjIO3r+rdVr4aPEqA33ouwzJhggs603023DaDtmTBkW
-Ujj0zZ076EinHXJZLgmyQHROK/5i+Wh77JvuP5gyizsRP/YQoHeDJ9U2Dcaiunjn
+RZic+BtKIgdi6qQEGShp8SRMLGBWhH0911A6w0wc5k55JhmAEfxx0rcBnDuWjfMb
-bIbCzCQqoda+PXWtFeddFvVgDHmn0mSx25ZNVArmycdj+bl/HWjJa71YEkkUcGGD
+mPUQWnbejXWz+5UU5QTzkaULDqDXgecDq/tggsbBNF6CffoeSrHFLtfQe8Fv03nX
-QreKVnJPnTTGnv/i5oDiA9c9v5A/FkmOPxm4aGpi+q3/Cn3tmQp2sRQ1QhnyuKjW
+zwMXyxUaYJqEA+RWlmrBicq3Szin+Kryy9PHf1xpJl7kuE/eMxwK2oOeQldTxdif
-9B8yRxOn0t1fdlMC1XeKT6mxgNF2ucoAQhoEoIyOtJHbRf+AFZe0Xq2Cx7oGfzpy
+H2r4TM4Qp1pAFvwH/PdDg1FzxhT7MvQRpOHOuERZaSyJbi1uxZpEhGL4xBItNiSr
-qiaKxAABlfF/Lnc5MOVl7Lusc6z0/GUZxLk3rMQKE14
+pXoDEDStlcc4u2eM/5G1dHDOljWYsYrkml2ZBaq+/4I
--> ssh-ed25519 uy/XKQ DMda0wHEZRf3A750AiwhPbBO6JXFLh/xOUk9h6k9GSs
+-> ssh-ed25519 uy/XKQ 3PT1CZWG9XgErLjp/4xfQA2H7YjuVLqZemPpfk1Rfzo
-8OIhtrKaGCrFtyNzTAROLAaeFGM/rGdctFfdm2j6fpQ
+Maf6azjqf4OClb3Njv++lnJ+0rB86RsXb61v1C/IYkk
--> nqA]-.i-grease vQ
+-> x$=KD+-grease _ Q
-IZRcjeYqUXB1j7rq8OaWv3hRdc5yGME+e4oVdEXDT8bWQSS0qV/7FIdjbYKd2cve
+xlWMjdHLXOR2Ghtic6ogLRpDZd5yunAKqrbNCJWWd5c+FxKdjlFvQnKE8iZoXEoj
-kcdpZH8MHn0T
+xBGsGJxWwwe4LshbkMxyAuDz6N1kjz6GL+JO7/XrqMf0m3Supqmqir3483tTo2n2
---- eR1kvzM4onqP7nVZRkhn6DYIAqvOfEmOHZJ04TCrfGU
+Xq9s
-Åxlm#
I™ú‹¸ò<C2B8>mÛ
ÇÙEíÕ=ÒS‹Ü°½am$¥<>9OjÁ‚,61“Èïàð,^·hqj`4›È}ùÞZ§ÇKˆñ&ÂA–£†Š
+--- wFqmYwUiaNZW/4LSCZtVnob4z5rfXds3lCawk7Z8E48
+ùy¢™÷½[\PIA/gJĆ?–7[lÄ«°žºUÊÈëIÖß»y<18>j^Em™­7cOðÁ
+x<EFBFBD>-Î)>y‚+Kà€óoS³9Œø