Merge remote-tracking branch 'origin/main' into create-pull-request/patch

2024-03-19 16:01:58 +01:00 · 2024-03-19 16:01:58 +01:00 · 8911d9be7d
commit 8911d9be7d
parent fbf51076b3 2310722115
12 changed files with 178 additions and 176 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -1,5 +1,5 @@
 keys:
-  - &lotte 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+  - &lotte age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
  - &nixos-8gb-fsn1-1 age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
  - &thinkrac age1p400545a482fma40yfgytu40p6wr5a75v4f8yeudvgf7eh5erufqxhgynr
  - &nas age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
@ -16,52 +16,44 @@ creation_rules:
          - *instance-20221213-1915
          - *vf2
          - *rainbow-resort
-        pgp:
-          - *lotte
+          - *lotte          
  - path_regex: secrets/nixos-8gb-fsn1-1\.yaml$
    key_groups:
      - age:
          - *nixos-8gb-fsn1-1
-        pgp:
          - *lotte
  - path_regex: secrets/thinkrac\.yaml$
    key_groups:
      - age:
          - *thinkrac
-        pgp:
          - *lotte
  - path_regex: secrets/nixos\.yaml$
    key_groups:
-      - pgp:
+      - age:
          - *lotte
  - path_regex: secrets/nas\.yaml$
    key_groups:
      - age:
          - *nas
-        pgp:
          - *lotte
  - path_regex: secrets/desktop\.yaml$
    key_groups:
      - age:
          - *thinkrac
          - *rainbow-resort
-        pgp:
          - *lotte
  - path_regex: secrets/instance-20221213-1915\.yaml$
    key_groups:
      - age:
          - *instance-20221213-1915
-        pgp:
          - *lotte
  - path_regex: secrets/vf2\.yaml$
    key_groups:
      - age:
          - *vf2
-        pgp:
          - *lotte
  - path_regex: secrets/rainbow-resort\.yaml$
    key_groups:
      - age:
          - *rainbow-resort
-        pgp:
          - *lotte
--- a/config/desktop.nix
+++ b/config/desktop.nix
@ -189,4 +189,5 @@ in {
  };
  programs.gamemode.enable = true;
  nixpkgs.config.permittedInsecurePackages = ["electron-26.3.0"];
+  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt;
 }
--- a/config/nas.nix
+++ b/config/nas.nix
@ -30,6 +30,7 @@
    ./services/tempo.nix
    ./services/loki.nix
    ./services/prometheus.nix
+    ./services/yiff-stash.nix
  ];

  hardware.cpu.amd.updateMicrocode = true;
--- a/config/services/yiff-stash.nix
+++ b/config/services/yiff-stash.nix
@ -0,0 +1,34 @@
+{
+  config,
+  system,
+  nix-packages,
+  ...
+}: {
+  users.users.yiffstash = {
+    group = "yiffstash";
+    isSystemUser = true;
+  };
+  users.groups.yiffstash = {};
+
+  systemd.services.yiffstash = {
+    enable = true;
+    description = "Post yiff to telegram";
+    serviceConfig = {
+      ExecStart = "${nix-packages.packages.${system}.yiffstash}";
+      User = "yiffstash";
+      Group = "yiffstash";
+      Type = "oneshot";
+    };
+  };
+  systemd.timers.yiffstash = {
+    enable = true;
+    description = "Post yiff to telegram";
+    requires = ["yiffstash.service"];
+    wantedBy = ["multi-user.target"];
+    timerConfig = {
+      OnUnitActiveSec = "30m";
+      RandomizedDelaySec = "1h";
+    };
+  };
+  sops.secrets."caroline/yiffstash/bot-token" = {};
+}
--- a/flake.lock
+++ b/flake.lock
@ -594,11 +594,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709620849,
-        "narHash": "sha256-UlHxIFILlqS/vSh+YdbXxvTlFIQ7VlxZl2YqioRzjM0=",
+        "lastModified": 1710836777,
+        "narHash": "sha256-kurSSXi+OgdZJ7wn7QibMBSQZ9U5aSOY9/yWXVZY/WU=",
        "owner": "DarkKirb",
        "repo": "nix-packages",
