zaphyra's git: nixfiles

zaphyra's nixfiles

commit 678da20321b71593a3fb19c4953f277aa1016063
parent 2e2a4e6e1c2f28b424c88131721d0b10e29ec4a9
Author: Hannah Izzie Gesser <hannah@totient.eu>
Date: Wed, 12 Nov 2025 10:22:03 +0100

Fix sops creation rules
3 files changed, 65 insertions(+), 54 deletions(-)
M
.sops.yaml
|
4
+++-
M
secrets/common.yaml
|
82
+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
M
secrets/zaphyra/sieve.yaml
|
33
+++++++++++----------------------
diff --git a/.sops.yaml b/.sops.yaml
@@ -5,19 +5,21 @@ keys:
     - &huntii age1laajqafnm4ft2m73wq7yqug4ts04ddn59wlqs4t30upeqa35dpdqu8fu3n
     - &morio age1wpffcr5p88a2x9dzx5v3sq4jqurvygu94fx773n229fqk4p95qzs840cmn
     - &novus age1tud4lvpmpx5nqceyp09ls9ej8l80zlh29d8cpjxcajfnnyy85fvqs63snm
-    - &pratorum age13f7t27x326hamq39qps2ygrftq3ylyn2nx8xga2kqaxgra2p748sphmetv
     - &polaris age1qyqy5we7zua06ppj654rgd6t7kyw3gem6hnexna98j60klyus4zq68cjlz
+    - &pratorum age13f7t27x326hamq39qps2ygrftq3ylyn2nx8xga2kqaxgra2p748sphmetv
 
 creation_rules:
     - path_regex: secrets/common\.yaml$
       key_groups:
           - age:
+                - *eximius
                 - *huntii
                 - *morio
                 - *novus
                 - *polaris
                 - *pratorum
             pgp:
+                - *void
                 - *zaphyra
     - path_regex: secrets/eximius\.yaml$
       key_groups:
diff --git a/secrets/common.yaml b/secrets/common.yaml
@@ -11,63 +11,83 @@ environments:
         grogHome: ENC[AES256_GCM,data:ASt5/wqH9c1yq6Ig6PAFEHwPEKCsigIDc+svk+H00jwdaFHqtivk2CzZKPfGe5U/keAJIQ0YsEFkuh/637LUCTz0U31MP7glshB+Fc5SBpexfY06r8IeQNyFNGMX,iv:hThh6hJ43LUfzZfprMgu+AtE98YdKuzj2/9nCmGkQJ0=,tag:aomJeVLG0Z6WaYKqy/DOTg==,type:str]
 sops:
     age:
+        - recipient: age1lkdpl26w3wyaes75hg6wwc2p3puqv24d4xyuf5xc9q9u9we0jq6q8lvz8f
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxWkJETUpKRURGYWdVbHB5
+            cmIyU1RVRWs0Wm9tc3VZU3hNK2I4YVRHTlZJCk13YWxpdnpsVENzays4cWtPRDFT
+            Y2pCVGpZd2tQSjB5RklDRW9wM3NjYlEKLS0tIFJQWjRmUDE0TzNDQmF3TWFscndl
+            c2E3WXozTzFXQzNTaG1vYW5Rd2ExVVUK62bq/q6D3wkkwkgAFDl9//Sc7AL82DAA
+            VGXOX1BgCtXZCNC5StfXcLmPkk5FnMKEpA8qhvwc2xXxWLFDX6sNkQ==
+            -----END AGE ENCRYPTED FILE-----
         - recipient: age1laajqafnm4ft2m73wq7yqug4ts04ddn59wlqs4t30upeqa35dpdqu8fu3n
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFays2OE9mVVA0aytkUko0
-            M0pYbjlSSUJHaDFFdEN2TzFHZjhMa0FWeG5nClE0MHBWenYyNWNtWVdKRllUb1JB
-            TTU0ZEhGVkh6ODVCUDVEOG9aTHpWSkkKLS0tIGx4UWFDZmJTbkZyaTUyNjkxcTNV
-            TkVxZVFCK0g1djVuU25lY1lzdkhwalkKxtyC6ayV7qCXniEYWdjO2p3b/Zgw/NM+
-            /SfUrMhH9NR5Q6g2hzVxcWMA5WfJVR19ZCQSafchhRQxceMNGVXADw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVRDNEeUhLTEhjZnRtRk1G
+            QStnOFYvdWJkRVZ1Z2tCcE5SQSthQytNNVNNCk12QUtuY1dGNjE1SWhiU0NSYUxn
+            QTVTV2VhbkczbFc0ajJ3bkt1OTc1NVUKLS0tIFZEYTVZczlTNWkva0NZWDQ1MHBC
+            TmxTYWlpd3pVcjd3RWVidWlCaVp5TDAKcSXKP5gDTcrNWwq+XT6jEwfWjk4mtjNq
+            h2Mc1R73aMd/PRy3Oe2k8lJeK2+CQh+2x8sWFgsPQUeBX34idezCow==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1wpffcr5p88a2x9dzx5v3sq4jqurvygu94fx773n229fqk4p95qzs840cmn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtWkZlQkhKU0IzeW51RllP
-            T29YMnF5VE1YSnFDMEI1V042S2E4MkJNYmd3CjlEVVphS2FaNDRqWnhWZFdvY0Qy
-            cXdMTitobHNFeWJjd2tVc21LVTFNT1EKLS0tIEZrcGFuL1JoRWZPcnVGbFMvUWlv
-            VFFYSFk4alVMUUJvQURUYXViUE4wbTgKCPOwUHEZE/hs/eRV9LC8ixnySNZT0Q3S
-            Ia4YrZH47lcvMX0pGYxJoHv5lpBA6VdVDbGxpesLu3K6R1VpHFcfWQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWN1hKZGVld2RFNDFZOGxq
+            K0UyY3JzMWRXVGRUc1RBdS9JSVpaRnBQb3lnClNUQ0tDelhpcXZIbmZQV1lOdkxQ
+            YnBLbG1YTWljR3dkR29TVTYzMThyWFkKLS0tIEpwOU1XeThETTIvbjY1Ri9RYlpm
+            cWN2NEJQNGk0T3NzWmZqcW9Xb0w1NnMKl638/KMXr1VHJhuYAWeoECEDC1iknlGT
+            N3tDMPTMfnI0osv+1Uw2OlrSO3+b+MQs/xht9QWDJNn1odqkKjphUQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1tud4lvpmpx5nqceyp09ls9ej8l80zlh29d8cpjxcajfnnyy85fvqs63snm
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZb0REUk1ucGM3RzVCSFpL
-            aFpzQVA5UENnZk9kT00yV2pLTkczd01TQkhVCkRDY1NrWXJPcmdzb0xucTFKU2s3
-            SHpTWVA5dFBPUVF2czdYOWxXTjlESWcKLS0tIHpydTNXNk9jd2xENXlVSi9IWnpt
-            RUFTN3NCblZXRmZ5a3F6Vk50N2Fkd28KpHRRj39B0pa9ox6epEfhmVYgeHXZEkTF
-            d8IJU4hqRQpN7D6lxSXQm5ky+0afUIaHvkSgBE8ilJKjvM0ZFFnpOA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFS2xnQm5WOE5YNWtteGls
+            dC9FZTg5b1p1NnU4WnV3UmtzRUJhMFB2cGxNCi90Y3RWcE04SytlNDNBc0hVdmw2
+            NkFNTGxaNGNDR0VobVoyaVJRdGtZVTgKLS0tIHJjUURMMXRkZ2lwOVpzcmI3cDYr
+            VXBmUENTd3VsQThiUTFRRlNybCsyNU0KbqsNDTmU6U1WUhakZl/n7ZX945O6N8s2
+            Yj04q92AbhvHHqZmQo6EjVdytlSTSy6AJaGJCvwoHOPMmntsxD1FiA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1qyqy5we7zua06ppj654rgd6t7kyw3gem6hnexna98j60klyus4zq68cjlz
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBINkNROExHY3hkd0xHSk9V
-            NXRYSHZRcGg0S29Xb082MzJabDBmZW5kbVVzClo5Q2ptbDlmNEZTbGFDUWFLL0tJ
-            VHRlV2tLaktmak8yaFcwMEhKQkxab1kKLS0tIGtCeTFqUGpRUy8yd3BLUWQwbmUr
-            c3NmU2pWdkgydFQ5Yy96YWIzaldydlUKwf0NNkiFDweXedjs4QHGnNTQw0X2EtH1
-            LvvbKVggRkd7MLXGsL3j2Ovaip9F3gfZ4xfEdAUXJgxnhW77qVEdOQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzb3FBUzlRNFdUd292MHpJ
+            OXZzazZRdDN6OGFnKzdYdGZUQUltZm1xbXlnCkg0eUt0aW4yZGFid3V3eVovUlJV
+            UGZiTjlwL3FIbTZYTVl0R2ZrUDlDKzQKLS0tIG1yYXdabldrdzF2T0FNSm1FUGdp
+            NVdiSVpsT1VqUUgrZGVDRkpZVmxPQWsKGQ8b3Ih5o7KPH96i/FzIFiKJ9+u06NlM
+            t1wCDNS9mVPFaw0YwxQCpqrzvMCgWh2IAlkk6zNw+6/X30xNMQWX4g==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age13f7t27x326hamq39qps2ygrftq3ylyn2nx8xga2kqaxgra2p748sphmetv
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5WDFZaWs0Rkd4QnF1Uytj
-            K0UzM0k0bnlBV05kQmIzWkRYY1pObVl3bXlNCm1RMHUvb1ZISTI4bjZUcncybzg3
-            K1dFWE56emlTQ2FHbUJ0MitGdmxGS0UKLS0tIDd4UnFJaDNXY3ptUUQ0TTlGSnlE
-            U3c3WEJOdDQ4dFlIU1VVN0h5akZvVW8KcRX3hw529g7RL8pMeb0IEoDXMsfatUpR
-            qcU0GedBYmbIUWyU3zXEXK2U05s6cn+03dHlE+0j50sPGCkVFewDhQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsVDhuKzNJR1VsOUpmcnZ4
+            OWxpNll3TUdNTG5LVFZTOGdMNUliTU9CR3g0CnA1SUtMTkVJbFVMekdHS0dMempW
+            RDMvbEwrSXhGSmpuaHNqYUFEczNjSFkKLS0tIFZUY3huYk1VZTRIVjNvK1RzM1JQ
+            RitwSFhUeE9QUGZzUzhvSlh4ZStiNmsKz/3dzIqR3kW7ywu38Rlh5pZo6kJqDADK
+            Y6WwzRLUcAqR3HEzh82lZP1Ll/2pzjk7yobtAZ9mWqKbINNn3v5EwQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2025-07-08T11:24:38Z"
     mac: ENC[AES256_GCM,data:ZDjPpLKJlu/EtuL+SSAInl+4aKkGKH1QZRvRYuhQLWuL3/Vcydjv5aG2Fy6F73o7NlMUubixufdgsoITpH+SNndtH6rEQkl12Oo0H7MNGTdecJVjXtpLmHdmlVZvV1binbzOSfD+SRzXILQlzKq/jBqXC0TW0YUgPvIky12dSCs=,iv:KQw+K0px71dkdVpKom0+tV9CI8jczkLrd4HUuTkdkKM=,tag:kH2DYck3tVZtP1o6W13wDQ==,type:str]
     pgp:
-        - created_at: "2025-09-21T19:21:11Z"
+        - created_at: "2025-11-12T14:50:53Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4D3Q9NEB9zpDESAQdAaa13SU3jdrSGvu/244UyRzCbvr/Eh8gSTHeS/TfhIDEw
+            /lftv5V/E9tZu7WS2GVsgEiI4UbzjOh+U8iB7e6PHgHsdR7/+1e/IKFiolmKDhcU
+            0l4BRod9kuNlcmA/UMr5StEGZDsaco/E7xNyEPBJCRwe0mPgk1l3tnZnT0zMva7y
+            Z9e3DctKZXrZNknG0dFdeJ5kDtS/3a2vYLOf1ENJWjs9KM0bNyeNmyZNo/nrQw2G
+            =D3fg
+            -----END PGP MESSAGE-----
+          fp: AB27F5D1136B20D3149FBCC00389451731A3ADDD
+        - created_at: "2025-11-12T14:50:53Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4DfdBfTP3jZzQSAQdAcc6eEZcZ+UtBmv/HleKF298Spdc1oVdejZQvRcHNnTUw
-            w5Azf812NC+R1Qd1TYZ0gpwqlOLM7SKbm/c6K+ys8jYuXkRE9jxKHFXDJKZJfJtE
-            0l4BLbLtsjhs5uIZSomtgabr/DChsJ3eMTCFTNFt8kArpXCNjlB371i0Dk3WJit2
-            0ZGtM4zljVeCPKd6y0SA9V8DrponoFS+6m6uxIpHMaeDNLMa0JL+N08uJ+bjTBV/
-            =T5Oq
+            hF4DfdBfTP3jZzQSAQdADDzxA5hRt36IL8K/U3aA4ZCqlhVVjdi7GdyL6euCHhEw
+            u2AMn3D0PRw1TU8A4G64EfXvvOE70Z6RB3VIhw3XYgCH8pDytvJn85FtfhQXfBHv
+            0l4BVUs+srg7Glm//UakQrjOzf4GnRjKOm5iIyuBBdmsRHNqMUTHdrjLHjjPhULX
+            sgRnG0A21eLwci2M2XycX3dfG+ZAFOQZlCfyQjG1gZz3rPbN5WGZCx/aJ92i9mdj
+            =fUsd
             -----END PGP MESSAGE-----
           fp: BFE6386C8D66BCD4DAE14FC895F0FE7CD7E6A022
     unencrypted_suffix: _unencrypted
