From 93328de825fea3d611b109808923dc7ec2904374 Mon Sep 17 00:00:00 2001
From: min <minish@riseup.net>
Date: Sun, 3 Nov 2024 21:46:01 -0500
Subject: [PATCH] Revoke B keys

---
 .sops.yaml          |  5 -----
 nixos/keys/ssh.nix  |  1 -
 secrets/eidola.yaml | 49 ++++++++++++++++++---------------------------
 secrets/silver.yaml | 49 ++++++++++++++++++---------------------------
 4 files changed, 40 insertions(+), 64 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index b294959..8f4ffd7 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,6 +1,5 @@
 keys:
   - &min 78795D9EBD425CBB3E850BC45DF91852CB14CEFF
-  - &min-b age18c70wdd6kf9mt6fmn64kjcereww57edw00v7x3xrdxpgn4jfn4tszm862a
   - &eidola age1uqxzduupzes3tgfrrlret0n6thyldmlef60nqfzk689lmg6yayvsqpwxj6
   - &silver age19yhycdgqczrvttszq97ccljh684x3r7f5dj4p0wdwqsrusqlcayse0vsh3
 creation_rules:
@@ -9,19 +8,15 @@ creation_rules:
     key_groups:
       - pgp:
           - *min
-        age:
-          - *min-b
   - path_regex: secrets/eidola\.yaml$
     key_groups:
       - pgp:
           - *min
         age:
-          - *min-b
           - *eidola
   - path_regex: secrets/silver\.yaml$
     key_groups:
       - pgp:
           - *min
         age:
-          - *min-b
           - *silver
diff --git a/nixos/keys/ssh.nix b/nixos/keys/ssh.nix
index 9bcd42a..c628a29 100644
--- a/nixos/keys/ssh.nix
+++ b/nixos/keys/ssh.nix
@@ -1,5 +1,4 @@
 [
   "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBCZ7P/hl8DOMyTm5vGZuMrxBeSr2bmN2tp8zeiK+y/zq/fOi4rMIbfQif8KmaZ2UDTnpWj8DNfrPhfz6li1nzU="
   "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIPci/gIUGWdoiLXS8Nq8T6Fvh2Wtpxv6pnqyvbSWvzyoAAAABHNzaDo="
-  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2l/sOPaC4F79AhAR5gnqMdTydOi+PKGZELB/MKo9Q7"
 ]
diff --git a/secrets/eidola.yaml b/secrets/eidola.yaml
index 2f04b60..185a226 100644
--- a/secrets/eidola.yaml
+++ b/secrets/eidola.yaml
@@ -7,45 +7,36 @@ sops:
     azure_kv: []
     hc_vault: []
     age:
-        - recipient: age18c70wdd6kf9mt6fmn64kjcereww57edw00v7x3xrdxpgn4jfn4tszm862a
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4aDZmSGJyQmFoZk9TZXVs
-            YXVlK0VJWHZwWG1LREIvalhHcjJEVlQzNUFvCkRTK1RvMWpEMElwVDZzVkNWM1Uv
-            T0h4WW5yUVBMMk51Vm5IMGZTQ1U5OHcKLS0tIHM2eTZnSTR0aXNUMkR5T0dabmkv
-            MnhuSEJZN2tyZGFhTk1KSTFxOUJvTmcKwKM12n0JRdsWg3sVs24VFXIuYw9wdBfR
-            3AcsKepdwGQ1LbbruOCnQMIdGOF+DFMgtnfas9Ib4EehPG75/VN4Tg==
-            -----END AGE ENCRYPTED FILE-----
         - recipient: age1uqxzduupzes3tgfrrlret0n6thyldmlef60nqfzk689lmg6yayvsqpwxj6
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMZUY1bHYzZ0pzRS9JZ1A0
-            akVqbWROK1lEYm1ydlhxRE81SVp0aDlWYUJvCklZNmkvUk5HYVB0dm9FcHIwTnZJ
-            N0szYVphb0UySHhhendWam05UFV0MGsKLS0tIFFobHAvbnBpWXdUOXAwMlI3ZlVz
-            TFh0NU1RRGdaZkNpN1RIQmc1N3U4L0UKOALRjTetKm0UHKvhByDRxDzEBzoJh4l3
-            fDnOAt0z7ICfp5tqOXWtkD179DLlfsFrnlehiNm2l8RjtgYdgsYDTA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWZC9lQXJhZUVtTzFSZVM3
+            UkpCUXhzUURaWEhMaVNTTDExNmZjY2Y0UjFvCnk5a1RPd0lMMXRGK1o3ZEQrMjBv
+            RGN3cjJLeGY2T2txakQ0NWFaOGF3KzQKLS0tIDMzVUMybGxra2NjRjdzeExtb0cx
+            SDF1ZjBHRzBjdW1CUWFHL0pkdWpTZEkKNhQcpKiy0Wr5luzhYW3ObHg2cX7T/iKU
+            WLEk2G8QKb52FFH/rNE3cfE64EOx97T7B2YB8nX5CEC7rDuoDN8rKg==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-10-15T20:21:41Z"
     mac: ENC[AES256_GCM,data:UFxO3wb/gAg5hiYkp4lfGeO0gZA6F5sEv6jiwI+GA6BidCkrGMAaYLQm6wvJ9sPHANdzSS72oi+7fUyoQ1M7ukpocpA+qbpC5RjGWQusxrrJK+J7khSWGfP5X8qkJTxFs+FK1D2HcfTIPcwsR4LOHwK/chWg4As4aEgGHcUIZBw=,iv:6RE/Y24jIt5PVlzc8PHIYFCgpEt0QLNeXa0uAk4vWIs=,tag:JrBltUtb7hqr2LsJr2oXRQ==,type:str]
     pgp:
