feat: rebuilt wheatly

applications/git/forgejo_runner.nix

@@ -149,7 +149,7 @@ in {
           # used in deployments
           inputs.colmena.defaultPackage."x86_64-linux"
           attic-client
-          nix
+          lix
           openssh
           sudo
         ];

applications/git/gitlab_runner.nix

@@ -1,123 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  name = "gitlab_runner";
-  cfg = config.services.skynet."${name}";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Gitlab Runner";
-
-    runner = {
-      name = mkOption {
-        type = types.str;
-      };
-
-      gitlab = mkOption {
-        default = "https://gitlab.skynet.ie";
-        type = types.str;
-      };
-
-      description = mkOption {
-        default = cfg.runner.name;
-        type = types.str;
-      };
-
-      docker = {
-        image = mkOption {
-          default = "alpine:latest";
-          type = types.str;
-        };
-
-        cleanup_dates = mkOption {
-          # https://man.archlinux.org/man/systemd.time.7#CALENDAR_EVENTS
-          # it will use a lot of storage so clear it daily, may change to hourly if required
-          default = "daily";
-          type = types.str;
-        };
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # https://search.nixos.org/options?from=0&size=50&sort=alpha_desc&type=packages&query=services.gitlab-runner.
-    environment.systemPackages = [
-      pkgs.gitlab-runner
-    ];
-
-    age.secrets.runner_01_nix.file = ../../secrets/gitlab/runners/runner01.age;
-    age.secrets.runner_02_general.file = ../../secrets/gitlab/runners/runner02.age;
-
-    boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
-    virtualisation.docker.enable = true;
-
-    # taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128
-    virtualisation.docker.listenOptions = ["/run/docker.sock" "127.0.0.1:2375"];
-
-    services.gitlab-runner = {
-      enable = true;
-
-      #      clear-docker-cache = {
-      #        enable = true;
-      #        dates = cfg.runner.docker.cleanup_dates;
-      #      };
-
-      services = {
-        # might make a function later to have multiple runners, might never need it though
-        runner_nix = {
-          cloneUrl = cfg.runner.gitlab;
-          description = "For Nix only";
-          registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"];
-          registrationConfigFile = config.age.secrets.runner_01_nix.path;
-          dockerImage = cfg.runner.docker.image;
-
-          # from https://nixos.wiki/wiki/Gitlab_runner
-          dockerVolumes = [
-            "/nix/store:/nix/store:ro"
-            "/nix/var/nix/db:/nix/var/nix/db:ro"
-            "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
-          ];
-          dockerDisableCache = true;
-          preBuildScript = pkgs.writeScript "setup-container" ''
-            mkdir -p -m 0755 /nix/var/log/nix/drvs
-            mkdir -p -m 0755 /nix/var/nix/gcroots
-            mkdir -p -m 0755 /nix/var/nix/profiles
-            mkdir -p -m 0755 /nix/var/nix/temproots
-            mkdir -p -m 0755 /nix/var/nix/userpool
-            mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
-            mkdir -p -m 1777 /nix/var/nix/profiles/per-user
-            mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
-            mkdir -p -m 0700 "$HOME/.nix-defexpr"
-            . ${pkgs.nix}/etc/profile.d/nix-daemon.sh
-            ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs
-            ${pkgs.nix}/bin/nix-channel --update nixpkgs
-            ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [lix cacert git openssh])}
-            nix --version
-          '';
-          environmentVariables = {
-            ENV = "/etc/profile";
-            USER = "root";
-            NIX_REMOTE = "daemon";
-            PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
-            NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
-          };
-          tagList = ["nix"];
-        };
-
-        runner_general = {
-          cloneUrl = cfg.runner.gitlab;
-          description = "General Runner";
-          registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"];
-          registrationConfigFile = config.age.secrets.runner_02_general.path;
-          dockerImage = cfg.runner.docker.image;
-        };
-      };
-    };
-  };
-}

flake.lock

