From 237e15b8c5615e002f8988d0ddd887df3feb3e32 Mon Sep 17 00:00:00 2001
From: truxnell <19149206+truxnell@users.noreply.github.com>
Date: Thu, 21 Mar 2024 22:56:48 +1100
Subject: [PATCH] fix: installing desktop

---
 .sops.yaml                                    |  2 +
 docs/vm/installing.md                         |  6 +++
 .../optional/cloudflare-dyndns.sops.yaml      | 47 +++++++++++--------
 .../common/optional/dnscrypt-proxy2.sops.yaml | 45 +++++++++++-------
 nixos/hosts/common/optional/maddy.sops.yaml   | 45 +++++++++++-------
 5 files changed, 90 insertions(+), 55 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 9f4e442..638fb8f 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -3,6 +3,7 @@ keys:
   - &nixosvm age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
   - &nixosvm2 age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
   - &dns01 age1y399g6q8cg0efzqdywrswp5uugsfeuxg54ptp3vacrvaknl5dunq22wt5x
+  - &rickenbacker age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
 
 creation_rules:
   - path_regex: .*\.sops\.yaml$
@@ -11,3 +12,4 @@ creation_rules:
           - *nixosvm
           - *nixosvm2
           - *dns01
+          - *rickenbacker
diff --git a/docs/vm/installing.md b/docs/vm/installing.md
index 45deb97..9baccf0 100644
--- a/docs/vm/installing.md
+++ b/docs/vm/installing.md
@@ -65,6 +65,12 @@ passwd truxnell
 
 Also grab the ssh keys and re-encrypt sops
 