-        - created_at: "2024-10-17T02:17:01Z"
+        - created_at: "2024-11-04T02:36:41Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMAwAAAAAAAAAAAQ/+ObS2ffMDovxC9HXYLUyPiR8gAtaJK1g8C0tTAGS6s26s
-            XzfIzVfBVISCQ2Xp7X2rh5huZbFLY8gBR+B13WSOfVTnSmmGz5jsGDS8e8rD5rUN
-            dWaK/Jno2tg/KwRRgP0WXF8cUT20WEVV8D3iWM3MmwKwqQNHSZ4XwJ749jXQ/x8u
-            yiyme0oSTrOsxGQHNbu3BU0eoRsxHNsZU4nj3cOMpsFCRlOkSA1Tbb2SHA3vZAf6
-            UDk6/efFhzDyeDjh7mdunts4KUb0CAAavU5Mz3MoelKhVhcaJndrqRu2ZV367B3w
-            k4s6hpYDmkEvOHo+l6rwVG1bAJAEzyLIv//eYK9I89LCNzLWoCWL2sKMt+ZS+bae
-            pHynRmUxsQO6omDNRTIpl86n3oLSSztCFS3u39n/0M7j/fOZE8J3FQ930cMvGlOV
-            oR8L2lIRiCFb+1VH8BxladXA7T0QmaSuK3+LNOxVsrXIhFYzJHymzBeFO6mAmNK6
-            m4x5Y09AjIozrOzyXyXSpUb/CdNcSVpR9zPoO1wfBPK8BbqGloUhatGa+bIln+1y
-            Hpgub8iednvBgHlOSL6atp3vYbehhuQJr2hgnR9pdbwW84nJpZS8uxJwROweYyQ0
-            luLPl0QhE9Yo6oq/LTMALMqH249uD8ErRS1e2lzGuVGf/F6LR4GKOAQRKIebiIjS
-            XgHwTrNU/d3L65yG/CyBO1hVf79kdeP0+RpST6Dxaq3AkZaQHi7sfGlx9gqNh0vf
-            MNOago2CtT5eghLN/p6DlWVpB6GBj7/YpJkosuR9lbFqbiGCzLBHmKx2u1vj/f4=
-            =X4gJ
+            hQIMAwAAAAAAAAAAAQ/+OC1WDGVhxo/e3Oe412FgEKDI11knja2j8cdYMSGhdZmc
+            kIGkM8R3DUsnzd1U3ZOrDtqctVlyN0nDryZL0U5E2idYvkUdOyWROEvhqZhtjG5j
+            2RGjDeyVE3viXOmykVKKhs6xa5QXmsTLWq/tNVhdv/MDuC/JW99hnTZ9YtkVRXIz
+            3DZbc5NdDEPmHsqwVWbjy/k4jU5iqe3SsEYHlN5Sjl81L9YBeqISjE3EVONb7bHj
+            45IhAq2Ngk4j8sBJ9nvX0MyvnRfqw52BApfI3KYNhH1Wv67s1K9dQ3S81Z7bj0K3
+            xAVKurRoYdphXzcp2H0L5Kp72457s8ntzsTZFlQt3eD8QWNze2EyIDkOj75I6VYB
+            qgE6ZmVfClDegnqiG9y/Jdir95RNchwNduAno2zAbReK34gku8CzCmO77jnqnqrf
+            kVfrAsKD/ura7xKB0gGkCT4LfWSOdJcL2+VlN9JlLHvSOz9CCCfwIvDaTNiUrEGF
+            7lIvKpNk8161JE2L/8L+N4950zLxPSlz8Z6wiLKGfqP145I7NXWswssqJcU+8fE/
+            F78GMd3wOXZ93rjPzEpYWlpFheMuXzBsnlnnvlr4qP0/OCF6oeBHfERuQW/ZXW35
+            cjPqzlKfoaztMYltVarkgqB9HKRLm0bvBVdfH0rLlGVdqk0Co+yvauCK4I/joAnS
+            XgFvPKOSrylP/awO3cz3Q0QhjmJZ1Y/FhhK/1MOIv176WIJg1NfrF1lycxOI05hy
+            YuRo6zs5UNetcPul3bOYvCHDowhxndyJSMllE1M7Kpo/pn0vcK9Tkoj7e6Vwm5E=
+            =hGwT
             -----END PGP MESSAGE-----
           fp: 78795D9EBD425CBB3E850BC45DF91852CB14CEFF
     unencrypted_suffix: _unencrypted
