From 249365255cd9da7dcc01a72a38fb009e71ae4a57 Mon Sep 17 00:00:00 2001
From: Greg Burd <gburd@symas.com>
Date: Wed, 20 Sep 2023 10:17:50 -0400
Subject: [PATCH] use Keybase(gregburd)

---
 .sops.yaml                |  2 +-
 home/gburd/pgp.asc        | 74 +++++++++++++++++++++++++++++++--------
 hosts/common/secrets.yaml | 45 ++++++++++++++----------
 3 files changed, 87 insertions(+), 34 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 5e34371..7860589 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,7 +1,7 @@
 keys:
   # Users
   - &users:
-    - &gburd 6423C518273734713931CB331C4814F03CA7C161
+    - &gburd D4BB42BE729AEFBD2EFEBF8822931AF7895E82DF
   # Hosts
   - &hosts:
     - &loki age1udt7tgf8pa0r278z6xwrzndg5w9jyvph8p0nycpqw3d39aal5u6skfv556
diff --git a/home/gburd/pgp.asc b/home/gburd/pgp.asc
index 72fd8f5..79b63f0 100644
--- a/home/gburd/pgp.asc
+++ b/home/gburd/pgp.asc
@@ -1,17 +1,63 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
 
-mDMEZQijxRYJKwYBBAHaRw8BAQdAeaUsXzNK6sHpS/rnOgAcq1dTO2c0vUQpYwaX
-zf1LUR+0G0dyZWdvcnkgQnVyZCA8Z3JlZ0BidXJkLm1lPoiTBBMWCgA7FiEEZCPF
-GCc3NHE5McszHEgU8DynwWEFAmUIo8UCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwEC
-HgcCF4AACgkQHEgU8DynwWEavwEAtavH/g9WQyi2n5P1X8/7cyQxuN4RXw0nNVzn
-MvvKBFwA/jJbQP0z2o2Y/CBlQxaL8k4kZirK8F/s4b0YZzlnZPwKuFMEZQijxRMJ
-KyQDAwIIAQEHAgMEiI+BSH+o5KfgSeynQeq+8ROAJO6hatH1i9wjYH53c22nLC0D
-rgm4TGKUJd/8+E4qs4F55EfFLukBTE3ydGHbkoh4BBgWCgAgFiEEZCPFGCc3NHE5
-McszHEgU8DynwWEFAmUIo8UCGyAACgkQHEgU8DynwWERHQEA8FmOqSuwG35zqBGE
-/Yz3wF0cQzoIgZl8y7fqJY5ynVoBAODrKGa8QGBlbModBeQE4ziFKu/pc7Ef5EIr
-Dft84CkAuDgEZQijxRIKKwYBBAGXVQEFAQEHQIMBs5gm9pwgEaZdDx0oLi5WPoVv
-s1APak1JIoDkCKxXAwEIB4h4BBgWCgAgFiEEZCPFGCc3NHE5McszHEgU8DynwWEF
-AmUIo8UCGwwACgkQHEgU8DynwWFV5wD9G46FTyTBCTanlM/QxYbmGdRotuSEWgRl
-Ck+fxbCwrlcBAKgkBd5d6tXPEkX03CGsvI2utcithAORehhNwnNjckkC
-=DYCj
+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
+=yrZE
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/hosts/common/secrets.yaml b/hosts/common/secrets.yaml
index 0671c92..1901cae 100644
--- a/hosts/common/secrets.yaml
+++ b/hosts/common/secrets.yaml
@@ -1,5 +1,4 @@
-gburd-password: ENC[AES256_GCM,data:ldXmHftA4POy,iv:8NLcj8hrZ9WUeqkDLctgO5G9DiK3Abwu5Rk9jbrFLhk=,tag:326N+ckbPOKi+LZsgrxusw==,type:str]
-wireless: ENC[AES256_GCM,data:I3gTVu4geDms+Q==,iv:Uxjdmx/fi6mA6xt/j1dNajR4iJqUvavY+dhMZF0+500=,tag:P712+4p3lstJwGaN9DM7PA==,type:str]
+gburd-password: ENC[AES256_GCM,data:I5m5CQOUg8fu,iv:z2cVY5qwht2PjfpReA3dIMj+Wp8mTkQ0SxLdrkk4aMU=,tag:LYtuzsGLNiXbKlKnstdywg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -9,26 +8,34 @@ sops:
         - recipient: age1udt7tgf8pa0r278z6xwrzndg5w9jyvph8p0nycpqw3d39aal5u6skfv556
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxbTFNdmdQRGxEdDFLbGJH
-            bGcvYklVOWxEd3NDWHJxUENDaWhrZ29VQVU0ClFWbE5Fd1RwUWRLM2NOdXh0MXlI
-            MWI1TDZjUmsySitheWdZditORml4dFkKLS0tIERWTUFyeW9VK0NSQlI2Nk92MmRa
-            YmxhVWhMM1l6R28xL2NLLytBWkpvVWcK1SZNdwTA/3/wF+fzWOlwqAmQCgKJh+98
-            L5sVicaj0ns+G8ZsqEPnOYklHo1o0G0GpF39LOx8bDpGAQllHRpsBQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNZkY1REN0bG4vMUU4QnZX
+            OXRKSEVIbUVsbUJJWStpZGVqaHRBbDkxKzJNCmkwMlZQL2ZXRVRaeVY3Um9FNzRK
+            VWZOMFFYeDR0bkRzbzlBQmRKMWJKVUEKLS0tIHUwVlhEdVJsQk91ZHEvdHptQ0hN
+            MHB4WUtrT3VTbDYyNDl5MU90aElLWVEKWS/yw3f+ufClg9YxfU2klclQBkdSRDf/
+            3dxE6baW1ppULgxcSLslXw6Eh1xGIL9jk12qsBzbYtt46PKIbR1wyQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-09-18T19:32:57Z"
-    mac: ENC[AES256_GCM,data:9feL7sfe6LOXecCCI5C+VKe6i6xMjWMSnP4i3rb2y1a3+/xB5575RPf3nZUbzUz9OwZIDUiydO9nx1vPHQPFcwz/gfdPsNbu0q7AuVxa9RhDEW3+vrBiGQDWUIXA29yU2XN4QYqwwIDq/kymBXH48CBCgj3RBfCBnOfIkvwQvu8=,iv:CIyGMjvT31ZkNj0BTs2euINxa2ihDqOD/ASpDqFo4Sk=,tag:zZQBqsGAcDc3ezrBhAqxNw==,type:str]
+    lastmodified: "2023-09-20T14:16:57Z"
+    mac: ENC[AES256_GCM,data:eBnbdLDmMRfWpZpAd4jdImXCJ5c2FavDFfVDCzUVDj9q20LHzFUc8+EiQMMOTUckLMGJO3gCtpYS75KuDZ3B9AtiHhR4T/fdnKcCnz4WizTRocFmMeLH4HF/ooZiw0CXqyFoYKaQjsIBcnIooQf6yvP2D4f2xHf/e7b62kqOELA=,iv:R7oeGo7tq2uSFV/i0X0LmmhDxQNRYNYGqZPgL9yRaPo=,tag:fJRnUEM06tD2Kew37BcYHg==,type:str]
     pgp:
-        - created_at: "2023-09-18T19:32:56Z"
-          enc: |
+        - created_at: "2023-09-20T14:16:57Z"
+          enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4DboE6HHw4Rh8SAQdAVnPfBHrVKJSxVWOUxe/Xxtklt2fd/fwU5grY7JCvH1kw
-            kJC70RC7Wcgx+gkqbkPAZqfozY2ScrC7lgga8SRNCyjaunVfQjlO6ZS9d3XhLUOr
-            1GgBCQIQeoBRXoQHjOht18H9f4ZdKzqJ1R+sPiU2qakjDfVkoo1mu5LRFYUOz5tc
-            633XPXbvL9Yi/hec+kSkynowbnpQtq6YfN2w7HASoBb5EUTdcmzGcflqoOhRNP8X
-            uJogC+lhlySzDQ==
-            =uZkZ
+            hQIMA676zD/Ela+JAQ//YlUu5fiuvNJ8E1vjhS1cP8JTMTqi/pl/tRQmv7EaHGIN
+            /CJz8AAE46QkvYHeTUGSa78J+au++AhDzVQqByLD2nlHEGXgxPNWlwQQKz1bOKMt
+            9Layx60gQ4+cPJq3O/aXsNy9MbpT2wgBbAGcFjN4dyYsDLIW5+yUAEzdODJ76tWB
+            W7MIj1aAyK4b3RqJiag+KsEYQRgdJ4zHRhrWFQU8NQzbgjNi1Dw6AscNtuguuQlC
+            JM3c9jv8t5+wK3GHkY6+YgL1fvlw0+95usWDj5bM/LBqgix1GL7nUzkM0wd/JaUP
+            mfEE/6/T3BHb34WTCe77NY1EpHhLUhpu0lIIqiYaXl8H4sCKe2Ogo7UIe0iAYfDs
+            0cUls47OL7sQAgUJa1UHjjuADfVACHsrsP4HodPs2ABcq9+dmEpr8FapIlAGx0Eh
+            UunYQKDjIO44O39HXLNWs3uWyGLN79/ZNQTTafAbuO31Tb+6m/peC0OuDJ1/+QgR
+            rRHd9f4Rau/SbEmpxnhugiLrcvQvlRI7uSnozfYkXucjrshi+ENzijHeXKWcvFkm
+            fG6X7J0hIGK32Mc6sLlFd258pNQWb2j4+vQTLPEGDRgav3H6LjdZVUc9xl2k1SGE
+            iLbMuwd+Hi4yQxKEAqQvSFek0kQ2A8J2z24G+kfnIzl4phzGb2f6lOKF8ZVkQhLS
+            XgHF90l0eoCBCqJX3zUNvwptMuNnhjcI6SUE5A6VvBMvm3SmQ3ywNNA7rQZU/9Eh
+            EENeTlLAP6IhWyeLPbj5ZGz5hlZr1mfXJYz+WSl7CnR6RPGYOWT1QEgRlEN4vWM=
+            =gmGZ
             -----END PGP MESSAGE-----
-          fp: 6423C518273734713931CB331C4814F03CA7C161
+          fp: D4BB42BE729AEFBD2EFEBF8822931AF7895E82DF
     unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.0