-        "rev": "c0e2ff99d157eca194ffe2780b1f0c96c1430af2",
+        "rev": "e60c0585e3af0d4cbc03d2494f104aa25990d5d4",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -199,6 +199,7 @@ rec {
    in
      pkgs.mkShell {
        nativeBuildInputs = with pkgs; [
+          age
          sops
          ssh-to-age
          nix-prefetch
--- a/secrets/desktop.yaml
+++ b/secrets/desktop.yaml
@ -1,54 +1,43 @@
 aws:
-    credentials: ENC[AES256_GCM,data:pF3baonFQu2CIAprzI/PRWT3BbOB5GG7dldcrj5C28DhjDXyQ8Ti2onlPGD6bvk36fdQQpfhIufrFd2J/gWHWXyDtA53kupZE8BEssaJqpLnTmLD2dwN15fyoJl5x528IY0haBCjuEk9fbD3ahc0aw==,iv:PNHTdzj6+qNBbho/lFNbE/x21km9SSvf3EJNIbDoClM=,tag:I8dtXM5IOnsSMrGpr+q4bQ==,type:str]
+    credentials: ENC[AES256_GCM,data:M/rxedIWDy9vULXljK86RhMjKrNHp6AgLvutRm1PZ4R4R+d6JYCy+rmVKW3o573LfJ9cqwXCppRQqfM6ASAlWbPc4ucRR+B114ncYfI+EgqpvvSvYDIsIA8L/OCrxltL+cI8LY+wz7XYnQOMPr1zjA==,iv:pWj2Ig8dQ6xI/pOBOhXyjzt455CnmqzhXXlQbVmg12s=,tag:VYEYdWhmAf5BUUirGvtZ0Q==,type:str]
 .config:
    gh:
-        hosts.yml: ENC[AES256_GCM,data:XyOtbPHF2TzTZArLO9OPvl4NXMj6/xZJQL+kP1FbAlBSPFLqrvPmye6N8R+809kHD2hhXpRg0k0jcjVH2Yxcf9cCd2I/KDZqXfL+Iuylr+tOjEENAg2DejQS4r5Si037eHNcN55R/Nomf+HjGRsI,iv:ppu9KJBu5e134y1KsQFNvsaSBr5nVRsc/Vb2f+hrtMA=,tag:T7uLJwsdgQOLi2Xp9DWnQQ==,type:str]
+        hosts.yml: ENC[AES256_GCM,data:epb1IX5YsuVpYFGX0w1Fr3Cf4HhgfI4f+7KPSCau/B9qeLm9Hdf/OINYGAvjEQQb70V0WV9iifrUerAc48jcw64o8X5RMX5ca5Qpm4JBoi4XynN5tr0V5p9lBzhPQ+45j6m4YWspVqc48uAlNAQ1,iv:KB1CrjbrBm3pH/3mcDyg6IpAEjtOW5FbhsX3W1kgg4c=,tag:uaMlrJ5zUgTnjkPY02YRbQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age1c96dd2hj7qg7sl8wq277q7a4na36krd4dmu50jz5mvw4ls9grcps28zhdl
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNQldpaEVWdVRraGQvdTVU
-            NmN4Mm9QVjR5SHR3QWh1OThORDF3cEJIc2xrCjBMU2NDZmpmMnFjYlNVYVRSRGlx
-            U3dOdWJydTJQRzJLWUVHd00wSUJBVzgKLS0tIEd1OGVkTFhYRHUrYkFKWEp4ek9J
-            ZzJTMU5xaEd3Yiszd3NVTE1lYm9vMGcKF10r02Mw4oL1s5u265w1x+cXR2fLK4fD
-            facGJ8oC8o/RmOeyMOfhhAitPhsumZ871i51A1ZCm3Em8gjotQ/ZFA==
-            -----END AGE ENCRYPTED FILE-----
        - recipient: age1p400545a482fma40yfgytu40p6wr5a75v4f8yeudvgf7eh5erufqxhgynr
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4SmxrMm1Lc0FWTHl6SGdt
-            aVZ0RCt1NHlxN2ErWnVmV3FncUFUV2ZnRWpRCjBUL1RiMVZ5MlJxZGJyNXpBM0Jh
-            K21CRWN4blZCaHpVbThTK1VZWVBrS2cKLS0tIGVDSCtDVnNQZE05U2VKVjJnNXQy
-            c1BpSVZicTVxcVVCZE12M2NhQmRzdlUKf4waPVRIV8Zuh4QuzmcPOJ1psHVuHGzX
-            20L6UQqs4wOlKvB5NFTEfIoGOnABwLdzyVpF1OLNKdRzlK2I8V6keA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTUDRFd1lOTXBQS0M5N2Jn
+            MGxKNU9XbzBvZ0xhVUlOM0dVelZCbmJPV1VRCnlWQlNuVDdTZXlBWWYvSDdDRnZF
+            cGlEQkpuL0JKMDdIdTlWMG1lemJvVVEKLS0tIE5lNjdxMllCRTlCdW9WTlhic1RN
+            Y0hjMWFaaEJHUGVlT1I5SXBEbXRYaVkK4lmPVd2ppH/fO88mEq5wbXWA9pKnmuMl
+            /bacVBv4PDWrW4s6CoVkr1h7qNnNCs7my87++0n2TigW1curz2IMdQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age12ermm5afdu7a3humlf5wlun5rjm33u6tvzu06l7s8u59h0qd0yxs5mgjuh
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnY0g4QXFSWmppc285ZEVL
-            eEF4NDVaYVJvdlNNeUNhYlBBTUpnb05NTGtjClg4c0FDOU1yOFNwME01RFVvYWpK
-            andBOTRFN3JGSmFxSFRCWG4zcFlVYmMKLS0tIE05N0ZZaG0xenNzbHJlTnBtSnNk
-            bEZTbC8vVnhNL1BQWEZWYXRrTm9UMzAKSfgQ1ArK/ryEeD4qLI9nLN77V7UHEpio
-            IqtZUluSwQJuH6C8OKzrZOGOTCYo3RrhTItDTzqU5b/SAAoSJkGJnQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBSUMvd3dzQ0Jvam9YUERS
+            Y3pYV3N3U3FNOUJ1ckxDQXNESzdZS2N1ZmtFCmhwOFFjWEZGK0dpd3dqVCsxY01F
+            TFdoMWxEQmdmcFE2WXhjRm5YeElLeEkKLS0tIEVFSG9WamhkYkw4ZXVKZ0JXL29n
+            aHh3QVRlamhES3g0SXhQMUNBUHhJZEUKBJkqeBxTYIEElMx8bkweNNCyVMd1xt91
+            DbDXCdxz7UdFMEb6e//j6w486NaHr/hwrVDW2SDHXrZ+UkFU1+8Ugw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-07-01T11:21:31Z"
-    mac: ENC[AES256_GCM,data:yanyvQWXf3Yj78uyhiEjdsAJdWx56/6YwnSR9knSIcQAWZ4guKEtl86wTcJZHyt7P7lsMI+z2rsGdQ/pGRIJeUoPzW0ImrGGm3rlXn75aH0jDeSk1qlxLc4dDDxwPDeSI0/QsTsENRW/Vf3/z8xiSHPUwBfDmRqTqwZ0b2vOwZc=,iv:idWdv2m7nUUZDmrNhL97BJn9Tm+fX7y2hG4RJBXffGU=,tag:ns1OrwzupAd6608pGovkrg==,type:str]
-    pgp:
-        - created_at: "2023-12-06T12:54:16Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdACsbftZkLgxiWbSGQPwgSO/JJqeQyG803rkkGUvnTbQAw
-            27+8v2JsGsSk4LEm8ZMKX0UIE9EeXgRicjZ+BeJvHYT1EvESubyhH4Y/9MrH3aCw
-            0lwBntz8MNeIE7MjweHgM7BKz9C6jBA87SXXFcb6uwH9MMUlqs7NFteDcFe71Uwm
-            4Ds+SwFg57K8RImA/qmU5ACw4NigrinRaPSqLy8zEPZNrUCLeKYgvAgeVeCLoQ==
-            =3hgf
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvV2h5bk9BQWsvdU1TT2J6
+            SE1IL29WeVBBMFpsbURnMitUWkJ2d1g2aFc4CktoaHJyeHQzZnNua01ady96eG5O
+            OEd6UkdobCswSFJROWR1ajZncUhUNXcKLS0tIG5nekhpalNiSzNObmZZSTFMZE9Y
+            MUVDUFUzaW9jYlVOUzJRVW5oN1JUU0EK6CrfrP64jQ+NHGB7g/8FOMPNGEkq1e55
+            khHaba4ke39Wgk91cGLfs7ARM1tmGCI+q5h2BW4iTLiPE5WGiv+5zw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-19T08:50:22Z"
+    mac: ENC[AES256_GCM,data:04UhuuQk7vPhjiBxlizLO8ttnn2iIQdn5jhbU/fSup+qFOkY8wwWgwHQwNpcaCI7tl26KAi9UCczckAMOBO7woJZ4yKY6NHFMAI2kDwr83c8xFqAtSNZ3BTf7SZGI+UcUm7iZS12MIbwFdDinsFD3L3H+cW7wz2Z51sRIcL/TYE=,iv:6aDY223rwCPNK5AKQhkQ/y7hsXbq9y8hBNztNeeq1fw=,tag:ksdpeuCOMth0E2kaKbfv3g==,type:str]
+    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1
--- a/secrets/instance-20221213-1915.yaml
+++ b/secrets/instance-20221213-1915.yaml
@ -46,25 +46,23 @@ sops:
        - recipient: age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMQ0FwcWJNMVBvdmtXaGR0
-            MHY4WGhSV3VPOHU5NGJJMHdQS2dUck1Gem1BClF5dVFJbHdiV2d6SjBrWEpaekVt
-            OGh2NDl1eUR6RzJWQXRzVnRiZkhnMU0KLS0tIDFLd0FZaHBCbXlIOFBES0pTdzJG
-            bVJUcDZLWTk3MiszOWp4enRRQmNsajQKF8QJs/Wb0SqnvsQEkRKlS1Ms9xLIdyvZ
-            QCFAPclaOfaTLTiRJWXjDneBkMBduYKkRPiXCR+Bn7i4z8ixLXFmWw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwL1RqQkt1WThJV2VacGpX
+            YVBhN1JEcVo4cnp6eUtSa0g4V3cxSy9ZMW0wCnRMV1cxdkdnT29BOWQ3TmZjMFNS
+            QUhZU1RWVnpVQmd3ZkJpa3BheHphWGsKLS0tIEhrQ1pzNDRQRWxPOWZZZXR0RWhT
+            T2NveWpzNE1KK005UTMraDFObm4vRXcK7IFgNgz8afznTlDLdqCKdiYN0KOVzek1
+            JzRnCpb5uq+ciggxssHJvg2/yLMA3Nq/eq09OfdQtgwcB3Trt5tIEg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnTGF5MUpSL2R6dHh0R0N5
+            QWpZM0tla1laUzdvbzE5M2szQVVoQnBIRFhRCkJBVGRKUytMZjU4a25vMWF2am1l
+            RDJmc0RWMFpMdFl5SzUxMjdnM1cvQ2MKLS0tIHhrWXRoM3p0ZG4rY09rcEd2S09i
+            c1kzdjZaSWxuSGZtRktCRzREK1U2ZEEKsDp3OpMtjOHBsF7AvWzW8vUsgh5mFK7r
+            mJBnA3ZhokcYJxO6YMFvw7UyZ3wzk+qrAo2Ni9os8+8N5yAtvp0byg==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-12-31T16:51:15Z"
    mac: ENC[AES256_GCM,data:2UrC2HkY9pRIVn3Uw664NRBjDvK2RNhpVff6M3MUyYvglJwz04dxzS7VVxqVPTAB6wo096lBGWw+pq1LYBSyqXTXaQ5eXQm5zVpZ6d8UncX3DB9sEV2zeQq5o11VS+bj70ci9P5H5mDEsLrPdqUZpdvSNxKv9aujX87PKLAxXu8=,iv:pcZDc1b8dv8uWX1dw1L1xmV87MpBq8IHaEJGrI1Ytjg=,tag:gBe84aQRbQlX+7GJMsAaXg==,type:str]
-    pgp:
-        - created_at: "2022-12-14T15:34:13Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdArAhuYjHr6oG8Ixx4Jq/05otBrbOzJp06mI0lZ4aYTCMw
-            OXL+T/KDfWLgu4m9aQNsQ1rkNDhosNbc6PhM2Pse8V46SSEnaIOkKphHvBaxkDD9
-            0l4BdWxXhMPWuF+ZAT3HLEVyhyw7OIR5CisxDXlDW1LGeUqIRdx6o9PCUX5fZtNZ
-            /hUSNIfRp0WH6KWlPn9PVPu42Tbf7rO1cvd/G6uV1D372IRMQr9E/jYT1TTKwCpZ
-            =VNtY
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/secrets/nas.yaml
+++ b/secrets/nas.yaml
@ -27,6 +27,9 @@ password:
    darkkirb: ENC[AES256_GCM,data:vmI8B7PWeoKTwOywaGmJmD9gWb09eDcmchx241XrfNvT9QseuSElDTb3OajHornt/OFBPh7EtNi/y1BHF1+DZq0i1tmhYuJy24BLuCPH9VpCb5s5xZZCVtOC6w3qUGqIlLQHYN0Fp1Ap5A==,iv:KkcLQDJSDqeFr3gDByb66MOx8/PbpKpvM9Ym+KMB3jc=,tag:wLLOU4RhWnS+DDSOQLrLHA==,type:str]
 attic:
    config.toml: ENC[AES256_GCM,data:RaMqFjd1Z8RcafXc6FgFj9pFPr+iObaW+utcZRhW6gCu+dQFgyFipUot7uoo2kncGzkDhFBHKB2o6/Aj10DbXuUM0vtZ8nnTPZgZyoPWVZdn/KYegn772Pj9AUMqRUVoI4fAnhlxOAwFocfg/lNto27VDEslS+rqpAms+mvb+1jzWQz4nZRl7uK/m++6kinRf0yJDh36eyySaC5V8iV0A3t9xmFyyUsbPYciow7SSg3YZeNOMT+hJgI2ltNl2h1fZ4KIWq8quW6Zavuc2ms3bLFZkPQyR0HdMSuSej0SspUDgfSReOMUuJ6nBbto7lRe35Enmmk7Ceg0fgtn/vz7GiumF9TsNU164MiLydnqJEaQTuf/8AsTS/wMsoJt30N5eOrz4iWc2dDQUKpy6aKWwqBrrMh/KoXmxzYjAIcTURDI/w+7UQ==,iv:lWFEhoeu+pp5/QbSuBHNMQwekbhz0SpX+auvYGgTkK0=,tag:gMbI1dY1XSRANCX2hPkmFg==,type:str]
+caroline:
+    yiffstash:
+        bot-token: ENC[AES256_GCM,data:Vm/RaBfDv35M/e39NLHkBUgXyzOuoVFMth2JDbaSX8asc3Yz3WhfmSyirE0TGg==,iv:ciHGpTyAAg1wEbkzEFWD2GKQXf3NbaD1E0i5Dsn1Lyo=,tag:slQaJrMiftrjZHNItvT2+g==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -36,25 +39,23 @@ sops:
        - recipient: age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNbzN4N043NWkySHIwckwv
-            YlNSanBhRkh1cDlxWU1zMXdHeHVkTm1LVGxjCktjNnFiQkl0NzF4cXNjcHNoeEdx
-            UE5Kb0tlUm5WUFMrSFdSV09CejZmSDAKLS0tIE1XVitnbGpuaXQxSVNKeDMwYU54
-            WnV3QWxtalIzWFdoQmpDTmJsNGdNOW8K++rFGXy0G6Gcu2gQwSP6xfXInQ/y5nh5
-            2oGp8sfOLFWnNI4SWL0ChP47K3C/9ysUHwQnUYPbRafZ/4X6cN40ZQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtWlZsZnFLZk04SzFGVmQz
+            VTdlbE5LY2g3b0p1YlptTW5OL0FPaXdEUDBJCjgwUk4zeGVPWllLTmc1ZUZWK2Nr
+            S0dNbHQvbHNZbUNPb1JDSVdabkZRZFEKLS0tIGNxM3ROZ0E1cTRTM0hRN0lPdHpk
+            SWxMNmRIeXI2MkhHUk5iUzFKQXVnUnMK4P+FLI+4Hd2bF5ELkGFr7fWlk3bK+1ot
+            B+4BgSDeb9BHxWBPHbUvi8rL/a5Zv08Q5mPHgZkwvKG3PE9t6xLCmA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-02T16:31:48Z"
-    mac: ENC[AES256_GCM,data:eO4lbMSaWa6ckngm3H0XusNnYdrqnuKpPuqdvERmlcP9s2t4N4mfJQMliChuRpCo/e3vG3wcvuY4mijuDbTJHju8roALEuLEgg9/2huP0DgyIfL91Q/NlhbH65oBFt5o0e4SaEFJv3ObOJSAg1xVgIhmLxR3jqzLqwV7qZGypSA=,iv:AGZuOhA5mKBX4I+QQcGvUZdQldyFqXdSDGAYM/T9Q7E=,tag:OrYEX/JM/8agXX2SClFMeg==,type:str]
-    pgp:
-        - created_at: "2022-04-24T10:34:20Z"
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdAsuZP7Y0MIQMGdFPZwOBICEoCpNCDI4zHVcbQrqzGQzkw
-            yxo11U3Pz0uJ3hO88mdVhE9VjhfLNPzgXlzCj/XoTtL7+kAFImSfzZ1Ep1yoVmmN
-            0l4BUTORLIuZUV7saY21RYpSsTo7/2n/5EDavY/zdQF/8EIhMkqKJrwPfE6Eqo6+
-            Zd+tBwB0uYM0LF9nClzrGMgHhCAH0BeheG34RrY6X6VDs/R7Z+MupzSWTROliSOk
-            =v4Bs
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0UnhqSHpMQ1RuckJzRnQx
+            amwxTnpaNGgyb3pHR0ZuNDZwUkdYc2dXeDFzCjRpbmUzdWl1ZmtQKzI0S2RkVkR0
+            RC90b3FLRjd4VGZORUsvUWJ0Z3hFdDQKLS0tIFM0akNLUExoZC9UemZlLy80RTZq
+            aG1HSEdxSHhqMUxuMkE2T2Z2OWlzS1UKJkdNBv8Q/DCmCcvIgXG5RPPvdGAKjd6v
+            RBxgQ6WvfPF1amnZWjiFN/QeV8bU1OvMbt4YSWjb4+obezXQEDNPuw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-19T09:06:10Z"
+    mac: ENC[AES256_GCM,data:DZ9wmg2HujaynayvrxwhIx1vqTmJp+qhcjWeMY6QIBcX0pCEXUwGS9527niylcvTXB3065RecxwPbnqfeOxHAD2smEkbw22FJDE3E2QtJXLUWJJOGxTh/ab3Dvxp+OUSdWiVq+OnhQ6eGR/VdCfRqIO3uZVbQnodO7Lg6u/d400=,iv:/zDyPmFkH1TFC0vDiV2j5JxO1xJx4J59+3DnZhGHuNg=,tag:R55LpCwZwLgyEWJUFA9WvQ==,type:str]
+    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/secrets/nixos-8gb-fsn1-1.yaml
+++ b/secrets/nixos-8gb-fsn1-1.yaml
@ -75,25 +75,23 @@ sops:
        - recipient: age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEdmkrd3hOdDN6ekJQNmJy
-            TWFqQkhlSXIwK1F2SGVCNWhkQytTUXJZMVhnCnk4MGhUZGs1SFZ2aGtncmJSSFhL
-            TnVDN08rQm4yTTRWa2lYblZKaWZyMWsKLS0tIFkyKzVkT2kyMHMwd21oUlFzZmhz
-            UDRmejBFNTVxeTF6aVFta09OS25uNXcKizOsV9EUukinCAwvpZVrk9x0aXTKQckd
-            gGfdCEU0HZXhZg+ikDFzy52+vPo8+gInjscXiXr/gGn6dJoctLqQXA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMU2Qvd010MHEvVXF4NlNh
+            OWNUbHVvaFNZZ1hCNUdNNGczTTAzYlVJR0UwCitublZRNUZydnlybnQ1UzdOQ0Z6
+            ZXg4cXNHRnJnY3pDclNnbCsxOWRmTHcKLS0tIDFJc0FBdXpxQnhmZVROc3dhNnN5
+            RlVScU1qdkU5YlYrY3psVmtXSDU5YVkKfxaQVuHqyHbfhcBftdsAlAqukVqgfiy4
+            jGblACwAgVomcj1FXvtAwAfOyEI+CKWRzSo2VPjrC/uLkUZgGNTn7Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoWnlDTk5VZmhXb2JkVU1o
+            dGtnNmJzbzJpRU1nMkpkUkhEWkZpMHN3VFdrCkRQc01PN1lFcmt1S0dyZFRFaVRn
+            VmpiM1VaNkJrcGNTUnA2TGk3QjBOLzQKLS0tIGMrRXQwajZMM0NtL25ZS1NUVUZB
+            M0tUV1E2dndCTXRsOVJBU2ZNVHRFS2MKhBezoPFc0mdXassxViUfsmFTQCVbP1Js
+            bEpByfdW69GUCjR0HmcjF3NX/Cd5N5uivy+yLp3IrincHAz8LBIXyw==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-12-31T16:50:47Z"
    mac: ENC[AES256_GCM,data:KvsKP4Kt/6p7ECRq3+YU4pl0lR5Chz0UJN9ltR61ne448xpFSu3YpkgnJM3afxOuemdevqY6FogFd/jP0EM8vsrw6HhunmP+696/khWg2Otm7D6mpINRNikGGiddl3JFCfdUXKPiKLGTCRzOca+Jd+BHJQH7hmQ/bwDFRInE1gs=,iv:KNvyMf4OQvR7acIIm6sHrAk7rXxXYonlCZZwYyRnJn8=,tag:sP89erBrtF29C8W8Lxe3TA==,type:str]
-    pgp:
-        - created_at: "2023-02-18T08:54:32Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdAYkKlRtvgfeYMft05Pw6V9ErK0jWGtY4FdF752m0pfjgw
-            Ej+1IeVVJuZ7WTkB+Iu/R1VzxkzAMK0Pj/rHLOi0un3h9gMuU306FGzjeZhr1IBG
-            0l4BZigJkZf+VCu+DkdLnyyZMfa42R4dWl9U3V/bkLBF/n6rzcz8ybKTdyzImTUm
-            FjFq8Czt0iIFFHxK6Qgm4O1+sTFilC6JCaJyLDn1fLdLBlle0fjM1phnQRFqL/Vg
-            =CIpe
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/secrets/rainbow-resort.yaml
+++ b/secrets/rainbow-resort.yaml
@ -16,25 +16,23 @@ sops:
        - recipient: age12ermm5afdu7a3humlf5wlun5rjm33u6tvzu06l7s8u59h0qd0yxs5mgjuh
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4dDlwckJVbkU5QVZPbXJm
-            c1lpSTFDRmNWaVRqZkZyWk53TWJ3WVBBVFRrCkVWcnlXV0pkNXlvaDRIYUs4NUVl
-            QktiSnVlSWQ3a3VGeDNoZHdMOGdxY0UKLS0tIGxSSSt6OXRpdUJidlBlM1NCdW1Y
-            RGFCVVBLc3hwS1JnZWhVZ01HMEUxQ2cKz0bEhJuK0pTginAQLAG/Qzr3MxplHtsx
-            tQbqJwbmIGanbWMxO2Mfe81qwgAzKuFt/JYT/Dp0VxIokyk7KEueMQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRU0E2NG5CRzZUSTk4RVF4
+            d1BQVkFxdXBEazhqclNqM2hQUU5hR1pETFF3CjA4S2lBa2dsbUNmVGN1R05NRE1H
+            dW5tTXdvOXFlTElPemhaWWZEZWJSRzgKLS0tIFBhZERkRkJPL3hwdFF2cUNYRGxX
+            S3owY1pyekRQWGlBZnd1YXVGZ0FIWDgKDXikF3m5S6CPqLDUgMwy50HJAG0AoDz0
+            DXVVkhXSqofQN5rdIagx9oGAnLvfJz2Ko6HusIN0nXRObmZIRMLBoA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDVDNnOG5yTHNsSEh3YUFT
+            dndFT3Z6TmpHL1NtWklqV3gwVHJKTjZWSWh3CkZFL0ovTGN1UGhIUmhPL1dpc2Za
+            VVlSUm5xOVpISC8xMFBSc1FJdGx4NG8KLS0tIC96VklUdTVFUVo4cDMvc1djVEN4
+            RDdmVGpaNVY2bFEwRjJxeThrUTliczgKRkf/defyjmUpnxdF+ZodQ8CkKY9v2OXT
+            odqUnqPWyAqkZUKS5WkBp7q+arhwDgQmW+w7ExofjJeB/SQMEJs9aw==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-12-06T12:55:55Z"
    mac: ENC[AES256_GCM,data:DpdvYGNexaRCcy2Vdvj5u4EpYdbMJXzZW6qOx4bgMnhJyH9pkU5ZtbKH4DMDAiY+4uI8mx2TcW8t40+pW43Pag7IXGeX0en00aeygnLYLHtTsSgEn1/26nrCu0o/sLqLYP5mrj7OUYUoaYBUaqjXn0MVpBuN9L5weiZvqruMjFg=,iv:i7U+Pia6QLVccv6SupYfssDHl51k1o4tHCsYohfUR34=,tag:/MZDc8WRRLmid2yd7Js3tw==,type:str]
-    pgp:
-        - created_at: "2023-12-06T12:55:39Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdASM6Ctv5DiKZC2o9BoyjLHPp4C/XZTRTLVZ77hcPV1wEw
-            2egg59Gu4iU3v33LqyMdo8imytfADHT3FvbU8+Cx96CHBhsZ2MJF6SN0rhrXcJNo
-            0lwBe7Xb4k/IBN/XAixZVa0fTkYTXq40blAWIHDGq+UYkHFosleqtDbSB4B3db2S
-            TGPP4nryvaoeG3y+50M+qGkOYf+VWR4clmSJOnSYZyHXzsnhBS0KHgLRN4Z+nQ==
-            =uNYU
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/secrets/shared.yaml
+++ b/secrets/shared.yaml
@ -1,8 +1,8 @@
 aws:
-    credentials: ENC[AES256_GCM,data:/I+mc7fHdztMu9ixDz+LBq/rR7xOni9e7ODoCEStsU/VwuwnelyedeD0OAIQsLozxP1Jss972Uq9K3RfT6HzHLEMZebjyiVGGN7wpWFpdjE4ZQtFAGpTd46vSSQn4K53DDIKO/S8zpuNw52cnHPqCg==,iv:5VaIfB94Jm3/z8RB+4+kGuRco/WncJ7Uo1qS/Xi3+BE=,tag:pyoLebONcWWAKp1OliqFUw==,type:str]
+    credentials: ENC[AES256_GCM,data:0WIbOiAsbSsunqvrQ5yj4TPQn9OYhlLaEUgTxCVNM41qVfYdY4PaA8Fe+K5XxY1Bj3HntBxh6THO/kptaQ/tPBA/v8qhsh4W58A1qP50c40XnuPIQ3000zL18bzCa1lJODaUpuZtE5XkrRXw9qag6A==,iv:AkmymudhWe2cEH3K4fcQULRZR4623qx6Qzqxh8RpZjw=,tag:5FM11uD6YJMT0kFANpdVmQ==,type:str]
 ssh:
-    builder_id_ed25519: ENC[AES256_GCM,data:aRcRkZS9TXsFas1xz044OECF59bQMepukSQUMFr652MXsW99O9ANuhQ7C2i3HuXtDjrWKfgrsrWQh0R41JuLoENEEd0O0y1k+uHzjtdE0CrzqIdRFwRNUbvrJ4D8S1yEdNoQCjrznvH5pegLpn8h19BQaC755QfkKxhYHQpN0Xkt5JKgZBEYShkEyTn7EhgjRMyKQzQo47TsYBU7S4qi6a4nhjv67MuIZ2Y7R2F5n8ZyFgGjgktcm0GHKq37xvFcFEa4h+vxhzu5Dtb6VfwYqUVApL1C2zv9hhZpx5sBa2/fvEg5awm9cnfnfipFUe1ceEz9zUbZAd4fUKYDvfHC+3KX1CXGauA44nXNz2XDDn3f6DTh/DrbARx4Fi9R5Gcnm8c0OfDxHEgARYIWdjfnf1h1qhTxf9Iau+bYTc7IhlenS/6S8w56XtScVkg/VVQhXZFQy0TFIWe/Sa8k1ArTok0I5Hl31gpCq1HUVkXNO/917RVDhJt42pIEA7Lwd48QXSkmRx+46F3VKjQEC0qj/VRNhd8ZHU66IdxG,iv:6YG9KmaDnwHEe14Rx9SlkFxg+u1w7F98yN17rg3ebe4=,tag:4PbNcBDCh9yloSij/ajBqQ==,type:str]
-tailscale: ENC[AES256_GCM,data:OUbgLSvG3VokdF7zcZrun7KNSU0RJwLJeLDSDz4yutFJWIpgMH9vpMl4NsEXPbzNkEvi2ElmQ5Qz,iv:1NmaEp6FnzKc9Y+X66heZGqs4eg1NhAFn9RyutdTfx8=,tag:ec2iD4PHJQtbnXV3rCzoGQ==,type:str]
+    builder_id_ed25519: ENC[AES256_GCM,data:RLRS/BGrfl2BfcyV+o+rbHR5YPw4ImkOsGluFA9InKuI6yjH4JMVwIB4BNJ/cDlbkgkPe5qe1PylQlxFxKOX98ilDIwH4rQYiWEgJadMH0MjALp5Vfs6T0n9qMXCT6DS0ZleI6IaoaHwv9oXSKlsPp+TTZJ7g2nNVzL5+K2QYRZDS9WHr4vxxZK9kZk777/WGbCz2aQU5cO4DZwNa9pdKx06UGDpq9inFZ1/Fbf3otqpeILC+ZYEm7L+JhjWTGE4zk41JXU/bun/pnnvcpdklhHwQA8BycpyZJzmUaUCYyGPKGsvDytOKLJZj77HMY1azKcwodoaulzs9ivdU5S1sTJ3/SiaOwBjxzZSQKBZt7gncE62zGvYRBzFWp6ZRR+9i6JtYfyM33SCgdq6XuqZc+cT5R2EmQy17APHIwY8SsD4UhOMvSrQ3URzaPKY57Y3RmjqXld8jSkah+NoxXUm0kX2aCqVSXlXZk1gVHLdgsS0umwjIvHSEzBN0PRByIqS9eYPSfoQF+ONSLmh0u/xVmqdZy5Tmfh+SqRe,iv:VdyPX+tE7dKzINo5YWsCtyGrgB1aqK68ta18+xrlO3Q=,tag:SS99x35079rPWyJAbiIiFQ==,type:str]
+tailscale: ENC[AES256_GCM,data:JFARXOi1Fqz/L/mS8PPPntUVBnJmxUb0EzBmrxWT2G0jwXofHQ0o7HnBVFDsidpzGcMvBXUvSJSm,iv:Q8zv0AacXfL5xazX5fnTX2KlSyLiwa1A3s8aivOK/Rk=,tag:nIn/t6iosXtmEAQmpw4ZAg==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -12,79 +12,68 @@ sops:
        - recipient: age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArQzBRSWdKUDBRZVBrS01r
-            SUVBbmFaUWtwNkVnRnBTcHltTEUrQU5jT1NzCm8xRERUNmdKNVdWc0RDL09RMkl0
-            Znp1S21IbEcxZEFPSkprd1VWSXZyUFkKLS0tIE9oSmp1ZHJkeWpQL0hPVXRDOU0z
-            T1pNRHRpaFF2dGE5M3FMU2hkeFhmbFEK+SK14kw5i9d+S0XHzlgfS3ubN/PDMbh/
-            IqAd+1p7iOJkCRKecGxSUL9CX71t21fcbXoo0hVlYjgxzvzAK231Eg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1c96dd2hj7qg7sl8wq277q7a4na36krd4dmu50jz5mvw4ls9grcps28zhdl
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLWkVDSmNGNkJyeEJOdHQ5
-            QkNja2Z2VGxwSWcwSWJ3NlZYOE9NK0VvWkJJCm8xYWc5MWM4MmxUMmNZT2xuRXd1
-            WmV1RW1Dd2puaUkzZG9XcFNXT0EvRVUKLS0tIGpEam96WU9tMzRPT3NucitESlJo
-            UDczaDdVVnA3MnFscVJFd2RqZlUyUVEK7rBeElH5BaqqoHLTao4o/iTLsB7TLVwO
-            quAtMJ9i7q1l8cmHkmMIOSZtcA6ZUSIEygk9nUJOPdFMLSTdRD7NBg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLUEtjQWEvNm9zRGhNa3hG
+            cldZVzlwdEVYYUpnQ2ZnQmZYVWRIWFBvdFVZClBacjQyVi90eTFWbEdpSGFEcDZn
+            WlV4VFhoUStEMmh3VDk0cFZNczZTWHMKLS0tIDlkWUd6d1R6ZFM4OVlVYlVyc2RY
+            M2FnQ1F3SGpVbjBPM1dyU0o3SmtHdG8K7Bt0Cht1h3y9oO3wuWNpFTFQf0LjKqjZ
+            LiAOYjn59fszhiI36v6ISOSLKqtJSEEGAV8xGhbGLeFndySXvj4PNA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1p400545a482fma40yfgytu40p6wr5a75v4f8yeudvgf7eh5erufqxhgynr
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQOGYyT1pDcVdPOWtMOUIw
-            eCtWZFRlZndwWmxTdjY0UkdyYW9ObFUvTWxFCmdJSHRSYVV4YXRRVGliWm9SUHVW
-            b042a3JEcjRiQVViUmw2T1plRXJtdHcKLS0tIG5LbSt3YndkaHcrUkVoOGZORmY3
-            NlVad3ZYRFcrdjV0RW95eW1NTG1FRDQKPiq+H7jcjMztetSll+TwSi22fuqIERDs
-            50XHR+GMkELSsDbUHKZ5Zw6bLLm5TCeB7uUTt6ntEbejk5Bl+aXxqA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6bWNzcDlBa2ZwUVhOT3pl
+            cy9HbW04NElGK2JqQzBUQ1NRVkxvV1hKR3ljCml3M1hHSmJEcGtLQWk1OTNGdXM4
+            eWkyblJGUWpITDBCYkUyZW9PQ3dUcXcKLS0tIEp5RzJIOHpTK3JDVHdCaWd4THg4
+            ekVPT2ZVcFltMXVCaXBnbE84Q2MrTEUKCMRFwELVx/ooguUU9pAAs1H7BeLhZdpD
+            I/OiN5wFW9v5NTGnDlcJObeJ35Wd0T/ISqgLzd3NBD0ORzLGYODCGQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnZUNmbklSRm80MjVjWDNt
-            WFI0V25GZUwrQVVkTGVyUFN3SzJuN2V4NGc0ClN5aDBFaUFQN3FvcG1uUDRkYmxw
-            a29YSjROcG9KRVc4bUlBMmF1blRITUUKLS0tIDRoWWM2V0lmUmtuYjdlQ3Y3V0Vj
-            UGJGdEE4cy9NaTVaRTVYL1FTS3ZONWMKdRy0fGqKWIrOkjn9riUJJ64hm5SOv8B8
-            W7z6p6y6eFWYmDe7DUoRnJfOml0OQrgymI4+P2JyaTSfNqwSMatn+g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTmFaYmd3R1M2MENQK25L
+            SWVFaW9YdGxHWll4dG5aa0M4Ty81dy9FV1ZBClVCeGdrU01VanBZV1hYd1lqQ1BU
+            a0xPRFZSUHc0QXlRemhuckFiTW1CUDAKLS0tIDY0aDFSMXR1QzcwZzBqVVZ5Sjd0
+            SDd0czZIRU5WUXc3Y2Ztc1B4djZHcEkKY1z8P91GHbw80fGRha3sJaoPW+Q0bJXx
+            jjaRa9BaRCU9HqTtfcXWcK2fU5qnr7AhQBF3K3Ou30YvVFhKytPvEQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTWnJQNnhpck1SOTh6OHQ4
-            azR0RHJWVUdaMXIyQ2VFbjFvZ2plZHBSM0NVCnFDMkh5dlBWdExmUzB2YzdmVmVJ
-            aFdXTmV6aHFLNHg0OTFlWkNteDFYRkUKLS0tIE1VUytzMEpwZmtLbDM0a0JBRWpI
-            QTFEWk1FZU5ENDF3dFQ3VWpubGpRNkEK901SZzfkueJG99+gVqcfeU6ZaErtEXUj
-            HfGWzLliI3LmIxoTNBZwF3bhG5MM9mGy7zKburoSAtHLVyOu1xAexg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxWkpxdEhrQ0NHTERmeDBZ
+            RnZCUjl4dzAwUW0zOW8yVXMvV0FURDF0KzJRCnl4eWNFVEIxSytBZEw3L2pid0dG
+            WlpBenpGRjZwQ2YrRVZMY1NJNzhKOWMKLS0tIDh6U1hQRGFHbFY1bjBmTUlDUXE2
+            TEZSbHlhcTJrMFNwYzh2cEUzZG12TjAK9IOXaEnyPLrscovwHDo2pfCCYB+SuaBl
+            lmIrwxiej10BvjhOsfyssyxfrpNDa2tvPlJaixKPOmIJ9fCtnVZv2Q==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1gtezxkkfhpkv788x9dek6s6s342n9tkl40zvsa48m9a7yqn25fnsmd3wy0
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPakJPcXR3amE5SE50VUxa
-            WDNzWGd4R2NQQ1BUOUZMenRlNWtlYnFwSUJBCnZHUjRVR1hkcGlROTJNY2xGc1hI
-            Q1lLL0FucHJUeGVBOWh0RlY0L0hMUUEKLS0tIDVoMmltVXhBeW9CK3FBNEZPaEJv
-            bXRnMGVVTXZpTGVmcElIaFRpM0oyRW8KIExU6g3zrDxc8wl5pBuo1T2ygK7XOrd5
-            lJsjCdFo5gAyIPUeR3q78KtZ146OhhFeZxk1zgf5NeDOBSZB2zWvRw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3RjlxRDczMStnZC8zcnFX
+            NjN3SDRuZmdhVm1NZ0hwanBoMXhOQWoxNmk4CjlGK0lhbmswTmh5NXI4ei9LZkVx
+            d1h4NEZSNXNiTjk2d1l4U1lHTlFWRjAKLS0tIFN4RHZUYi9RODVxaDNBTUtTWkZI
+            MHR6Z1FMZ3h1a1Z0Rm5HU1l0NVRJYUEKTS7dhBlcDnjwUZaJRLiiDttxQaQk/jX8
+            1chJfkdanu+LI09UxNZmXlAtYYi9jIkFRQe8tyk+Dwi02ROSSBY+XA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age12ermm5afdu7a3humlf5wlun5rjm33u6tvzu06l7s8u59h0qd0yxs5mgjuh
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4aXRlWDRraWk2WWVCdXIy
-            N3A0Y21BRXphQmVZcklHQnpOd3ljQysvT0VRCnBDVXNGeWZMTjZ6Wm9rUkVXaDl5
-            czJTdEtCWmE4Q2ozZkt5VFduQ3JlbncKLS0tIEpKTHJxUWdWQis0TlFsMi9HbkhO
-            MS94TGU2MHRFN3didk15SXBodkEvK0EKkeehekFssls4ZX+n41auDjRL0imXYaCH
-            z0Qtc5QCbXh8BOU+OOZx3BoguIImRpgMp/AQ5MMUgvLok78Qw5Oy9Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWOEI3MURWVnN4azZjeTNY
+            NjVmNS8xellPWkpzenhuZUZ3MDVXRTE3bjFBClFHV05WRHU3S0M3TVYzd1ZxUEdS
+            VENISHhuNk9aT3ZOMGxyUndHV0NoUGMKLS0tIHEyQ2RFS0pwdDh4Ri9LY3luSHRj
+            QmMwT08vaUNvVFNUVlJqZHBRaDZRTG8KeTCHQW3KZJApDxJ9G/c69e0eh0m4xQp0
+            VVSbfl4b8f/bHLsOZpUwdeN/AZCVcy6qNhDaeZBBuh4dpiyYiRRgLQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-07-06T09:11:09Z"
-    mac: ENC[AES256_GCM,data:XujFjvx73/z+hmk4f4tRRvwl/ML25YOZw6etr0P9lhcXlYPelIrqvVLO1vmobt8TYDzngAHdHSNNlhInw00KO73luOLcQhL/1DVMqTgeMSC11ReUhd5KOZLVXOSP0+8ADLXgbGGGY8DyPnZtr1ZWa3dDIBFPt5ZD7RzWz1qKnJ4=,iv:kYPLpSrLEu9pkWw0iwqKmH6Mm8sFjAstr06mcAWnUEU=,tag:NQjXV8sHUrjU//AQJ+4E+Q==,type:str]
-    pgp:
-        - created_at: "2023-12-06T12:54:02Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdAWK9o2S/9tr0iwwu3nntRyob1qNOEzwv5IW/n8hlonxww
-            rn3js0kRalvmUBnJLDMfmN6qKMN9jJGkLpsUwQ3dCPNI+ksGeHSmTyhhQLFpAvTN
-            0l4B2pRmouH+fvvud86etK1uar5h5LUJ3lnGb+h84/cUEaUKeQ5LCo0dpLmevduM
-            8CFHrQoyovCMwv8C/wTs6UJROHxaFw2hyCvMUagrGlAkDagWekN9O59UOwXQawgF
-            =Ituw
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBheDduNkVaZlR3bmJJYW53
+            ZkVuR1dBRVd2cUUyRWpNbTgxS2p6L0FjN0Y0CmRTekErMWVyNkZHcU8yTDk1NVh0
+            STBHVnVXcXZROERPaWJjT0VCQm5RamMKLS0tIGl4enVTZ1h1SUE1WXY4NXNXdVo4
+            STg5bVh6cm1xZGwrZXl1UnV3QjhoSEEK0wNe+mFonDzJW51wEToitnS7rgnGiyGp
+            HiA1rKvJDwbleAYKh0r07RxE549bEH4IezJCNViv9Pi47xmKWUmQHA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-19T08:50:49Z"
+    mac: ENC[AES256_GCM,data:z2HFbYz43i9nrFlzHRArU5r7IpdLpc3osopWU6HAN8JIel3X4/tIstbE4bcQUKUuB60fWWlrl9+X1LdbnKbm1Qb2Yx3V/JOjZE9h+hTbVwxicORBGdtHRrrI+7AXVx+vb3XnhJt50esuyedv48R6Fh2UWIo5+sxmQNweryS+hPQ=,iv:IwOjhSUOC7ok+4el+KXLimeMMbfT+YW5pnXmCUppVT4=,tag:3VxWrUPP9w/SZaxU0UKAnA==,type:str]
+    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1