diff --git a/secrets/silver.yaml b/secrets/silver.yaml
index 6dbe409..c217771 100644
--- a/secrets/silver.yaml
+++ b/secrets/silver.yaml
@@ -12,45 +12,36 @@ sops:
     azure_kv: []
     hc_vault: []
     age:
-        - recipient: age18c70wdd6kf9mt6fmn64kjcereww57edw00v7x3xrdxpgn4jfn4tszm862a
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYUXdKL3VzNGt3b2RSZkVP
-            M0FybmNHVVQ3RnJWVDVVSVlneVp5V0dBRTBJCjFxd3lhVUZxWGR1cEZnNEpDMmtm
-            cElyQ2dJajg1alV4NXpKMlVwdVNSR00KLS0tIHRsWTZWUk4yek9MUmY3aEluWDF2
-            akxhTjc2QmhuUjhBbUFZcnkxZGtiSDAKrysgQBNzk0KP1ljVN/utvkCEZPd69T18
-            f8aJkfy9U+PuWYBMmZwpTp5a2AZE9R152Y5CF8i60A4vyRR9Vlfsyw==
-            -----END AGE ENCRYPTED FILE-----
         - recipient: age19yhycdgqczrvttszq97ccljh684x3r7f5dj4p0wdwqsrusqlcayse0vsh3
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1em0vRmxvakFmV1A3QUVN
-            M25TeGY2OGJBZFFUcE0zUmhBL3RrZ2w0aVVRCm55em5paXZyeFFUdjBEaVBMTnpT
-            MVNiTFEyeUpGL0dUSGJ5QUhrSm1TcUUKLS0tIExxN2Y2dW1FSVAxaE54NEMzOWhR
-            bEI0VFlwM2JwOTRLbWRBZ0oyRXNzQjgKcw2FrWl5rnx+quAcx3rv9A5K0whluqd/
-            gH4Cp7+S+OzvCNNCJl0iGrcWM7+ci/ndI9Yfq0AxLbJwcgeKMyOAhQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuM3BNazcvRmtuZjlEeGN0
+            S3l3alF0eno5YmFVN3lTK3hJdUJiM1JnRTJBCmhBRktrZ0N1b2hKTzhPUURoRzRs
+            L2FDcU5BYmdDUVlwWVBEUGtQQ0FnMjQKLS0tIGNBNEh5eEhTQm96TVV0QTlYS0ll
+            SFhuV0prbkJUSC9uZjJsV1VCTHVPSjAKfH148Hh3CDFCE1BOgMlA5ROVVoiO4x6+
+            fpkAQO4rfvcdpi+1NJjAOp0tkxOV4gApo/B/Vd3xPCtR6rVky5/0XQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-10-15T20:33:06Z"
     mac: ENC[AES256_GCM,data:0WuZQxRXih9XRWGwT01eiEppEIPfGOjSpKEthmY3v+kumM6ydpueCroxqIuQoLXke8eKzZ6Xg34C2AvHgCdkHTgYbC9wGf9h8cV7L2xD4F9sLQ2scGThCynG0AGcLRXm152wzSdR5dGr1h4p49WO9XGbLEXD/JzfyPIcENDTPAs=,iv:LIPHnjWJYPlvs+VBvrRpczYD6ncwqTs1Jyz+VdWFaxY=,tag:Cdu7pKIzqi5H4Qo1eW66HQ==,type:str]
     pgp:
-        - created_at: "2024-10-17T02:17:20Z"
+        - created_at: "2024-11-04T02:36:46Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMAwAAAAAAAAAAARAAppvGqjrswhXW9xqomcc92TG1KQIh72s8X16KdS+jG/zC
-            E8brzaDeRWUvS4mEkOFcSQIKCrg26tnFgE1HyTLGeQR8SghPQpWeQUKhiJVmPPkt
-            rDmXhCwRrgouFrBtFjOXZ7sQFACaGyVydXQRlNJ7rqB6AY+QgdRtrZO/UccEg1rY
-            Ysx6yi6npAYIe2dcacTrk/jWsQgojeExFKw7w3cf2wtHft44PGl2VlSXZWcnMrST
-            alui+ec/TGi42RnoTCbST3YC5/p4/qu7wjxroJfGExApfAYPCKUtvoB7a9XUkdw1
-            QFhPjcfTNCyLKhF96yMm0rgajaCNM8mcljy3100I/5rpYFv+9MXUGKX4LwucgQ4q
-            9yQvKjgVaYfCOg6e73n7fZaXGuferzGYeIZLmCu7o5Zy418YxNlNIFO9m0DhZqfh
-            Te0482X/1yPIE7IoC4BfxFe/YQDc7iiYRJXNIOjPIyNWJnj8YTfu+t/ojJ7clcac
-            RzW6zEhVZrFkZEOSjU3InCgIOvXyIPu50FpWUD6kNZaFo12NtLYcf9cpiiCnaCG0
-            gRtgTs0vEToB75LrF/dcCI8tB5BcvaCKYe2h7/5+whm/Fq3fJgWbD17htlJkVHpg
-            A2kaW/Zeg+TEA9ss4ZDOmtl1ysZuUnLhlcN9F8Zkwch06yR6fYYLCD/duQQf3v3S
-            XgEIdNXjWtEhIl8wfFYgXHUk8IR4BBZ9XM8M8gN0WHveZD7ci39V74BpjihVrCEk
-            FpWKoScmlz+32klKWyQ+HUT901SogXlWUNpekyEtdwqNn+FDsrOT3gGPpURQct0=
-            =fgdr
+            hQIMAwAAAAAAAAAAARAAqv5kOfnA/e8jeXdTj3mYZMGmfhlew/MYmxZmHlov2RRm
+            VhExfdF/A4uDh8vlJAMBKEDUTWEThfQYS9KfTWRu1JFSSENOx1IONxBIVW5LTTlP
+            EkmmNpD6z+xnNgL8xEOXEwn9CMd23CHchej4Sg40MbDGV2U5riYyw091As33uSea
+            Fai55Aw4/Bd+NA46x9+wgy94I2yp6zSltfjWfORmC7sk9gkzj5pt6OuCq0RPbti+
+            7i95TA8MMqDP/igi2NpiG8CCfh+W5G7gvfPxmePsg5fw05I2tr+n/7ByTsSNqaKO
+            CMB8BwNeVSLguUKnTJrv6B+cQugYEN+hwvS/xTUVBgjKVuJxhoLq8cYbS9EjMrwQ
+            8rJDacCKsgB1m04DEZXotPsEaD5RBb4mDJKWNqeYAe2kNVDT8W93t838ha8Q3XMQ
+            WGQZdAmEtha0Lg5MNSq3AK92rWWSiMpQPzab7hJOzLPpBbedy8MIY6i5VkoN+fpR
+            0dqjyZjiIq7LTMd5R50lpLefuj3PvbHhKOwrEGjOiVH5cAhy2O/NonLgbdqFLUHo
+            7Sg7uz/zlsw7I0KUnO2qkl8Vl5wVNfUzDgY22WuLFmWmNr3UDozpjbbJxeAG+1Cm
+            3nnRUfbQ/LIGiIyZ+i+r5tRFOp+LvLtZZAJMHcWkaC7Q/fLGMJDxvyZ9Ox18jRLS
+            XgHm+Pdhd8eLU3+qbb7VpvGI7sM3YAN1rfVUmdx22v/pdjoZLPxzErxGCGE/UJmb
+            xbiyvwjBVdzpZ52JBreLoY+mes75uc3MAWAKJfAJEPA0CyXLHUtKXEvMqNLsjww=
+            =hsHI
             -----END PGP MESSAGE-----
           fp: 78795D9EBD425CBB3E850BC45DF91852CB14CEFF
     unencrypted_suffix: _unencrypted