+```sh
+cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
+```
+
+then run task
+
 Login as user, copy nix git
 
 ```sh
diff --git a/nixos/hosts/common/optional/cloudflare-dyndns.sops.yaml b/nixos/hosts/common/optional/cloudflare-dyndns.sops.yaml
index 4b72214..2c545e6 100644
--- a/nixos/hosts/common/optional/cloudflare-dyndns.sops.yaml
+++ b/nixos/hosts/common/optional/cloudflare-dyndns.sops.yaml
@@ -1,8 +1,8 @@
 system:
     networking:
-        #ENC[AES256_GCM,data:xazwNz5bm5+xJ+3yn6OnFvdg4Fu3JbscPCYjzqUOHQ7/xVh0An2o7EIkhqdh0f/cK8SSuJ5XigWWMOD9hEdgMAB5fJHHcLAo+TyUdQ==,iv:CXiygEPE+IvYiwa4ZjGabpucKBQ1ifRFeEXy9fByKyA=,tag:QBwSV1kto/j8pitIYUHrEw==,type:comment]
+        #ENC[AES256_GCM,data:pZhhqGtwLJ4JiBm9056d8HQnzvQZeAghKkOButPkbnjXmXxzKWSZVJhbqU0Hc+XBs+EcUOCcvsSDd+Pkue9sxEwJoTmWIc8WzvUTHw==,iv:bKt6g8YBlsMxXcKaPW+5uMNbTh93YxnHxjOW4gwPrhY=,tag:kx7grZBcgSvYn2TBpDiAnQ==,type:comment]
         cloudflare-dyndns:
-            apiTokenFile: ENC[AES256_GCM,data:AltmnpzA98peLNbc9gUXv5ipsPTm6OnP1YqOGcU6Q9UCxWPw11kV3D0GeoCO9l7ahjlGefPGGh1rkdzvcnHk3rFkown8aWtAxv1KOgIPxDY7IKbdzzsKLWilesVCR3o0CmkPyOU0HN89/nH485IGonk+pQ==,iv:QiwpAsApe0cmoupY8hvSdXfD2JrGOV64D7X0smU4MlE=,tag:s3J1KEsu65fZWBCnXNYGsQ==,type:str]
+            apiTokenFile: ENC[AES256_GCM,data:HCPDP3uDBchxKBT0iu5obiLK8echeVyWfhBJ2ejq2cyZV00Uwh/t+usEMzmkrXdBGHUpafMIkUkAcOhCJYa8f9bEFYcJVowbE+nff3GsBtm4rA7Hx0ZVgHOjSyEVo6vPtWgX1y8EwUrAKSZYCoiG7uI/Gg==,iv:BZWwztLfSjg5n57gTsXiVZ5sn9mJzizS15KGkCHnalg=,tag:9INru4xTAH8gMXZcqHS0uA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -12,32 +12,41 @@ sops:
         - recipient: age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZVm9INkMrMFhyMEV1SlVz
-            KzJOVWUwU2RqaVV5VHJYZ3YwUjFaUnd1bEFvCk1zZGpVekRhc2h5VUdGa3FWWFdH
-            Z0hodWJ1RlcyWGdKanNHSXF5VjU4MkkKLS0tIHM2K3ZINVl3ZWN0RFNWSHN5Z1BS
-            RkZZdSs2S1VjMlN4NXJLbWVQdzJ1akEKtMhwSpVfN75IgJdpn24tFdIvW/5FAU7T
-            1ydBltHckzQ9JO9YeWY9qM/bqqT3Z3qcsXc75gH1dezKV8TdV/bIGg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOSlhOUWRldTVEaVg2Vk9L
+            eDVXaExqbWRtSVlaVXBCdXpGek1oVXZ2a0ZzClpOUEtjMEE0KzNobmFCLzg0S0Vh
+            WnhKeDFUOXdvZ25ndjhuVitWWE0vVlEKLS0tIG9zZzNvWU9KZ2c0SEsxN3oybjFw
+            Q3RTL1Y2MjYrQW40UnZMZlZVUncwVEkK7Sh4kSeSxgtbclAdQdITzOVpSBbF3t4R
+            tvUEEun08V5FO01QzyNuTBC9q5geGwRgjvtWSX3lECSD1AaG7VuNCA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0QzdPamVJQUs4bmd1MFQ4
-            VC90enBnQVNRN3BuNE15Y0FCSmw3Znp0L0RRCmY0UHdiaXRSazB5RHN6bVZXcmZH
-            TktRK0x5WmVONW1EK3lxN1YxWkt6TmcKLS0tIGhtTDZlb1VHNjhaUXdWcVp3NTZW
-            WWNpMFA5V3pPYVpZK3dQQVBSS0s3TGMKH0aZ/QluX3OcaaXovepWbg10//65nfwy
-            G34hm65igi6l4NCLkx437g8keaS42up8BtppFGcndQiWoH6ovyd1Ug==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPVWsyR2JqSHA2NEQrV3k1
+            SkFjV21oMERJR0Vra0pvalpMNlBVVTY3eVRRCnNtOVhiTkpGY1hwYW9RYW83TldX
+            aWxhZTRWKzNQYy9DWnpwbCtmWWMrbzAKLS0tIGpRazhEZHpRUVVmWFh5QnVlcGVn
+            citoYmdhRUlNODdlaVdwbmE5ejV2RlkKJh/ZHEnDe5yjY88mzXFHE2rQgIjybEgC
+            EnbmboDKby/Ns4Rts8M/qS9AUcbk+3B5Ls0IM4zPIGPH1UflKbFbJA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1y399g6q8cg0efzqdywrswp5uugsfeuxg54ptp3vacrvaknl5dunq22wt5x
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnOEdIVUl5WWpPeTBZL3JF
-            a2UyRSs5M0MwQ3VveTlOZE94WVg5OWlBMXlzCjNZUTJ2d1lLTnBQZVIxZnBVamhr
-            bk1ROW9VU3RoaDVBRXdkdnc1THQrL2sKLS0tIEcxQTB6bTVVcFdaK1YveXB2WXhs
-            RkczNUsxL0R0MUxHbUxSL1VKeDlvOHcKkLEEqZ8Gv1WTikiRiARX8y9dJVXw4zc7
-            Fi7+xnapRIMRWl5D5MllURVbUirHOQkfpW/8RvVUhkCsRSLjwUM2yA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4ZzdmQXdLZnl1dWhnN3Mv
+            ZmRtRE85ZFhqYkpGbTQ5ZjRuN3IyWjE5UVJnCnNFT1NqQ0hGMjFHNmlPVmxYOWYx
+            N3BXOC9Ic09hTTVydHhPYzg5U3NwWTQKLS0tIEw4eFpDc25HeW5GK1NBZUpHYWdL
+            NEtGMXZabVlzejhMOHRBVDNoeTVkbmcKbx3mHeCwfjWB1RfsGV2fsGgr+A6ObkhG
+            4Ki+HkGB1XkU/gkU6PwyAq3/9wF/h7otoGHNcvKuMVZNj8AbtSy15g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-20T21:57:35Z"
-    mac: ENC[AES256_GCM,data:XRpA6nysngJddRJhv+5jpn2YzQPRCTakFI5pUVeu8QGjapAL9MJQOZPH/nqGxMqBZiM6uGdSeo6QuX8iVCQZLfv5vI7WfKZMkhRymj3nvKKtdgaVGAvsyliC4tywo7a8IDC2kBWJK8dZaw4OVBSh+9kT6czvqwoM6Mar0B8Omr0=,iv:ecmxIjlMhBdBIyqdn2w9U3fPoxVx6dho3nc7ftMwPlI=,tag:k2DusgenaLYWitXMLNefQg==,type:str]
+        - recipient: age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBISTF6ZGt5L0dDNHp1cFRK
+            SUVMVnlmOHFKR2hEMW43OHl2WVc0T0xnOVhNCjFlZHJjUEIvT1NYMHdGSS9xMkNY
+            dFgyeHQwRWRIbzFPREU2M0Vjb3FObTAKLS0tIGxuSHF3RWtiZE1KZG80K3BlMWh5
+            M0x2SzNYa2QvZlJ5aW16UWRGMU1RYU0KTJIhjRj5g5yiSqxHupbPVSUsuasCgmST
+            OG3iofre+AVi5WfWTaSArfpTCm/y1z2UGbSK+KmJ0SM4xayyTvLbIQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-21T11:56:33Z"
+    mac: ENC[AES256_GCM,data:afQFkMRxfYsBKPfoAYSH1sNkGWDZRMH51PREmCnBb5UyZ4dEIPaLeZfnnOVY5+91EsJDURpXO7Moks6NV1zm36IdrBBkUG/2kHYQDbsrO7OQ+Lpuqk/e+Mp80oAkisWVIjytEDdzrHH4xs6YVj2/ihbTA2pVnqiBNMViEx2mGN0=,iv:w65sp9n/iqy6c2By90xCEjJKL6KwbZiB8fIb9RsEeAw=,tag:au3SnXULfI2TXsRuYQMNIw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/nixos/hosts/common/optional/dnscrypt-proxy2.sops.yaml b/nixos/hosts/common/optional/dnscrypt-proxy2.sops.yaml
index 4df1e3f..240acdc 100644
--- a/nixos/hosts/common/optional/dnscrypt-proxy2.sops.yaml
+++ b/nixos/hosts/common/optional/dnscrypt-proxy2.sops.yaml
@@ -1,7 +1,7 @@
 system:
     networking:
         dnscrypt-proxy2:
-            forwarding-rules: ENC[AES256_GCM,data:IPrNm/tsHbrWO00oh1h9dBBjBga/UxFwgvQweUPl9ewKqUUbh9/MTtoCXTUBmLncs53KvtuhNWDLYZGj8azaGcHk/OXJLqTLHDQpsUt4Ax5mXoyKsR3ismUXYojvU+iKwoLeeJERAF+VnLRX74otukSZ0xAy14LYAq8FFy/cWTQzke5DnsGn95ZAhJ//QNIJcoOvvd1pX3LywBmYm+gUV0sSB6CvSbEN8qFDSgQaetU8rMC6ktd5VPveJ9UKD2Jsh5NJune2pmk20gj4Gwj4XFDJaKBwpZGrlrrlXy7AYJ3Wo9sNz+4qiDiBxlT3EQ0KQcJU4De3Q9862Kuk5hYueJxfRUTh6P45GHvPJ14EOoYjI64SfHX3JrvfhSCiHYLO9Wl7y4dFyzJgnKltD54eDgGbQv485PUjS/fmzmnM+mRVlZ9pWR5aeDrJAHE9V0dJqWR/urnj+r1BVarcITsis64=,iv:eXz7Y9FKwX3w/6Wg6o2aJsYa8NsNxYnE/FSpLgx2PzM=,tag:rOus4nMcmStq6U3dweaahw==,type:str]
+            forwarding-rules: ENC[AES256_GCM,data:pQ/4p670nxLQB2aVenFag/Ngk+SgGXDSW8GZJDYCRxsv7A/2qtuhw5qQ+x7Gmx4OonJy9futOg9EsylfztelUnGSve09Yx/KuQUAd5ctnfBnLWqOtX1snpm3oHD0eRYOEzo/UUJlAo26qTwOhn0t56ATv+LemIsn94wCjiWA2mg91T2VuIPWRoHfpZB5JxAV5/9vUfiGdLka4TugxDzsEvFtYAGuta3pJuQJ8Fv3O+idTsF9izU/JZKNTDe1kwngT5paMQTpAi2dqLq0MgjaXbhJsTBpYwctRy7Qs2/Q5AjNvXTfrmtIHy9wo9dD9MWRoYHC27wsMiuMlwrfNSZpt1mMVFddsS+GhpEfTwp1XPub8Cavc74VmYzQLL20e0/2jH4Swjq+mCtBGnnW+qA4ZMCbh/NDpNhm6Am5hPB49d+Vxfdhp/QeNOis55usD1aYAAoM5FFCH9NzOWCHcturqxc=,iv:FmjGnacQU17+/SFHzauuj//R94uKPhTv87rcL4QvVjk=,tag:lGFrCyZ6Dl/n9HIIdZZf4Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -11,32 +11,41 @@ sops:
         - recipient: age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmV2RuZFoxQWtzNCt3enBo
-            a0tEc1lhMVcvRXFPQyt1aGpVdzYrMnl6MGxjCkE0R3BQK2JYMVNJSHB1Y2VacjQy
-            N2t3QnJuV1k5YkhDclN3aUZwcWV0SHcKLS0tIDI5SGNpQURmemU4OWVrbHVoMWZv
-            MDJhN291YkREKzJVK00wRGtFVDJRRjgK5lvvJ8TzbvjfD4MAvp1ggP40wpWS1YOd
-            2D2TMhST7BL23/d7uyBrv2zpyqkmbpGb/UIS7anPc0whlMtIADO9Lw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0TCtBSTMxVGZGbDlqV1JX
+            V1JtWTRTaXFKdlhvaW9oaXozN2hPanpNdDJzClQ5MVcxcytRMERiZjRGRmZ6MTlK
+            SWxpQWhGdk5FVVZtUEJMYnpEdFcvRGcKLS0tIDlwc2x2aGdCZkNWM2FIQXBBTzg4
+            OFFPeWVIWGI2NWhxMEhjWGtHeVl2bGcKL8r6ktx/OfboZGy8FPJqLXrschvhatMe
+            BEtT4vbCGw7Zj6KjaZeJoMIdHtIcC1wi7N4sB6oIvCyxBpQajfFfCQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIckdOcHppaTYzM2FyVE92
-            WVBHV3V2VmlvNXZhZUNLdzR6bnNNTWI3bzBZCkI0NE5KYU85V3NibDYvTEttSDNp
-            N3gxTFNCMmlRb056bVp5ZTJzdXRZbWsKLS0tIHRCL2FsNnA3Um10RGN4aVp6ZHBB
-            Y1BKSzB1TExSRHpaWWZsODdOUlBGdjgKQvfudVQEUSpo+Lor2RW/T5VcajWERduM
-            thPVAIUSYZJhdqALBVoSZ3J2uCk0tTjz6aNm9nrxQy8d7iXSTb41lA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhekpvRzZHSkxEcFFPVjZh
+            b2p4SCtrRnp5UzZlU3NLb04wQzRXY3NWT2pVClJFM0dVNVFDWkErWDdRL2Q5NEth
+            NThEako2L2JrT3VBajBwdUVJd0Q5Z00KLS0tIGNGekF1Um1xQlJYMmc2Y2c1Mlhl
+            ak16ZVFMVnBwZ0dJRkNzRFRoanE2L1kKW4Oxl4WniSVQuQTxTfEBwUOY7FBsJKp/
+            FZwpti7hhdX6Fc7YAXj59KClyGBzyzOBVboY0bQzMD4XuoRkgd5aDA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1y399g6q8cg0efzqdywrswp5uugsfeuxg54ptp3vacrvaknl5dunq22wt5x
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJM21Xejh4eXlKTklNY00r
-            ZFNWQVhxSlYxREY1M1VTQnc0MEdNWEh6ZjF3ClpMOWhhUWZhN0NEa3BGdXJQOTRI
-            WFoxVDdrNHluQXFhRUE3ZHA3YVZZM3cKLS0tIHlkY2IyWDJxb1J5SFZXOUY0YmRO
-            RTZoTDdCNmNhZzkvOGg0TDVvWm9zZVUKhncLUqSod0ZVNN28wFtQtI2UAk2puD+F
-            tzrOIKqMDGlgOkFf6bApmCoz6y0dLq03cRcXUomEnTfb7JZWaPuq3g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBha0pRZlczNHd3SlJmVDBU
+            aTZaT29mbW9oZkJGL3hpNDZFbkpsSGk5dmtrCno1aFU1ZGsyYUZETUFtNHBzL2tU
+            bHpZVE1Jb2R6Z0QxYUc3cGNpR3N1MzQKLS0tIFFUc2VhM2tTNHRSanYxOVZmNVpK
+            Yi9GemV4c0hMNWRNWnplVnNVcnBjUm8KF3NraIgrWU18VlWpiPC1l2iaUqwrPNkS
+            L8geWFzOPa16/0tLbFJc22v4z8XJor59msEqZtBHTSjKCk6SrA2mhg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-20T21:57:35Z"
-    mac: ENC[AES256_GCM,data:54m0MrdA0b5z77FhaJd1oOWdrd1doTjYLkQYDvsJUTuf5w1olhzFdWEuO26W3Ghgu1zYVR7jf9hfhn5jH1XdFSMZsO0qmyiRECnaZjMisnmuHMeoSAmFAuv5wN/iYlGSNXzHVHVRzz4g3O0+tPAj1gQ+OtD8J8tS8/tesfeJRls=,iv:CSzb9PK9co4X08u8fqr7GjuFwPj9BppeJSaor5A0Tk4=,tag:iCIhfzdhwzXEjXa/4bMAVw==,type:str]
+        - recipient: age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1Qk9WK0IwY2hjQkIxMm9F
+            NWhiQWV4WjlpK2p3Q3NrblBROG5xa0oyYjNNCjVqRys5dGxabkl3eUVWNWNCOHpx
+            N2RiWThzNGovMFlVcmhrZjVHR09pelkKLS0tIGRFemo3NVh4dGFxNm1JOGM5TXFK
+            YmVhVU4vT2JWdjJyWkRsL3h0VjJESFEKMVOK8FxLJJyYIPF5i31QoULTJRjq8s+8
+            0T4tZXvJV9WgKG8qWTo4pGfnQDDp6QdqSzb2b02WQJEexmaeR979fw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-21T11:56:33Z"
+    mac: ENC[AES256_GCM,data:7i10h+RJUJamnPvFIcORQrDukNudtXHLXeNkQqGHCCWsRPnXOtP8Yw8/l0QR9TH5BIxT/u7mjJnz7WfmhghkYSnKPqyHEmYtoLgmq4AsrpSoXUgbBdMDgm6UZr8NqkE2J0EUDI1AhzAH9JCakRBsrO07qRsHyjiH5Q01w0oLYTM=,iv:4gqb0eHHsHkLNLZ0jTqGRp8OGad/49VKmhINLQwlc4M=,tag:13noyAbETQkj7uVSCRD8pg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/nixos/hosts/common/optional/maddy.sops.yaml b/nixos/hosts/common/optional/maddy.sops.yaml
index 082aee1..c6c2aa7 100644
--- a/nixos/hosts/common/optional/maddy.sops.yaml
+++ b/nixos/hosts/common/optional/maddy.sops.yaml
@@ -1,7 +1,7 @@
 system:
     mail:
         maddy:
-            envFile: ENC[AES256_GCM,data:SlolJpXuYjUUVohV2S0ikN7yvo3CMHOXeJj3Tshxda9Ahi+72CG1tPii2CltPFyfYU/YIdSmY4ROkij4UCgfaZGCJOe7+A90eFS/SDc9PfxhvfcxCnJX8o2nBBVwZmkXx88nG8pbpIEHp3zpg+qAnvTbrwEoGxNsQuVUdqMVF88Gg3M=,iv:zm7wGLCpc0kJEgWCBmURqM9o/bpbRcsUjOqR4FXr//k=,tag:1Qyb2b0fv0YxmNJz+aZeHA==,type:str]
+            envFile: ENC[AES256_GCM,data:VFqV/ZqnOlJeJKNZ0YGf1ORPQGn61GFqaSyHnRwh2aH/Xe67FJEsUsY1HW8hsZ3nKssmk5kbvvUZ39kqwUpqQtwhkE//YOhFCdYzW1hsT2nc/Nfm8pSGSiy+VTKehp1/QBsm+p9n4kgvlIwZaneerMQH+Z3B/1d9285wckZWrFuMxWw=,iv:lj9OGG5vEgF1osQIpnxYHEYwVQMAZaeWqSXfES2ESVI=,tag:H1PTFWs3iNwInXUe0e5aFA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -11,32 +11,41 @@ sops:
         - recipient: age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCbk80N2o5aUNYNURaaDRC
-            VVdaYWJ1WTlDMFI5SWdRVWNkZEJYbGRCbUdBCmwyeHRyVnhQc3FxVGNsbFJKb3Nv
-            UWJ4b2gzVUFSTzBCYkZvcGNYcnd2QWMKLS0tIDZrK1BabkZpQ2R4aTUwV1IvT2hj
-            OGVmMGlUY0dXdm5lTHlVNDdBU3ByZDAKTcn4aPzN9IAaXIsTN5lN6I53ueAVni1q
-            bv9kIEqflJ9+v5M+6wQd7O6fejTFB+Y6/bs5Vk/0Q0Q9wn1oiBInog==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvWXFWT0ZJaHVwMSt2by9Z
+            cXEyWDBmb3Q5VEEydlZoMU9PdGt5cFM5TWdJCmg4VC91NXlMdHg2OXFZeGlTK0ZJ
+            eE5IY1V3N1pNTHRpZGQ4YjlrU1Q3KzAKLS0tIGxFbkdoRU81b0o1UGlHeFJ4eWkr
+            Q2VjY243REx4ZzlVd2M5TlhFSjBCTm8KlVvxg9WvhEvhhKozS03hCz5doU3YnIal
+            erRZggFlxzdpG5Nk/tfEaQhGL6HeeF5j8uBO/x9E7DMYpxtMxwA5BA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0WEZTM3dEKy9sZWFhVms5
-            Y3hOQmZjWEpGblFVSjlwaHJFZ2IyVjdHN2g4CnNkRktMYVVQMDU1T1pqUWVKYlRN
-            VE56NlYxNDVpYmdod3dNcml4d1NpSUUKLS0tIEtJSzRVdG9jVEhqRFo4S2NIbkk4
-            YjR0L3kzUmc4VEVZSFB4bXVqaVkzRGcKtn18tE1YTaKBLQIiorixlFts8ILGnGWx
-            5pJ3kIWNVPh/nVoDfxrit7SaiwYspC12OVID3XVZ5Eh3OEe0qr/yUA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEREVkRmJGRTdiUlhhMGQ2
+            aytPZnM3NnNFcWtrRHJqVWlCZ0FGY29JVDM0CmZSbWhsVlBPTXZxL00wUHl1Q3pn
+            aHFnQWQzNllZaDF0MUIweVVFVlhoMG8KLS0tIFpaOXl0TU93Z0Nkbng4L08xbU1Z
+            VzhGdEwzTDh2QVlZVVhJbkYxV1pJbncKcx51Llv2qiX2hTHx9P3+STFYhuG9SKqM
+            P0JLENehLDU4pYF3qva92dr47msBAEPmnVTs4C4Lj6aycoc4WXhjcA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1y399g6q8cg0efzqdywrswp5uugsfeuxg54ptp3vacrvaknl5dunq22wt5x
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2RU5JZEFZcHc5Kzc3aHdV
-            Q3A0UkZrTEFsckJZS0huam4yZmNHQS9IdzFFCjBBV1pkdVFpZHBTQzJvZXg2VVB1
-            ZTRtSi8rWWZMMnArVUYzdVdMUlVQeE0KLS0tIHlwMGV1dlpWVFc1dkttWEwzV0tB
-            TExrNFBUS3o4MmdHKzhDY3hGVWRlQ3cKkNyv5EgoOv3afIxeJnzKpLj7Z4RrYqMV
-            kWbiOEGTWwKcQiEI5h0JY87VhOhe77AiNcLaMMKja8w7+ZQ+J7bHgQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkSnlXSUJ1cFlVNVdobVBQ
+            Z3lYMW5VY0NKMFlZOC94WWtyWUdDdnZjZFVFCnZJeFUyWlpCbGdzOHpNbzdOcEVF
+            Uk9XTE92ZjhiVGNuaTN0SDgwU1F4dkkKLS0tIFdVNjl3c3VQaWY5eDUxRG9LT2w3
+            Ti9HYmplcW8vQnJObk5zU2VjcXlwRGsKDhUS5CF7CXK8ZxdJ4qpZx2ZV8LAYsiUw
+            x+W8bmsyUlMRGX6qxi/U834t25k8/49eDWkjQXMHvIO9oYXEUak1iA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-20T21:57:35Z"
-    mac: ENC[AES256_GCM,data:PaIfy0y5GQh5v67HpHTz/Cml3E4wne29LJDgi3GNeid4kxgtPnlPbnvjDsnZAVKEKi7X34kcApl1Y2BrdoMBEVVeqW/JhUzPxE0kWEkAaocEIeM5ZvtbpOtwVsppXHvBmafygKg5ag6Lm6Sjl3ltYQNpFuxatkp4JoB3nK8QxMI=,iv:OkOEAV4bWBFAwYH8hOOoBlMdiHYIKiqmeUHGJbg4bGU=,tag:yChVQma0Tyb97plsIU2Gtw==,type:str]
+        - recipient: age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0QW5aeEJnY0R5SmNnYldM
+            UTNZaUZCWDdMMVQ2bWZCWk5TZ29KVEhWa2tzCjdSc1h2K1cycllFbTZqb1VteHhs
+            N0l1K2hkem51ZGx3TlZDQ1J6SVRDR28KLS0tIG1UaGVBNzl5NUtocFNzYVlUWkUz
+            K0lDVE10a0hZZ0xQcDljWnZmc1U1L1UKyjf60ujEGDMJ2/RNRjT3y3eot83UOdKY
+            cbQBKcKrUHs2JeVpcFQk8jy7CaPXSGJePmp8jicArw1nGJvCReaGEQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-21T11:56:33Z"
+    mac: ENC[AES256_GCM,data:hJxB91k91sDyZjmIntzCakFnSiLr7+qBPeneV8RmPJBod8Z3cFwHJ0pv5LyO7wIFhleW2kH+NM8b0Go4uiz7G683wfc9QTUxiUh5tR92a4xK5QnoMQ5S/AgDM9FDWYQ2cRWutqIdMA/TbGsfrwNLCdiGli5N4Ie98y3BXlGyuIY=,iv:NldyFeAF/hJEdg4VVymtHEebfbJD/GaxGaP55F/vKY4=,tag:e709To5PwxJJvDPVJhJecw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1