@@ -462,38 +462,36 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1730433081,
+        "lastModified": 1729298361,
-        "narHash": "sha256-1oqkMcFQyAqCvqkjG9K3NaRLyB1qkXXiZoxe4rwM6ag=",
+        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "834450e237b82230934b5d25ed212b5a55938cc5",
+        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/834450e237b82230934b5d25ed212b5a55938cc5.tar.gz?rev=834450e237b82230934b5d25ed212b5a55938cc5"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
       }
     },
     "lix-module": {
       "inputs": {
         "flake-utils": "flake-utils_3",
         "flakey-profile": "flakey-profile",
-        "lix": [
+        "lix": "lix",
-          "lix"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1727752861,
+        "lastModified": 1729360442,
-        "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
+        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
-        "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
+        "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
       }
     },
     "naersk": {
@@ -850,7 +848,6 @@
         "colmena": "colmena",
         "compsoc_public": "compsoc_public",
         "flake-utils": "flake-utils_2",
-        "lix": "lix",
         "lix-module": "lix-module",
         "nixpkgs": "nixpkgs_7",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
@@ -1027,7 +1024,6 @@
       "locked": {
         "lastModified": 1689960297,
         "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=",
-        "ref": "refs/heads/main",
         "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99",
         "revCount": 6,
         "type": "git",
@@ -1047,7 +1043,6 @@
       "locked": {
         "lastModified": 1696876711,
         "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=",
-        "ref": "refs/heads/main",
         "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191",
         "revCount": 12,
         "type": "git",

flake.nix

@@ -7,15 +7,9 @@
     # Return to using unstable once the current master is merged in
     # nixpkgs.url = "nixpkgs/nixos-unstable";
 
-    lix = {
-      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-      flake = false;
-    };
-
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.lix.follows = "lix";
     };
 
     # utility stuff

machines/wheatly.nix

@@ -25,7 +25,6 @@ Notes:
   };
 in {
   imports = [
-    # ../applications/git/gitlab_runner.nix
     ../applications/git/forgejo_runner.nix
   ];
 
@@ -40,12 +39,6 @@ in {
   services.skynet = {
     host = host;
     backup.enable = true;
-
-    #    gitlab_runner = {
-    #      enable = true;
-    #      runner.name = "runner01";
-    #    };
-
     forgejo_runner.enable = true;
   };
 }

secrets/discord/token.age

@@ -1,19 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA HO3CoMoRFUYu53Pu1LX91h5lF0BzOLlUfLd6VJ4zSnI
+-> ssh-ed25519 V1pwNA yAXv1Yf5cEeD82SIn1Jl7abXadIEHaeQgNF81IuUNSs
-7atgIwovOjaPHDvavVkswMJSTJx79aWiriFRFP75NSM
+Uo52RGQKIuE4SpS8SUtg+mu+SV73d28S89R921P7oTs
--> ssh-ed25519 4PzZog Y6mMkSE1mokAsIZL0A3jBM47S87iO6Lkv7PSqnOi0gY
+-> ssh-ed25519 4PzZog e37Cp1r7wkQcOPcD5/kYUvCcBrvkTaSNc19L1XZnfE0
-TU6PMO8MlVU0LvugBiU7BC00g617cI53FMr5JZgeLnQ
+MjP2tY5GBKsd4liVGx7co97otBTex9iTGLKv1wR3koE
--> ssh-ed25519 dA0vRg VSPO7NnddH57YMZfmm1/dktNLLeNzJC005UtKg1ZQQ8
+-> ssh-ed25519 dA0vRg Bm+JWggvHAUh2gwJciC+vNljgavsLjdLfl6eRGjqDkM
-cqiFWD/e4eNjX7OnWClavC1PSY9wqFpQOUN6SgW24mw
+k6UgIXDTyVpxyLH63jssdB8V1MwaYzeS4pXnm/ZaQUA
--> ssh-ed25519 5Nd93w Wm741XfokLT4GE42ZbfqEUUzuubc5jksgadaTQ4ziAk
+-> ssh-ed25519 5Nd93w Xb5zseV34mZ3rSfTqD96aAMGZi7zsE9eacaAIrHH7hQ
-N/Vbxz+C17ZZuMJ+cw7DwwrshB+iS4Ar63jki/94OPY
+8uHzgm3NuYxdOe4e5PC6g25KSgmbpws6/mx6/bnu+vY
--> ssh-ed25519 q8eJgg EqOr15ZLJs6aJsJyEOI82nM3Ywb7o16pRIrG8baEqTo
+-> ssh-ed25519 q8eJgg Q1NOLn8bvsRkglPBvXePM2OgnRJlxVrF5vgR3+fDTnM
-a2qdPY+ISpjyL0V8MA/hkltpY2JUaLVLpCHgpA+veYM
+abvDruxSUw/T7s7iJFbEmF9nxjATId0zlSwnOW4XCPs
--> ssh-ed25519 KVr8rw hust1JIIdHjZoNzoKuIEqCP0dtOzp1XugjP4++ELnms
+-> ssh-ed25519 KVr8rw F/9sikG7MFodVtYc/BQimUKo+hCnsuI5uxztGjacOAs
-UydEPSUphPtwhWZA8FThcPS0x9MyzcL3eZs24Z+Ve1c
+rVMTXo3pxKOE7DcToi93ZPoAAm2BdFDgLhFsiZXz7tE
--> ssh-ed25519 fia1eQ MnLuWkPlZ8+vW2gBOX4siYDnUTh2VpFAWtcS2LGzqFY
+-> ssh-ed25519 fia1eQ Gaf4r3oMiuPONpsr17jqFrSYgt6aK3fyGBHR/kenCys
-AqBKFG5sT5CdvAPAYhHigI/wEnbDZXd2isbMTExV+h0
+MFAsCFnmIIJv6+LJiHER0bLJyhkVTuCg4FXeqjNqqYI
--> ssh-ed25519 IzAMqA wsKTiCAsPqDZPmXjfeOXDxIJ3dgMSxTtSlguX6Eu2FA
+-> ssh-ed25519 IzAMqA sKzeU9SFlFwPw7zJHfl/u5yys4UBLrbxlTObTXEzkXg
-ac37JPjLfM4aCNKQzjG8SeRJVLol8PoyPRGpCkP7YyA
+3P3ez/1ZyWtG7NpBK95Y2dqYGge7yRtaE2S6uafRaac
---- uAyo/rbHsVU87DgE3yiEvhTUUz5GYl1PeqrQDztHIxE
+--- 7t9qRdM5F8vlbvUTqq3cj/D3KMyPvxOhXDFpg8/FLlk
-÷*çtÆ MÆ·\„×€š~^j쾞jjÜù Ù…²,1ÖžWý/¨ð)lÕ<>¿fP¤½*<2A>âÕ*ÝÆFZÛÝAçè\™ïzÁ,b‡ëÑ«ç2O~(º£šZ$ZJŽ$ÅœsMŒ|9´‡ÍûÖ¹ôŒ<C3B4>)Æ¿,×ìD¼ä¹FŒY–&ÚÀ•*ÆÅ.TÿdÅ/¾¹CV˜‘Õ+Z³ç¬SNÉêeÝåÆ{õß:¨O~¸=%$9¬×–ŠàÙTËÙ€
+ãùD‹?pô¹/¸ø¸}ß!j`§«o‹ê\î²<C3AE>j)ò+ÂHŸ¼ãk¾ûé‰Ö—Ãm0ɶBPïÎÄ°,§v@
+Ði6x´FµÊ
Ø6iÓö
˜ÆÇÞ<C387>r‹“ŒÍ~\ŽN=Æ
À¡ú=rÃi<C383>}cüÝ®&?æNÕšéõV@±¼ï|%#°H<C2B0><48>-%<1C>c¤<17>Û⪊@•ü”;©;
p$PÔéÿnh;ꓲ<E2809C>-šÃ›ºÿÏm-²<>¨ÉžKr‹H

secrets/forgejo/runners/token.age

@@ -1,19 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA g2fcL863aQ9Fyd46ou1tLRUyk+lgmaq2ebrHtsGS/2w
+-> ssh-ed25519 V1pwNA WVFiA92ZgJeUK8nqIDSgJez/RmZBN8xa0hsQURIitBI
-dnE1XFTUYBtF/JU5WKqt5hPC+uDGWS8kT/m3JBm1FqU
+3U6oEXcOzR4IvLyqxoZ9EASxy/zrLneNfC6i3jA6k7k
--> ssh-ed25519 4PzZog DPgMcSEWU2eOVSEzznG/gRrkhJzhrZvFgJeI/nzjCVQ
+-> ssh-ed25519 4PzZog KuCLxZN6OhSPX/4NAKgVEfRnFsjVVOlEglmZXTazHW4
-STlzeXPR6YRa6iQQVOuYKTtvSRmG8u7Ne/WdWtSJd9k
+SZoxI6JqY502CCvf47UdOIR03zqUD3Wq1RgJrOS6ses
--> ssh-ed25519 dA0vRg 91a3/mO9Mc8z9UXzPAHwUA+sZSvveNWMXHdKiy76jlI
+-> ssh-ed25519 dA0vRg 7x9LrBgnVx45VcEHcS8NUcoaHqzlhy9CtfQ3R2yAAn8
-sOph7DsS4uQ9lDpGSJCxUP6zz6HDQ4CCXfa5XDHShpM
+anutykjHH0r8K7ZdcByyfU8GlJr216Tu0JO2oJwYtmU
--> ssh-ed25519 5Nd93w mP1uWGQiUgBPWHV6JuCif1CtR73z/nkiGEr+9WFmjDI
+-> ssh-ed25519 5Nd93w GzzqXHBA6reqmVRgnojBcwH7OUMDXBcb0w6dSvAx8QE
-KGoT0BxUxlE9f2BPPnw10Tya2+SHfAigtSYTQwGFqlE
+h0JK3Gy+22br72YJKEMHAsFKaRhqtaEyznUTlwnSJdM
--> ssh-ed25519 q8eJgg e84g2UFFvCR0WL87MISDVeGyqS+2WJwSWx9Ei1f11gc
+-> ssh-ed25519 q8eJgg 5DHBi0TP4zOqk8gaCw6dXn/9jkDJwijOg6mgzPqQUDg
-PrlpA8SWBLskYxujLpOi/7yeUy6q0b71sFicHcS+otU
+Ck4yt4Buy79RygyADtPWyqBHO2rJBSwIsnkJ6KuslCM
--> ssh-ed25519 KVr8rw MEUHwxdpXsX5i5m7mcDLXK30Tmpznl18pE2U/ey3DVs
+-> ssh-ed25519 KVr8rw FeDC2FfZRAWfLAxVov+bjIi/SvKcsQOFmAUtAFaKkjg
-mCKEB6ZeZQRFUzaGqH8BVBNDbgHa1UocNxPjThciMh8
+WP0WhV2ri61B90R0H+xj+Cx70um24CcmyXrwk55yb/4
--> ssh-ed25519 fia1eQ 3fVdGpKBs3gsiHWQW0hj8Z7LzgvQ3CfR2d3zAczNzxQ
+-> ssh-ed25519 fia1eQ dQUiH/S8DW7X8Y/Urug17Crzv/+khFdE3oKLvvmGOHE
-xqMW2BNyTyDCT2qew5VLVi22toQ/SUnx8L3xCpWKtQM
+0CaTFR6Ccb7kSl4GW4Iy5H95+unkMcchwy4f1RawYHg
--> ssh-ed25519 yvS9bw 8hv9OFOBacjS03cT73lluCDfbQa4U4YY0Mhb/fzXhCs
+-> ssh-ed25519 CqOTGQ oR76yJX7315RPp7LTZX5lmFHf35t5G5lybvpn9PZdw4
-WoNTbQ72XUCtxxRjS+D7sBnShmmpoeQNvwqpNa1F7M0
+7qgpY3pLW0ygHl2NsezmOfMRTh91ciZ0RyfSkJuzhjY
---- 1mryHIWXt0MNzqKgZlzikiIr8pfTWZxcwtZVvI0YSJY
+--- 8B1YHPeGspJhu+TnQ72FJKAkm+t8nIMVrbrBMTUMMpM
-õ>§þT%©l殓;záä†<C3A4>²»ª/òL£–±bï<’V¥9«æç:}D6¾\0„’TuçÅØ<>ë‘í¦ã•óÚ…VÏòJ¯HmæFTÜyc
+ϨZ
+N©FÒ<1B>œdÉéx}{Ã]Û'˜k/ jt>ÃÿêU¹$Ý„¤$jŽ%XSï¡Áò-X‘±›Š@‘جï¡.ΛMû¡
Ñ,q¿æ‰d"

secrets/gitlab/pw.age

@@ -1,20 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA Og+Yx3IddAIK5EXVRkGkGQo1uLTbHIe0PqOsbc8Zhhc
+-> ssh-ed25519 V1pwNA rITnhjccFQTSCG3yY1gfUd3RFPtymz2PBBPafKqDgzk
-8cRXulCpUe0g0d9g+1Rco3KSDv9SsnZIPZpCURJLhjM
+14U+liTyDY/cPPDPLqtDzzB8VEOjT1OiQHW7ZsdqTwQ
--> ssh-ed25519 4PzZog 2QPPJ1aHcSGwDAEsZDoul0i7gNhrDUiTnTMZDIkZY28
+-> ssh-ed25519 4PzZog vQpDvof5krUhHTT3QVXpRoBglQ4xZsUVobDmmZFcsVs
-q6/hLB31d6bZBb1cyMFns5DZA1w/cWOnAfOCnSD4+w4
+/wGu8wiBV+zIP9aTDydg9B8mXwk9mhu64pHkOPlL/e8
--> ssh-ed25519 dA0vRg q3E6IEJnhmyBspbZZkN0AzULmhosvo+3DfskLI8SoiQ
+-> ssh-ed25519 dA0vRg 7PnZ7JoatOi//MWTodmrzjfJJzauh4kUO6ErGpN5rBk
-9zzEGaEQA4244oT9M7gSf+x9JR4tpRyigrUm6VtjZw8
+p8cXhiS7odlvzarQiqnrvll/RnECkZ0jPnMjuA8vgAM
--> ssh-ed25519 5Nd93w k+YFpnrg3PelZb6VkWU3jNIRbcdVefDulVcB97Ty50A
+-> ssh-ed25519 5Nd93w J5vVy6L4UjYswx0g3xVK3WVU6nwaLZwcQuTRoYJAsSA
-H9oIXUHfQmBOyrUwCD4wecdieZ9r68BKll5LiSq8gpI
+qzmRfEMcZI8P40fER+V6KfxVJXxttQpbAjChNk0k4gU
--> ssh-ed25519 q8eJgg YuI+KWmKVOb7nAxYfBcDpw8w3yAzr4zbJx9XmAosbyM
+-> ssh-ed25519 q8eJgg G1iqzNqpPeyIlOt8CelGhgC7Y09+c3W0LLoVl49vzE0
-ulG7By5LTkTwRsizDy9Dvbo0Aq9hvkR7OYg0k7x3c+4
+7Pao8KniI7QJdnMw/q0fMQrjInF0CTbfnCSL9FLJrjY
--> ssh-ed25519 KVr8rw 9rGKrg4728MIyCTvpZujfb6MerMvWAcceEVJqkrhjgI
+-> ssh-ed25519 KVr8rw FMvso907mXDbRRv1LGmrRJIo9BMQz5Swzv1ZHjh0j1o
-XwEylc2XK6IbPKa1KbnmRpxOBocaJA3u8GP75ZtDkDc
+RrqdTZsEpnWgkGvGNprnk963KMx/ShhSdvK5VOe/xNI
--> ssh-ed25519 fia1eQ 304jqcYsqS0Zv1bPBVryRtUev8LNy02Zh8X+6QiV1C0
+-> ssh-ed25519 fia1eQ 2tppsKE/FfdgBN74214/etyJhnzNSBtxWvP+OHaY3xw
-LoUFCs4oRgcUU9BIImEBY4YPa7IR16b3uU2a3fUv+nM
+feXjn9T46anxhofgwQXTn3Bj9usC9/f48I7irrtfTZE
--> ssh-ed25519 uZzB3g 6ChChOsFGTpa8ndrvfx5SEBHJJxSPyy3GDmBMwABcXw
+-> ssh-ed25519 uZzB3g 1JNZJ2MOAeOgPH+jWjNf9qi5ncEaXczIMkr54vnHITE
-c+p3NG8gHiekqiiVesAtXSInzd4PIQDsHEsnTnDcmDo
+/IWEATVkAioRB7DFiEZp7QiD3tRAX6WcyFVEZT82snM
---- hOqrvD4RR5WmtwXSZvjH2Xs14ymC0hECQIXA1vaDb54
+--- lgmy+3gc+bFhK9OPeSHJWPnjjbZgZ1GHjBGz4q+fRa4
-	æ2½§ñ±P½[cåÀÍ<C380>…žùvâ¨[Õ<>_˜a€FÍýyÐ\öÌÏPÓÒ·±«Bö;ûuµ€²rpàPk™_‰€EÜ ³ä@Í
d8%ècúÔGû¸žó”Jm2ÏE
+µ¢.Õ~68¼×@|¡5Êm¤"¬ÒŸ	N™N`›û´dÉÃ<C389>ÿãÉæx=ª:ІN%Ù0;«DƬ1¸8–tiõãfÛ¶==¬Ùj]q´Ò¨ïŠ"!¡Òð} ÛIÃvÏ—?«"‹p„améÐ\âªòiü!w~,Ж{ýŒµ·˜Dýƒ<C3BD>üçKVÄQ#Uª‚dËS³©õõêjK‚WÏ
-âìL…ÇÔ\šû§.-·<16>jqO;0Z;p¾»Ÿº`(–€M~ù¤ËõWÉæü¿ÔÎ1ªWâ¯]<LºÕ•

secrets/grafana/pw.age

@@ -1,19 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA kcb3u3/R79sZvwHPXxp1faFzYpnTUJjnDnyA3LCb7js
+-> ssh-ed25519 V1pwNA ocbo4VYNAuSMl+cwAnQox8FgSfIIL6EcjEZ2w81Ahhc
-KQaHb04I9t/ah32d09P3AW4y78EXxqlKMZegAMv0D/8
+D0lErQCzwi9TBMSd6dkqivQ6bHCZrtlkgaTjQVdfAEM
--> ssh-ed25519 4PzZog Gc9EMmfVfQVsUDv/EGwiExDWzA263KxCc81TpnF/bHs
+-> ssh-ed25519 4PzZog PpuPLWrKMhSn3VFuVe4EtbeHdIGRBPsN42jJqP6vJnc
-2QGJpcxDqQYly8tpyyq9uSCfYW/FV1tYgv+Mf/8eCik
+lHF5+sdN8B/2Iv9kxt0q7SsRm0KKmnRYOTj9tQz/aD4
--> ssh-ed25519 dA0vRg HTT5Awec53+Eg4itwGWrM8W9s3/fFdpQJbNHryN9qAo
+-> ssh-ed25519 dA0vRg 3fAA/TDGslCUZKiYHjm2qZmP2x1w/RX80mAVQD1sKlM
-SXcqmaUfjBIfgJtkqafX75wgqWOfRPIYgwH66SHH9aA
+Po0PftPgHBij9jBoj4iCRq6ARmek9ooo9ONFh3Q5kD0
--> ssh-ed25519 5Nd93w VhDrPTSM+V9lTPpizEkonGM/r5vZWF3gPA/iov4kWjg
+-> ssh-ed25519 5Nd93w lXvLkIuGZJRAvgmvd+SBay7qJizd9UUs3cM5z4Z26Vw
-Kv5UWwZr7/3r1TxFA897+OgkXkX/sSLPicBDOLhqEMU
+HSohmw9oO2IKdiH4Iu0ZuL56kjpmKJ713sLF/tty/1A
--> ssh-ed25519 q8eJgg /BpYqgnWdctlOj0NHxAASTuYRfp6cfc9OAUgNsKOykY
+-> ssh-ed25519 q8eJgg z7HYPsacyFXBnpIkRFnUSjEavyDG49fIT1VNoLGsCEQ
-ivH3zs9v8+yuzqQsLE08sAzAsd/izFH7b6ATVs5HI9w
+s56VpGW2ubBAWp5FoHrgQDZySqINJda+44xokM+Kb9k
--> ssh-ed25519 KVr8rw gTcaaJC6XYsyLyxnoP5/HdWJCAPe4EtFk6YOOmqgtAU
+-> ssh-ed25519 KVr8rw 22pOg0xxlJg13RyZqMYakteo2vw/6mjsK8ce26nqaUc
-5VUHbnghG7lwbk5xCl+q0nJtS1S5mSv6vD37NgCJAgU
+xjJHXIpWQ/Y17R5zUp1hnpIF3zdqkfJIzvgppGPMJD4
--> ssh-ed25519 fia1eQ 3U/5b8+aOACexOOqS6+EztcitIiTG40ZtwjxM8RPTAI
+-> ssh-ed25519 fia1eQ sFOx3dxfZ5uGKjqVHoW5QcwEIvHja/+uWsZrdnoQvz8
-5An4KawPz4EcrAY0EGUS83lHFOGJXKOHGSd1Cj4Pa9Q
+Kczr+yv3PEmTqDXJ3W7hn3bZ6wrpivhmkrg8fhmOcsc
--> ssh-ed25519 rmrvjw WMELHgVvy9er/V5N698UF9ZFiwaeedNsxFJ5Tlj3ZlQ
+-> ssh-ed25519 rmrvjw 9nQAeB301lCj6p2rnnumD+G3WLjMmZ4NYAY/GFLy+0k
-lw+sHWr3uHV2b22xNxnD+vSPis/iq8Xbp7XaIWG5XDo
+FfnwVEYqZ/odWg5NOeizDMCkRMLiNQBtpW7ko4pgmGg
---- +UH8vyepaxWHUviCyJ2rgJ6OcQRmBC22Z00VB7WndFE
+--- k4P7z8pNs8T/QFPUfC4E7/FjsbKzhiM26rD7YcJ39uo
-ùñ3fؿȘڪ…·‘‘¨ÇÑÐ_‰º'騠ƒ<C2A0>3<>'L¦Ü¨´beøG<€6餔)"†P„¢¨¨%?~žI£ùÕ\˜u¤
+‡ĺM¶¦ú­ŕ{$ë‡ţ´˙€lŁGţ„¦=5÷¦ü©ä‚9}qŢŻP´Á	(łwĹJßKŚcT	eß	[Aňźwň
Ą;éYďśęĐ

secrets/secrets.nix

@@ -23,7 +23,7 @@ let
   galatea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3Mke5YtaMkLvXJxJ3y7YAIEBesoJk3qJyJsnoLUWgW root@galatea";
   optimus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqYbbWy3WWtxvD96Hx+RfTx7fJPPirIEa5bOvUILi9r root@optimus";
   glados = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6go7ScvOga9vYqC5HglPfh2Nu8wQTpEKpvIZuMAZom root@glados";
-  wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEehcrWqZbTr4+do1ONE9Il/SayP0xXMvhozm845tonN root@wheatly";
+  wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPlgCGtyvd3xwYg9ZNyjTJNB/LvUSJO01SzN8PGcDLP root@wheatly";
   kitt = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPble6JA2O/Wwv0Fztl/kiV0qj+QMjS+jTTj1Sz8k9xK root@kitt";
   gir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINL2qk/e0QBqpTQ2xDjF7Cv4c92jJ53jW2fuu88hAF/u root@gir";
   neuromancer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEFAs6lBJSUBRhtZO3zGKhEIlWvqnHFGAQuQ//9FdAn6 root@neuromancer";