diff --git a/secrets/zaphyra/sieve.yaml b/secrets/zaphyra/sieve.yaml
@@ -4,36 +4,25 @@ sops:
         - recipient: age1wpffcr5p88a2x9dzx5v3sq4jqurvygu94fx773n229fqk4p95qzs840cmn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsTDJSRzI0ZkFCM29lMmJj
-            THNMb0F5SklUbXltTnNjT3pMd2hGZkNBekZzCnlrTGFpdzBucThCbnp4VW5qTisz
-            ZDdueG84bDhYb28rMjlRL2pERGhLbnMKLS0tIG5Xd08yL0crK3pRck4vcC92Rkwr
-            WlRxTDhwTmJLV012aXRLTDROSVFmL00KjqNd3ZPDmVpRvltq7WZLXRdznFaMMXT4
-            DXucNg0l4L3eNGVqHj7jylpK/K0E8qn5zVTI0BRxLojonQAikFm/2w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzcXc4d1BxcER3cVNGa2cw
+            R21WZTJYb3dnM0lXOTN4cy9SdGh1WGl3eDFrCnpib1BwdzMrczZiZ3hiaU9qTEtC
+            bVYxT1NURWdMdjhNMkFSd0JWM1RibUEKLS0tIHZza0ExbHBiK3BOSGlHaDIxaDlp
+            MmtvS1VYeWtZRFRxQ0ZYWksrb1hLcDAKwDMF/ps6CsJFZQMbC2xluDXNCvoy3JhQ
+            HIJ3MhE+t1072emdkdMV32myvhLDrqjgVRq9emSRtLoqJi7kGgfO6w==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2025-05-24T11:26:16Z"
     mac: ENC[AES256_GCM,data:KQP4IvHkCVWUYoWmvThQ6MageJzohS/O+039Kg6MvPeWiLbPdIEJH9GHG1bvXZ47Xl3cPVlQwJBQ24g2iqYFkGRnwVpnJ4mz2v2fp4JaTP8DJdAAJS4Xl4pseMsatvbFL8ZVNVBXvbbbYGvWzE/muMQv8xZ6em+AwwACNjtPWV4=,iv:CJIeT6eYh1Oku4N6lC/ESBiyPtE7m2ffka1S9x2YHzU=,tag:HKkRE5+VSgxrn+QsoKykKQ==,type:str]
     pgp:
-        - created_at: "2025-06-16T13:07:16Z"
+        - created_at: "2025-11-12T14:51:05Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4DfdBfTP3jZzQSAQdAwMC+8SP6GLKtuM/48DUHdLQB4d+eOEEcQjhkf1ubPjMw
-            OIijBS1UWxcX12Cvsq2fZ1bnJYGGdN7fkrwGMKKiCjBAK7wuqDJcuAZJYPP4nzS0
-            0l4Bk8JWqyXZ0G3sRRNAhb/sbJYNwB88igDpxErqiSvjhwlHxSxqRvyrOuwptYYa
-            vD6OVzmiD7nvXv4spNLWmoeFBS8GSH+/IYObwz06/vJbKvieKRR10gkkhNnHh7Yx
-            =D8wp
+            hF4DfdBfTP3jZzQSAQdAxIb5Nel67yYrxtBuTHQI7s0dgJglBNMISS2HP/3HfCIw
+            DOhNTgFgf3bfDKH1p/7i6YHfMn5CI9jQTtj1alOdyzygioutYaNI6DJU3qhD2hZU
+            0l4BUOBSWFxsLHZ07vKBu+j89ryvMPkbWoNBv0I0goSVN1JEJDFDxTvcUgXctq0Z
+            DESk+850m1QCvezSnH3cC/LKZ3ePWVqPdHz6UbfYFjdK+FhY7CMqY2iTYa23ApSQ
+            =//B1
             -----END PGP MESSAGE-----
           fp: BFE6386C8D66BCD4DAE14FC895F0FE7CD7E6A022
-        - created_at: "2025-06-16T13:07:16Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DaBViTd9dOpwSAQdA9w51QzHk9EFaruOqirieCVTb76SxmnoWdDbS5GTsay4w
-            LeR9CoG+EoIoUFtxxWJ+1KjOVVnNj02z2LO8AkNKdoHc6JEHAL02fXM3O5FwBzzj
-            0l4Bg7yI3fD7iU5Aa7uTjGRZ3K4oS/abbJKDqnMOoCMMwW1Ipk2DjH1DdkW+JOi+
-            ueQLjYxjDPRrdxRnLWiOVxCGke717hkkZOweCvwO8Vu+AhoZhEoXvVlE4zeihoZ1
-            =K2tb
-            -----END PGP MESSAGE-----
-          fp: 321EFA52CF155E9FD646279E0FB0CA11985EB5F6
     unencrypted_suffix: _unencrypted
     version: 3.9.4