reinstall nutty-noon

2023-07-01 12:21:45 +01:00 · 2023-07-01 12:21:45 +01:00 · fbdeb04ffc
commit fbdeb04ffc
parent 755c3bd24b
6 changed files with 103 additions and 101 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -1,7 +1,7 @@
 keys:
  - &lotte 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
  - &nixos-8gb-fsn1-1 age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
-  - &nutty-noon age1py6eyelfttya52wc2v2ar7fx5htr5jw6snl4shx98sw8nuaw2pesyhseul
+  - &nutty-noon age1zyey9d6j3lps205whlx57wxpu4j9xxytjsztgt5keamfjrxlgc0s0h6qf3
  - &thinkrac age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
  - &nas age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
  - &instance-20221213-1915 age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
--- a/config/installer.nix
+++ b/config/installer.nix
@ -6,12 +6,13 @@
 }: {
  imports = [
    "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
+    ../modules/bcachefs.nix
  ];
  networking.wireguard.interfaces."wg0".ips = [
    "fd0d:a262:1fa6:e621:6ec2:1e4e:ce7f:d2af/64"
  ];
  boot.supportedFilesystems = lib.mkForce ["bcachefs" "vfat"];
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_testing_bcachefs;
+  boot.kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.linux-bcachefs);
  networking.hostId = "8425e349";
  nix.settings.post-build-hook = lib.mkForce "true";
 }
--- a/config/netboot.nix
+++ b/config/netboot.nix
@ -6,12 +6,13 @@
 }: {
  imports = [
    "${nixpkgs}/nixos/modules/installer/netboot/netboot-base.nix"
+    ../modules/bcachefs.nix
  ];
  networking.wireguard.interfaces."wg0".ips = [
    "fd0d:a262:1fa6:e621:6ec2:1e4e:ce7f:d2af/64"
  ];
  boot.supportedFilesystems = lib.mkForce ["bcachefs" "vfat"];
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_testing_bcachefs;
+  boot.kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.linux-bcachefs);
  networking.hostId = "8425e349";
  nix.settings.post-build-hook = lib.mkForce "true";
 }
--- a/secrets/desktop.yaml
+++ b/secrets/desktop.yaml
@ -1,53 +1,53 @@
 aws:
-    credentials: ENC[AES256_GCM,data:zjf0m72LKk3zfSakhQuoWNO1aGSjAkXuTBP3c9OZdrlc0vKFDGDlFIqDOjlJQvN8320S/wtotfireAbjVV4rOhbsN68V7qunk6PtaD5etVJy5zQIHOWsO1GYHfKxuG7s7Oic32dl07Rl/gUe0Unbng==,iv:PNHTdzj6+qNBbho/lFNbE/x21km9SSvf3EJNIbDoClM=,tag:4gi1JUyvZ+1YBS3DR4039w==,type:str]
+    credentials: ENC[AES256_GCM,data:pF3baonFQu2CIAprzI/PRWT3BbOB5GG7dldcrj5C28DhjDXyQ8Ti2onlPGD6bvk36fdQQpfhIufrFd2J/gWHWXyDtA53kupZE8BEssaJqpLnTmLD2dwN15fyoJl5x528IY0haBCjuEk9fbD3ahc0aw==,iv:PNHTdzj6+qNBbho/lFNbE/x21km9SSvf3EJNIbDoClM=,tag:I8dtXM5IOnsSMrGpr+q4bQ==,type:str]
 .config:
    gh:
-        hosts.yml: ENC[AES256_GCM,data:zUhMo32GB84Ys1KhrsvkInXLp1Zci2SOlPeX/YFsnoLHXe5Tnd2N7vd0L3ExP68f5Aj0wMBswMe8AoyUp2wuzf7a4T3NiKWO1zbcWteVrxzop4bu9Wu6LVCk5IYvMQtPMGnaYkK0ttCQRC8mZVYU,iv:ppu9KJBu5e134y1KsQFNvsaSBr5nVRsc/Vb2f+hrtMA=,tag:ztCPveYgxbZYJCBEJBArhA==,type:str]
+        hosts.yml: ENC[AES256_GCM,data:XyOtbPHF2TzTZArLO9OPvl4NXMj6/xZJQL+kP1FbAlBSPFLqrvPmye6N8R+809kHD2hhXpRg0k0jcjVH2Yxcf9cCd2I/KDZqXfL+Iuylr+tOjEENAg2DejQS4r5Si037eHNcN55R/Nomf+HjGRsI,iv:ppu9KJBu5e134y1KsQFNvsaSBr5nVRsc/Vb2f+hrtMA=,tag:T7uLJwsdgQOLi2Xp9DWnQQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age1py6eyelfttya52wc2v2ar7fx5htr5jw6snl4shx98sw8nuaw2pesyhseul
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsbDBuaTZZanlKcjFiZjNp
-            RDd1RTYzMTJYTGZZbFhnOWNvRnI2WkprcDJrCk55eS9qTUVIeU9seWhxQjFyR2ZH
-            M2Rlam1iS2tzSGlaSGRFcmdMMjZvdk0KLS0tIDRkdmlsOEhJRXl0NUVmMCtDV0VS
-            c0V0NFFJN1diNDBEZVF1NVRYb1FSQzAKJGOgzFIt8XVwjzCsRhH2m+UwIdheHLmL
-            6PgakO3mRN6eiyjGxvA+7wTT6Rn/npLA1rPqSihmnXlqYgFO9fk9og==
-            -----END AGE ENCRYPTED FILE-----
        - recipient: age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMd0lpWVJzbnpZUFAxc09z
-            bUFrSnVtakFHbENVbVlreUxJMmFRV1dxeFhjCkR1MlRtbitvMFUrWVdPeUtKOER1
-            L2VhRFcvR1BlbzFraCtZWlV2YVJDZ3MKLS0tIEkrcjVsaGVmOWlqd3BSazh0TE9q
-            dnZ4amlrMXk5MEJMT0l3YXJIM0hhcHMKHQDSokpaUcZUPKV2gsQapFrnhvR6JLXo
-            2bXt3od+VV/rONnN7als4svfI400ALdBkkb1w9ALEuTbiSNjPYNiyA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRRGxBY1pSR1UyajNyWXpO
+            SmM0REQ0cXZFaWEzemFlYVp6WndmK2pVNjJBCk5tUENZVkVPVG81dE52b0NKa2Iw
+            RTJWTi80YXYwM2t5MjRZYTdWcktWWDAKLS0tIEFCbXg3Rmc3dWswRVRETlUxc01k
+            cjQrcFdJQys0Vyt5Skd1U3JXNCtjWE0KTkB8QRpgg4mtSGM+W53AfRfU5Rc5Pz/w
+            1r/ZtlMuzN05ZTnIf6P6SAtfNdwKyzJFSFZ9U6xlxvC4wYuQPkrsSg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGYVVQUktra3N6bkZ3YkN2
-            QTlDanJjT1hqOFVlckF3bCtabWVWbG5UQ2pRCk9NWmRwVGlocDdsMlhzQ0E1YXNl
-            QllnZ1dPeUcxYVFsTG5GMFA3d25rR1EKLS0tIDh0UHlWaGpiMlQxT0ZWRllyTHQ1
-            TWl1REw4VXdZdy9MZ2hOdGNaZElqa1EKY2OmuzfUl9qXpswRMozR0JPvXfUgarrr
-            i+ZlbZGN0gV4TQzMwokU8T4BxmRPC3Zj1+Nm7235ThjRIKI73rl2tg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzTXNLWHlCcldiNnlwU0JS
+            SURkN3NTVXY0UkJEMlA0OG9JQSs1MEZmWEZnClJvVE01WEJ1emVSVWVZL2NMNUIx
+            c3ZhYi9qSDUvRTVOSmtZQ2dSMk5BN0EKLS0tIGY1MUtBSWFTbmRpcGlLOWVnTXA4
+            Q2QwRERuVmx0YWFIWFhnaGx5UVV2cXcKgdtgpkkDf6bfBHDUgeO1TxSE7dZC7tpG
+            wYlmer2IobZrngDkp81/KYP+69SxnibBvmsGHqZTkPZxJoQiK4tK3g==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-02-18T08:55:52Z"
-    mac: ENC[AES256_GCM,data:h8NhhFlM8T+Ux98jcKV2SOCAfLM6JGrz7zaK6Rf9FpT1cJPa5Z/6nV67Ccp53J0gDvlnXgBrlawekUb/Tq9Df5C79btu2Rp0Jric9kEhdI3LHcG+Pg5N0re1VgBFC8ypcJdC/5+g/8Fz7gMAj9Tq7leW8kIR3WH11xXBHqg2bKI=,iv:1PJrHIOnTXViaEM1k1kqJ3/1Uu7F5Hv81/iTnS9L2VY=,tag:zlPFK6n7aAa30guF4DEEwg==,type:str]
+        - recipient: age1zyey9d6j3lps205whlx57wxpu4j9xxytjsztgt5keamfjrxlgc0s0h6qf3
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOTithMVJBQUptNE5FQmhB
+            UGViQkE0dkhCQk8rT1oyY2lUMjlUaDhNb0E4CkFDTGhhbEE1VWlUUFRXRm9XRjNq
+            N3hrdlU2RldjZ1RUcmNNaVU1NHdUcDAKLS0tIE9Nd3NnOTgwNTE1QlBJTk9BY0VQ
+            OXdBOWc3b1ViVkNYaTkrL3RCMENnTVEKApxuZ7X0cbnpVR0IuXNVGOB3390U5MSs
+            SLqsDdQzadaRDp8VXPvx/bAlRCql+SovTT52tq+LcelZYo+T6ErP1Q==
+            -----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-03-27T16:01:10Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DAAAAAAAAAAASAQdAOThNVCDmFQeKv/7BknJoKn+8sTZsIHsK1KK9qoLNaT0w
-            J6ndScjLuNkNnNNQOLe2Cy1Lbh5vcG5jB9vMEH8w9ItgG+xVxwZHub4IFc5a6Ir+
-            0lwBuz2XuiZCDQnzRQpqGiW+K61echrfXMRsuvhuKv6dWgvJuSjitbs1vm2QINVH
-            C1FOBt2PydSPtLIj2AB/nLvxsGfKdC9IMmpLOyZ8VBLbNmcWMwd94DLJ+3xfrw==
-            =XPZz
+            hF4DAAAAAAAAAAASAQdAkco3QPt5hGrUClUW2k5DeCS0b1PmhnN2YQ4wiiJByHAw
+            3Gz7acB4XjntHVckk7GqhyFMTM5UjI+aywLOd6qArmTq0J3xdoW2ZCVF9VQcphqw
+            0lwBl1+y4HxluuToT7AeFLgz3Lr4eVIkxbpKLN9hD9uPDR74M+vC1G7nHl+EX1aK
+            UGXkcW9FqLjSzMgRZ8YeW3VUUJo7QLLM13lUlG+rm6K81KOs1BJfsHWv91Wenw==
+            =/CnL
            -----END PGP MESSAGE-----
          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
    unencrypted_suffix: _unencrypted
--- a/secrets/nutty-noon.yaml
+++ b/secrets/nutty-noon.yaml
@ -1,44 +1,44 @@
 network:
    wireguard:
-        privkey: ENC[AES256_GCM,data:342Bt0tz68AJUTAJt3TWzSbc2mVnaGBxAjAXvdQ7ms9FxzWmhmv5feoFRCc=,iv:1M2DUKdFijF/O5JdpZ1U4NGtcDwoRtCrHJO+Q4ZKI9I=,tag:Q0fnPs8uylu4PbaG5iCJQA==,type:str]
+        privkey: ENC[AES256_GCM,data:pDv2BO558YMMkcsGKAvkOWlGOl86f/6ycSlq9p+qZFF/GKk//DpKwYmhxw4=,iv:1M2DUKdFijF/O5JdpZ1U4NGtcDwoRtCrHJO+Q4ZKI9I=,tag:e6bJKwLHLOIV/h/joibykw==,type:str]
 security:
    restic:
-        password: ENC[AES256_GCM,data:THS8y3bIG+siyhQ3CwWGhMm/T5M=,iv:80GkHDErHTqlxX7Vlf5pXMFFyypJ3zUxSS9jOeBeVIQ=,tag:hIqKwbXJJU21+Fdr6rqNfw==,type:str]
+        password: ENC[AES256_GCM,data:CMCcMqHumG0aXUOIJBQ1FLfacQ4=,iv:80GkHDErHTqlxX7Vlf5pXMFFyypJ3zUxSS9jOeBeVIQ=,tag:iNL1e4R4qYHtjg0Q4msTdQ==,type:str]
 email:
-    lotte@chir.rs: ENC[AES256_GCM,data:XL7nVSDfOo5dVQ0eh44hX3saUA==,iv:PIQvTCs+Zj81pNSilbQ0r2V26swdQLRngjj1i1Tpf54=,tag:QJEE/WgkJL9AdNW9FQSwbA==,type:str]
-    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:N4EigZrst/EPoS7i9mkDWm7Yhxw7YdFw6O6MUNWo/qCNmmY6dABysNDZfK51dLKlAL6yJSVb0Qd45j/8thoyaA==,iv:7Vgu3PrjVICKikXolokRj0Hxf/R4TtaGI17yjgFx8O0=,tag:ZsYNHQREX3VzwtZwDyea8Q==,type:str]
+    lotte@chir.rs: ENC[AES256_GCM,data:c0RpF1VJtrCuryPtknymbD2+Cg==,iv:PIQvTCs+Zj81pNSilbQ0r2V26swdQLRngjj1i1Tpf54=,tag:mWuLCjE33tkkjkqELrdkPA==,type:str]
+    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:t6Vm1oLw7xWrK1SpSRIvY5X9LIjgcfMyeaplpMfl5Kn/pmOy6CMBCNeLL54PwDpfgiBEs298rom/FzPUk+ovLw==,iv:7Vgu3PrjVICKikXolokRj0Hxf/R4TtaGI17yjgFx8O0=,tag:FBGYedGRj8aJ/dISFufYLQ==,type:str]
 password:
-    root: ENC[AES256_GCM,data:Gqy/bADmjGYu24FXCaq8/HzbVBuxgLPObu1CmkGdlyLF1GFDWBEHNBjNMH5sRILblpQS2fhe040bttzV7lYHqIvoOvtAezhlKkT+6iomGKfyWADXVRTMbJ1ThR+QXwo4eCe5mZqtKn2LiQ==,iv:HueqX6JKq7HzaE7il6NCeEMWupuZrtBAP7qJBRn9xhU=,tag:bEYZg/uEEJ2qbMGYHE+Uhg==,type:str]
-    darkkirb: ENC[AES256_GCM,data:wBaK3uue/ZRKuPm/zl1C8LiXh7wu327iPeOROhocJBLeDDzUwDHRVxi/X90hvvFhJTjZ6jR+7wexEvSE/bA1Dt2Q+Cwq0RChitBjjMcF2ZRuUObr/eP6fTZLLMWqvQR5rkQrSR4ssdynnQ==,iv:fgOXGZlwDI/Im2NOXbYp37kbNxVqdXLS5PcwMQsKFVg=,tag:TIMvyKmsGba/fVVrf9jMSQ==,type:str]
+    root: ENC[AES256_GCM,data:rRfnsxW5JggchwuoCJolDBL8TpgjpEhHTVg4BD8stajxVA6WjxSWTWPWZdxTqcLtoeRUsckJNCinUAyeX+CgcygRyj5TYi1ASlNp8qsNndgPNc0cJMnyyn5JxW5pV4njOPDjBwaXGWbNJQ==,iv:HueqX6JKq7HzaE7il6NCeEMWupuZrtBAP7qJBRn9xhU=,tag:W2vhru4i1xYNzSO/+wSrlQ==,type:str]
+    darkkirb: ENC[AES256_GCM,data:9hJ2WkSXJpbv6vqV31KIwc+2ADjAgT6ILhKOI/kLLMF9yJWJWlplqsd5jpmBtbrq63sJc2UZTcAg8I+GYY/DaV4BZFqbROxdpM+YuUsguz0JOZoBnL1XmOGWknmJpTUM7OoiNun2YaFBjw==,iv:fgOXGZlwDI/Im2NOXbYp37kbNxVqdXLS5PcwMQsKFVg=,tag:GzU5407Xy68RNUli5U7WTw==,type:str]
 services:
-    woodpecker-runner: ENC[AES256_GCM,data:v7kvtZfbFATyEZ/rDnzP1EZvRKMBaXJf46xyIWu5La/hZnp7HTVxkHGw/fxMmwdwK11MAYW0dFMmUqHuKWGKCH02TwoE3UY+agOpK+ZmMKznWwgdJss+/5U=,iv:aU8WX+9/OAPQkDOnk5OUE/Xnjs6S3nUv/Dp0mTxq/8Q=,tag:+ED+PdIAOx6r5sRM3aipbw==,type:str]
+    woodpecker-runner: ENC[AES256_GCM,data:dTz5elQy8ZWbYU2NKX9R8bg0zKOv6ur+oj5tbyQ+vKN7xetxh8jc497LV17e9fr1BF93VAJJ5U/0ltoI0JSyI2WeJmSQBIMfre8kHbw70uOE5JpQ56Z1X1c=,iv:aU8WX+9/OAPQkDOnk5OUE/Xnjs6S3nUv/Dp0mTxq/8Q=,tag:6L0TohqOcBnayt5nh38oBA==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age1py6eyelfttya52wc2v2ar7fx5htr5jw6snl4shx98sw8nuaw2pesyhseul
+        - recipient: age1zyey9d6j3lps205whlx57wxpu4j9xxytjsztgt5keamfjrxlgc0s0h6qf3
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtY1c5Mk1tbVBXcHYvTGVa
-            MVJ3VnJrWXRacktsbmQzdmhqblN6dmhUWlI0CjgwUXlPRnFxT3BTRGtteXJBUFI0
-            cnM1UVNQQk90MENqSFd5a0Rmd2t3a0kKLS0tIGFsOG0yN1pma09GaFl2QnR5b3o3
-            WUpOUFNtcy9Id0NqN3ZwVzJmZW13NncKldw45j86wcwZghpPSL5frJBRAyrbh5bA
-            xoqHNpr4JflU9JavVDk4Q+nnVfOQIIu1McxwMzPpoCkcf6QX8BLstw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5STdWamZIM0ZOcWZhNXQv
+            VEJCWElDcEhVRm1EL0tjTnMyYW1KcEtCdmtVCjdIUmprZUFVY2tYQ09TTzJCWC9J
+            L3VCMEo4U0ZvK3FqR2dTTFJQYXh3elEKLS0tIE1NSGJCQjBGYThvbi9NcUI3eGpu
+            TDgraGJPUnliZ3ZQOTFvRDA3WmRiWm8KbdfQGEUDtjFfhm+dvNJibezDnutcCRoB
+            ZjOpeVdmSIxfHedCXEUCJBW4YQ0xEkrtTiiufb2nFl5SSpErtyh+wg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-05-25T07:32:48Z"
-    mac: ENC[AES256_GCM,data:mDVjudo9nLPZ2tZVa2wt+MJD3JOkPCNL7dbZdgDpOZLTQM5zLrFKQmYxuBbwZsyJXdoj+fm8+P2+yABj7oXDE8HP5sPSU6+/zx8pZ24Jurv0XjQYA8305WIWNdVEtgWNi9n2TiJ83w+HyIR1zGb0n1XFErvdJ3rbFYFNpvygNS4=,iv:WOghx+QutGA4XCQFdsMQ8iGTjmoZFLX6WIAoS6myvgQ=,tag:sLsG4jbgmStOZyINMkIhBQ==,type:str]
+    lastmodified: "2023-07-01T11:21:23Z"
+    mac: ENC[AES256_GCM,data:7xYPjpNYF77axCmkotAFWBpHeQx3Bdj540ceox5C6BJ7wace/AdWph+hdv16iytzxMSOqhOcxrCs5syB0sCIMTJ2D9eYnXnCbMTC+XD7TzazuYzZIJ+ctrwwr2wTMnPlKyHXaaO+dhleGbBAJ8AqwdIjV/lno5d4IwDUrHDoygQ=,iv:ccdy1deZ5UQfqIclEzESaJQy+kGUGmsUbbye10SYh8k=,tag:xVCnKWIAeZHaYevV+No7uw==,type:str]
    pgp:
        - created_at: "2023-02-18T08:55:29Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DAAAAAAAAAAASAQdAPW8sgnjZHEnrh2D7UCiQ34BZAnSsFbx9TIpuPhVAT3gw
-            PIAvmVIh10o1opdl1pOc2CsnmCKbCZEIRIblZp3tnbJL6pUcxRTikN1HSW1yMxVh
-            0l4BfKDsIjKjqc1V5i818pTloTxv5RYyJF5pm5Z+waKWe9wdGdG3W/IHJ13WwXOr
-            EpZ5VaHJ0wGueMpYgwh3sj/agUjYQTVKgrfW28ODJiTWgdtS5qP9eQZLJMBa276B
-            =TE4a
+            hF4DAAAAAAAAAAASAQdAqF6Ngipk9sxE9eFnfZFsJ7nGr5sUCAxByA5ZIcF0rFUw
+            jnVzPPhHMtQQVqojU+VXo89yortoTR7XKRCqDj0PfhbYxIznaRLZvKAsxKdkW146
+            0l4BOw0jEyZG959X7Uiph6/THlwN82VlWNGChns8wdURDHQ9aJCTAd+4rXWdJeJ5
+            F0rbRsqd4oGKKjHwGqVytjECMSXdmYiyNsmyuqaqbiBdD0XDQ7luFwS+jC2qYRwT
+            =PJFy
            -----END PGP MESSAGE-----
          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
    unencrypted_suffix: _unencrypted
--- a/secrets/shared.yaml
+++ b/secrets/shared.yaml
@ -1,10 +1,10 @@
 aws:
-    credentials: ENC[AES256_GCM,data:75L2G+I5995Oi5Xt8yOJGmrB/Nwhii4guwjm2qc9h9xk/wP8IRkvQr+7MUAx4NwAYiAnjl/a/tAvVclkPshcJvkJtr+LBsLv8X42PFbcuhPH9jc6cWtHWr/zN0fzsNEenQhHwV31jRggKZVLsgo6JQ==,iv:5VaIfB94Jm3/z8RB+4+kGuRco/WncJ7Uo1qS/Xi3+BE=,tag:5/yBq5w5H4n1wa4VswElzg==,type:str]
+    credentials: ENC[AES256_GCM,data:/I+mc7fHdztMu9ixDz+LBq/rR7xOni9e7ODoCEStsU/VwuwnelyedeD0OAIQsLozxP1Jss972Uq9K3RfT6HzHLEMZebjyiVGGN7wpWFpdjE4ZQtFAGpTd46vSSQn4K53DDIKO/S8zpuNw52cnHPqCg==,iv:5VaIfB94Jm3/z8RB+4+kGuRco/WncJ7Uo1qS/Xi3+BE=,tag:pyoLebONcWWAKp1OliqFUw==,type:str]
 ssh:
-    builder_id_ed25519: ENC[AES256_GCM,data:KlYgw/5TMiiyZQoP8XztlcJ6QmpSF1sPwF9Pt0DJsoRPTVPpMiXBksBh/Al9KXko6YPv/0cvF//gKIeP0Nhs9roFfgskXw56WBm/8YJ65vtxC5sR+YyP8dbA8wphEaU4e6kla0YjcBQNb3/thQFP21S+GoB7RS1osqik5Mc0p/zBMSUuXFZIooAIm3NFaEZtXbdTdxDua4ANAyDoub0F2FXe4QTOl/Lqs84Mt8HWjUqcDSFxBd68WT6iWMDcTBHHy96cER7XTiR9wJhbhR4STBL8yKjDaOFur8BjFH3qAbT39pKvVcMlFxpExDSSeI+0Mhc1PQntTLd5IC9bQcuk60vvWdssWv51Rh8REr3LG5eFcMTgpTal0mTXkC0D1bw1rF8i5O6lbKOJjLfG6w9um/LDKc4UiPhJ4Ee5UYmpVXpO+5qnknjUAPJC+nWvxPxibxE6YktjnlmW48BGu5ysVHV0SYGhu8PEStchnaoWCiklENLWNNfGf189mMsOZU8m3frUgiW83mAO2uGNkATIucLLXgfetzpIG+JV,iv:6YG9KmaDnwHEe14Rx9SlkFxg+u1w7F98yN17rg3ebe4=,tag:f6dynbV0/T9SYFfu2ymdyw==,type:str]
+    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]
 attic:
-    config.toml: ENC[AES256_GCM,data:FI5dpdykeneLNDH/Cau5Geuy9WYKCAJfCxm72RPmkdrVqwVm7deHzbXcBLb7LUqDJqM6xkGFgfOyRHc3tRplnnLW8OsKrJC5QCQHVzTcVMKDInkT3uz3EEn3SO723tYf6WK3p35CeA++nWYtJP3Mo6O8kfjNXwYNCMwt64s9bgEGXHKBq9xSENPtn6XJxnMuHfOxUtkH754CKqePNLFgKf8/wTmljZBBpp/+tO//sIL+5CviOBd1FfjaDGh5ec477XNf5oZxK0h1qcyGozehMCT7mSDW4ChtJ60IeO/nVF3bEVQtY5FAxAowFqJltByLjpPCVZ497eBkq4FFLvMHDNYLk9eprOTXGeYjYgtnhMoj3vQ81dPprTOHKWD36xwQcWjFuk/pCtFbkruT3MxvFZaVpI2xiav1hJmwOk3YCNgjbjHmaI3E4t5pCg==,iv:Frmb79vIYN09+sw84ETTGiAuC45kssUFk2ecnZt+YqQ=,tag:Wa6G8vqUNUtDAzi16YuiqA==,type:str]
-tailscale: ENC[AES256_GCM,data:Yftmw7SXjawXG7FALHBSbJL6XuN85JMBYUKy5WebjyIuArPZoT9bDHMMg9lsSVoOe/WoUlXAnNtF,iv:1NmaEp6FnzKc9Y+X66heZGqs4eg1NhAFn9RyutdTfx8=,tag:dfsPPpKcKvDk2suESm86ng==,type:str]
+    config.toml: ENC[AES256_GCM,data:SKgMfpIn4eSHq4nIiS10JcGVvl567CJyMSYPPi0B9dem31rJhd2PNejOEoIePJvr9iq1wR2ypdVx4c6GCLOfT24qFVoWNLWuiGjFjTGVHuZKAo+rL8ealZYwgmAAJfTVKUrT8IWFu5Oy2MeBAYjq2c5BiDt9qoQaghEYXtM6LtoBTiDG8A6+dopHf4bNtwi3BMiUAuz8BTRFP/hASQG5hzyplvKDW98qdnwjJ6ZBDdtv9XLS3KEQEHqj3MMXQAFX104oASJoitNSAqJ4LCxuYuSzRzgl1HRWQ9pCJDViQqdIXq3gFXrfSSGgzwgzzic4A/qsLkSsrS7h2RFBedE4AHOAaMLiHSLMon5RIoXZFZmsKI+k7L5fauT774hryskYoJfIvWbe6WwYInQaRHe7YvRgrfY8U0XTx8Bj2f5dH9rrUR/ESPdBbmHeLw==,iv:Frmb79vIYN09+sw84ETTGiAuC45kssUFk2ecnZt+YqQ=,tag:tG2alQfAuo6YLupr+9iqXg==,type:str]
+tailscale: ENC[AES256_GCM,data:OUbgLSvG3VokdF7zcZrun7KNSU0RJwLJeLDSDz4yutFJWIpgMH9vpMl4NsEXPbzNkEvi2ElmQ5Qz,iv:1NmaEp6FnzKc9Y+X66heZGqs4eg1NhAFn9RyutdTfx8=,tag:ec2iD4PHJQtbnXV3rCzoGQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -14,78 +14,78 @@ sops:
        - recipient: age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4c1U0cWhTT2FrSFZkNzNI
-            Wm9RczJXaUsranhEN3RUd0h6aU9sMmp1QVVvCjhCQTZ2WmVlbWUzOHBMQjNTMGtZ
-            aFlYdzl0aWxyeGdmK0plVlN5bys4YW8KLS0tIFNoL3JoUkxHMktyU3VxdWMvUFpU
-            MGlvdThpWHFaTEl6SFEwK3BkS3VDbGsKWU3ND8fXeA10SYLbPOfuIXXntlTOsHzY
-            OCNokynPk8wMyvYikuJ5xoNY7qdeXZureMP+ndfX7nLl9bC/izKuNg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1py6eyelfttya52wc2v2ar7fx5htr5jw6snl4shx98sw8nuaw2pesyhseul
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5VFRoN3B5RXJuUGNUeUdt
-            RWg1emFSN1RYZlhpT09ma3BrM1h6eGtuQ0Y0CnZ2enNzM0thOE5iTUtzQWNxS2dR
-            WkdoV0VZbk5BY290enN3bXRJaTFQNFUKLS0tIG9oSGFWNk4rTGJaTWtpMUY0d0xQ
-            ZnBEZ25adEtVUmhrMDRmc21NdTlqbzgK1ZYUtPeXApDKYE6r/IrKal/prz91IAEJ
-            4TP4n7y5EAQKzBE1NED30TuzTvccAyFveehDW2AlS8ghgGtnX9wFag==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpM0RBSTMyYk1OdG1vVlpT
+            RjcvSXR4UXBSS0U1c0FvRkZyay9seTA0NHhRCk9aQ3RkaFdFa0pxNGtRYlZ6TVJM
+            ZW9KM2g5OEJRZG9lMGlZRVo0VWtQYVkKLS0tIG1WZDVWM3l3YlZEOUZ1NmNpSHJZ
+            dlo2eG53SjFmNXU1elBrQUhuWmFYLzQK2qSOY1HItMhJJGShvYvs24BxVQbsSqOb
+            pCOzMsH5fbMBbh+1neCu4Po6yJNCqw7xzhNtUXqH65tCbLb4U0SaDg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGeXoxRlRuZDVsd3pKU0Nu
-            ZlMyenNFU25yY3o3TXFqSHVZSHkvRlJnTGtBCnZZMmxrclZyaXVxUjNOdFh6WXhB
-            RStrMXlpbytPVHljd3FGR2xKUzdHRXMKLS0tIGVKQ1JGdnB4MEkzMnNCVWJQUjNo
-            eU5Ra1duTzRCQXR4bHBSS2pwWjdrOTQKB0BP2wNjEV03MAPik1iEbaFIkkw8SD+n
-            P69R9pQUpI/bS33ksejk0qkIzu6pmF3Qp+PX+uT5CvjCWZ92Vuudxg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5SWdBM3ZkRXNKUFZaNXRF
+            V2pqb3FJRHRYRUs4a2w4bXFMTzRKOEIyRFJvCnJTWG04Tmc0TTBVMFhQNTJRVVY1
+            QWxKSEpWRWFrelJuaXQ0citaNHdEV0EKLS0tIGcrNFYyeVJjVGtmSjVDTVE5Nlkv
+            TzNwYzd3eWpQRXlpNWFqWTNRbVNUY1kKCQJjzlhlz4uZRSG+LbxkR9USzFCqTPmZ
+            rHEAjVeve26bfauvXtltwT+Je0JWYvJhlGwKdgnoF49PUz0DNi63Hw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2a3BvRDBwbXIwRXNJUDlM
-            UDRNYk5TVGpHdFJ5UHV2MUc4cFpmUVYrZEcwCks2TDZDdk5pdVJlV2FqRFZDV1g4
-            YWZiYUdPTlhBU2pQaFVORVRNQTl1NWcKLS0tIDJhMVl3cDljSXJEZXVsOVY5cEZ1
-            amkvV0thWDlra2QyLytPSzcyVkI4TmMKXbNugROaHUltEklLAPBOpwjqmG7SahNm
-            hZ3GEdJ97tslCaDOsqqIq+9C+5Qr2pgiUMjvAVHFqyf7Vr3mN+rA7g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5SXdtUk1sSC9kQ2UwL1Vs
+            ZGhKMkJNeWtjSzUyNkphWWdoeVRkWURBN1U4CnB0d1VLclJlQkNCSkloajhCdUt5
+            SmIrRUR4UkVKQTJPWkpkQVdWMU9uS1UKLS0tIFFyZkUxbHBEdlJpd3djNEhyVG1Y
+            OXMyWEZsbzErTzhTWkdJNkRKYzJ0MTgKElS3ZKNX6PboE2hdd7eYKdXrL6GNQekc
+            fUX9rHDfBBkqchVbp8uk5sSrbh2hc25QHGBgUfeF52JcGi5p7sxdhw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwZE5ISy8xeXZyaWNhMWV5
-            eEJYWDFMZ1NudExyVnRYSkFTeG5VN2h0QlNzCjR3bDdRb0ZVNHFFNGZSQThDQk5E
-            Uy9GZDRyQ0tDdjBTbVNOVnAvVko0V0EKLS0tIFRrWjdGTGtWbGIwTVAvM2R3UG9h
-            VFJvK2tGOXgzb09MVzhRcjdVaTg2OWMK12MFvSnlqrg1BRsuhBMCsXrjYIDToiNA
-            3yelndVqZ32itoV/kfllOlEy8u5QP3rhNAb4iBq/oxVx4JrUxKXYBA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQRXdId2FqanFlVjJqbkNt
+            NWNRYVdCYkNXRTE0QnZQQ2pIOURPSGJ6VFdVCnFpYlVQd0dpcHB0THJKNUpGWDBw
+            WDNzdGFVM2FiUS9JMzgyTGZxa3pwL00KLS0tIHZQN25yZHY4bjZldWxxUFl6cjE4
+            d1h5SW9ZZUtKSklNdVUwcXhkdWQwVTQKAdGAagcFO3Jvt7l17mMx4mbE0TIxcPVm
+            vuKnANfekbPWlwEue1T5c86+H+yiP9OmSN4Uq7IvLkLLJsGJN6j7Rw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUbUFUZzVKSUF1ODAweC9p
-            VTJ1blo5YTBheU90SkVnQnRvQ2dkUFRHY2hnCmM0aFFRay85UUgwZTEyYjlKc1Jt
-            T1YyM0g4d1dUemR3MEkvcXVQWXFmNlUKLS0tIFRNb1RxTnF6dVdLd2cyNFpmOW50
-            eW1vVjdWcE1lZytWUWlHaXlPcjFDd3MKceK+SXb+suYayv4X3eQQdGhRBGBdu+vR
-            qy4KfQOSpdQ0jOH5adhVCUsNR8O2NHgUo4JEeYsr7q8FnALOaxPg8A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvTW1tWWd1Mi9vV0lGN1BQ
+            TVpFUHh3d3k4UUNaMnlLUkZpcmNPeWVSRWo4CjV5MGJ2Ukc2cmVPSjRDRVRKbk1M
+            NkFNaFNhajBBMVIzeHBNRGNPd3l6R1kKLS0tIE0yYWxhWjVmclJLWlRjMDhNbU5o
+            bDlDNjFSSDhYMW9LN1FxNVZ0ZThwbU0KswwIAKFrKyimCXEDMwrYBzWFUL9fbXT+
+            rUQ/PfI82aJqWWgHVZXWXMQ+SFe6dvixK904uMW6UHLkrvyRgxKeqw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1gtezxkkfhpkv788x9dek6s6s342n9tkl40zvsa48m9a7yqn25fnsmd3wy0
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJNWNnM0tIWC8xOTd6b3lU
-            MTJKUStLbFpKSUFWRisvQW03SnI4Z3F4UGo0CmlERkpDOUFQY3ovTytqdzhkM3Rs
-            dHNWcFdJU3JYQkhmMUxubUd5SVVONUUKLS0tIGFYTlpsaWRBbm52Umg5clVJbVpU
-            cGttMS96MkFOcnljMXRFMXZ2NWNHSUkKSWalEvAwF1eoBrJFU34eejKrjm30j3OX
-            PNBae+ItdOIVV2nkBPNGxM1VVYXb8G8mjjlMfiIVBXsTtYQNFA2WWQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXejBnNHJjL0MrNklwUE9E
+            cy8vMmNHUHdrKzJhcjJzWUowSnJzMWhDZUNVCldBSjNBQXJKMy8zRzQrMXljZ2Nv
+            S0VVMVhiUkFPSHZuVUVhVFczQ0xSYTgKLS0tIFVmazVjOVVsdVpHM1dpLzhqUHdy
+            cm5uTWZRakZUUmlJWCtVNDJaRTVhVTgK77EUv3ejfDRPKA4/aoHQj3ZPBV2P1MEi
+            aMr0vkVQFK7cqKtV025qrIgtsNgtWiLnFSwIDK+n/SxcGI4GmXwWWQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-06-15T14:05:35Z"
-    mac: ENC[AES256_GCM,data:utsvhlBbd4YN0wx/G4yYxrfq7o7SnAwLF6pSAETQ/nh5q+4c4C1fm7IMx4U3qaVRNN98sRCXLmOZqSgvVQL1GFQG2im5Hf58/YPdfUZ91DK7OV+S95GIxrbZGu4jgg4cOp8CK10v2pzMUe4qiAeJKl/eKxnUtYG4Tto2htyCHik=,iv:2a2ghMtjSzSnZa5IZdHGlAhy9oxrPPbhorWgqHnz50Q=,tag:RTU5KvYaQ6QeFuyukElVNg==,type:str]
+        - recipient: age1zyey9d6j3lps205whlx57wxpu4j9xxytjsztgt5keamfjrxlgc0s0h6qf3
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvSzZqWDZucmpKS3ZERUht
+            N2ZOa0RoK3pXWXRwR0VvWUliRUc0N0N4Q1NJCkxrVHBjMHIvWFQ2aTNtcDBYVUk5
+            dmlQcFErcWJISVRNekIvcy93OHdlMjAKLS0tICtucFNsT01wMTRwbXdjVnpUU3lv
+            MmtjczU3TTVrUHMzN0lYclRoUXcrYXcKXl1y2wq/24VgTtYwMwIMRb+9AERFLT6M
+            vWPCs+N4rBja2WmtmPSNNL70UF8ZAQ93dBLq2Ao65N1YRG5XE8zbNQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-07-01T11:21:16Z"
+    mac: ENC[AES256_GCM,data:lTnUK9a6ssxavyz4ORkfOyHSL44wCTpmCTGCkLf3Ql61UdoZFA5YvE3rqs3yO549iLqdwgWkna5MvZxpQQ61R4Umu1XY3Lgf6Y5yjHB8jXm49MXfxsJVTMYg83bvhcVFTfwJHOmFDkx1gOAgb8mIYl1+/K1/sf+V/PFy/4j/DI4=,iv:itbzDvLBe0ywsDco0cMZ66++NZgmXEw+dTE4qJkRJyc=,tag:i4Lr+UmHsZzpIiEgOiMSng==,type:str]
    pgp:
        - created_at: "2023-03-27T16:00:59Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DAAAAAAAAAAASAQdAWgN21ifDCfbFLFc0HxETSVuJTL1/ntyR08vNUwXVDWUw
-            GWaQ70dW7SwPBFvAKcM5uIx23EMtO/8sLhaVwNJnCP8Sjzsz5CdT5PBHP/8Zqgg4
-            0l4BuYAt6GqSllcbxPFfAwRJU6Be1ubY7+WfD4Qsyb2nA2Xm6AtNRwYnPC/ZiUP9
-            t9fWhBts/SWGYMVLoNJmYv2EiGKZVLUU1OW9GFwwTz9xuLGVX82cvmpwGv+IJBMK
-            =F3Vp
+            hF4DAAAAAAAAAAASAQdAPrAr24FVvGPsQdgsQoDpVlTZo7nNgsAbPaGGnvmQVVkw
+            POU+rLe0UI/r+c1zpflcScZki3gwbNw4eQgPqPT5yHeKvBPlHJKH6qT7dlgGM8J3
+            0l4B+Uoq1yn3ElNzR3NzdHme34OnbAY1hAwXQyVvxOZXjplmsvSa/OITeJdPZdsw
+            EQLofGggRFEf4b4OKsJAZKVWnRDnLRvii/DkRO9LldELWtLdvWiabpW49xQMKV+D
+            =L4vE
            -----END PGP MESSAGE-----
          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
    unencrypted_suffix: _unencrypted