waybar: Add security key interaction notification

sops: Switch to new PGP key
sops: Remove old renge
2024-01-22 17:32:04 +01:00 · 2024-01-22 17:32:02 +01:00 · 2024-01-22 17:32:01 +01:00 · 2024-01-22 17:32:00 +01:00 · 2024-01-22 17:31:58 +01:00 · 2024-01-22 17:31:57 +01:00
29 changed files with 1088 additions and 593 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -3,9 +3,13 @@
 # SPDX-License-Identifier: CC0-1.0

 keys:
-  - &simon 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+  # sops does not (yet) support ADSKs,
+  # so all encryption subkeys have to be added manually
+  - &simon 6CD375BD0741F67E5A289BC333A01CBE0554C763 # offline
+  - &simon-alpha 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+  - &simon-beta 403215E0F99D2582C7055C512C77841620B8F380
  - &nunotaba 8C5091AEA213FB0642BD46F943EE19743FAC1D5C
-  - &sayuri 17FEEBB45E4245330507C960653378F10CA6E00A
+  - &hitagi 17FEEBB45E4245330507C960653378F10CA6E00A
  - &vueko 4EA330328CD0D3076E90960194DFA4953D8729DE
  - &fuuko 2372651C56E22972C2D9F3F569C8187C9C43754E
  - &mayushii 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
@ -20,63 +24,87 @@ creation_rules:
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *nunotaba
-  - path_regex: machines/sayuri/secrets\.yaml$
+  - path_regex: machines/hitagi/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *sayuri
+      - *simon-alpha
+      - *simon-beta
+      - *hitagi
  - path_regex: machines/vueko/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *vueko
  - path_regex: machines/fuuko/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *fuuko
  - path_regex: machines/mayushii/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *mayushii
  - path_regex: machines/okarin/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *okarin
  - path_regex: machines/renge/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *renge
  - path_regex: machines/nunotaba/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *nunotaba
  - path_regex: machines/shinobu/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *shinobu
  - path_regex: machines/nazuna/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *nazuna
  - path_regex: machines/yuzuru/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *yuzuru
  - path_regex: secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
+      - *simon-alpha
+      - *simon-beta
      - *nunotaba
-      - *sayuri
+      - *hitagi
      - *vueko
      - *fuuko
      - *mayushii
--- a/LICENSES/ISC.txt
+++ b/LICENSES/ISC.txt
@ -0,0 +1,8 @@
+ISC License:
+
+Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+Copyright (c) 1995-2003 by Internet Software Consortium
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/keys/machines/hitagi.asc
+++ b/keys/machines/hitagi.asc
--- a/keys/users/simon.asc
+++ b/keys/users/simon.asc
@ -1,52 +1,71 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-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
-R7VFGCA=
-=7eg7
+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
+=1z2B
 -----END PGP PUBLIC KEY BLOCK-----
--- a/machines/fuuko/secrets.yaml
+++ b/machines/fuuko/secrets.yaml
@ -11,44 +11,72 @@ sops:
    lastmodified: "2024-01-10T18:29:18Z"
    mac: ENC[AES256_GCM,data:askmYGMX50W3U/86DBj9CXhLOZdBrTjbMqRtvegDjfFkOtHLInGuh5urfXGnEBDLtLTjGwdWHCU5DZz9AvBNcl0X6wOM3BGxkMF7+CrZ2FL7ZYw+hJ7JOywNryO/vJLdUZ1MUc0uH1YZdYYHjD7nkyVeDj6aDDkO0UOiLsDNEDw=,iv:gpY4O08YheKFAanPkccp6I7z80ygqMj2IdQnYK9clwI=,tag:OAre51qIvnhfj/vwqSy3wQ==,type:str]
    pgp:
-        - created_at: "2021-04-06T11:27:21Z"
-          enc: |
+        - created_at: "2024-01-22T00:20:01Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwDgSONkM+d4AQ/+KSo1N4aEuIAF2JMX+3RborUdEMIJNqIQsBYejPF4o5UD
-            25XVDt+GrC4Lx6OJsWobLOHm+FDLPzm4Zfo+grU+JaEBo0ZSthUul610iqChwEGF
-            zVMkNKARsZE7lDQ3uN54Mq/A7RQaav4mrt1AbHTOwBR9UdG5hrEJ8JZjObS7Gqz2
-            /OFpX4xr214IA9ALx+O2UIkSAJT9u9Ann/xcKL5GpwE9etcGZbYqOhAPaSzbOSDr
-            BtWuM8Z5nKb1O90pXEe16yVUmFXyO7T+lU1gDrDReSXJJFg7zcjMY4s9rro2H7xq
-            u0z/ufl4sf1E5u7fLLpzrVcqKJAOw+fvfoPeqMrNsGy3r3AdATw9jPp6giRoB8qL
-            xm3gGvs/VedBBqbXMDSCTIuhBcTu3/rrTWb0TJeuMz9RM01owkvtTrL3zjwK81BK
-            pNTwz2a49ylCiDS8Vin2u2jwjoRlri4mPTzw5pvcGqNAoNopv6cjawGQ2toCD5qG
-            tqx0hY0uXAE1cnfewFC63VGFbaBwfCYLryjGLefRH7XFOAcqZ3dlZFi5lJTVnnXO
-            44uO7dW8wfJj45USIEoG6D0BiRU7JPUhgPIjMa1cEI4XpoBSj13EACxovE3z5AYa
-            pX72eJHMkKZ5u+eRrXkrFSGFWkYBGKtgIdbgXn1i9Zw/Ewbf7Qz8kC83kxkih7jS
-            XAEbvfL1DTAHDEyAXFoI2ekIoTTGAtCpsadQcTZ3+3DeWU5R8X29vflEG/kSeRO4
-            m2npmJ9OCKyEN+zAd/WRIQ0wChFgadlTugsDcmXazdvzJ1qJiuNGmzpRn3QF
-            =dltN
+            hF4DLHeEFiC484ASAQdApd5fpI1rAWa2hEaoASuyhgmYixdVXWmzjQJhwpGaaxIw
+            C2H4YeQ+KznZCxF3mDjP40s0u7fTIiO6o4FcbX+dxOcGxdGZQUcVevaHmjflvOH4
+            hF4Dub78fMESoMASAQdA+1akzujPUkSYGKB1DLidjjoIqIoNnj5H6BKgON3D52kw
+            v7UYLYbBGxVK1bWyW5MPkQcz/U0pvHknDOusmpxncqVxycULOGTTEhDjRpp+YPxc
+            hF4DM6AcvgVUx2MSAQdAdvJ9f2HwLQyhk74QTek8Ws0hOKkR9X/sTcq1jh5lcnsw
+            pZ8iJJ42qK5QyxjsvFsWSy5XVr4ox692aiwssztfFHIFG8y77NmybXL+Y7BJOSGi
+            1GgBCQIQYTWrLZCbusHNwhoM4gC/YqeR3JnlnAuz8gVggCa6bWaALdGXcaflgRMX
+            XIq3G5jsz/bR2rv90A3RrEvrTmMOMpij2lsmGYVkluPJsisDDCMeYmQa0Imc6x7v
+            oqDzRp0oRSDVmA==
+            =qGmR
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2021-04-06T11:27:21Z"
-          enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:01Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA2nIGHycQ3VOAQ//RC1NMySQoeqfTGEKFB7LwC3o0yLTMHAqoi4qm2Q8jKxH
-            6zSjHNoYI9+2VNEWJcSvUwd9ks79jkVOAWO+Lmv2h1QT3RrsSsj16VZwl+ORp50/
-            +PDrZjaimMafAKaqGJ3HaPlzFX7jUjCHS0yCaF6WIU1ztRLVnHAv3p8dsPzQ1w+7
-            p1h0oQ2noWibl2GLGI3+1O3sv1N5tusTGZWFacG6VsTbtbJmbVCO5FQRqX7vcJtM
-            xfClghFPoHCGbN5W1NWpo/a/lOLUucqO7bFB5DIOoXme6SSS7lrYQKtjBQy/4DRe
-            r3VIjvS6ncVUIYPPnEMlxI3MPUB2lwJLG2B89XNNWwfwREUXTG4DEg09Z6jMUqVr
-            yNO67YCF95fNUQFMQ0LWyVsWZW1n1ef7/iKtDHNoFubCVGjWimIa3ZDX/e4WemEN
-            ww7dab2RXEY3oTLJZwAFMN4jeqUfpgH1TOvcs9OHwF0CQjJIDyDj6uyt6wYqITT2
-            dorhmn1FN/tUUNn4hE0iRjFaD1QrN30KZ4pQ1S/G3IkHGzJ4AlelO0j9yE2VMR2q
-            E8wEhVtDlO/VAYZSx7tJ7jd24gFsGlL70OfSXvo7jyNpo+OjaN9yy5Qy8iogwpGC
-            Jua/Y7+XORx3+SVB+1AUNSwCABOhWL2RQGnGxRRQrST4uEv2Gn6IV5sQuPz6my3S
-            TgEtH78YDDWHFdEE4b3lQaPAR8NGNvuE0btjpdeR7QoTOAkmg0SaUNqAoqrz80jj
-            7kdIBtI8XA2CW/oXYcoxHlkqbPNqPAhaRu3YDci8oQ==
-            =ukYv
+            hF4DLHeEFiC484ASAQdAQ2tZrdSOP+N/2+CuaNAiSpw339XBAZE8fYfEc4FV4y0w
+            FUTjIbRctKAyU3ZoucMyElRKjlnhcNb/3r+pNzIqspE/PJXgd4xmhMVw5ote574r
+            hF4Dub78fMESoMASAQdAvfTRT3gFwB6vIGMW1+mR8aGWhvb021lYUqgesQlOBXsw
+            7bcHi/I+B6bwbF6/6nkccoWQqSdLFIXf+d0biFqtxlJxzKMnT5tZ6LcfMssI4R8+
+            hF4DM6AcvgVUx2MSAQdAZ5tBUzXBKzut2ygV/3Mk7DMQ1WNuk8Hyo7Sad65ssXow
+            iQzZarz+XIjKENnd2n87iSuYXKk/zHYmygJOUlv2bH02N7jP5X1QYlqtd5mdRhDb
+            1GgBCQIQ4ZwPyN81LkydDrCBNEQ3+rSgiN2jp9pZe6A9Nk6pR6mswRDC8/Si6v0J
+            59W7pkX7DFA58RaIpMbPvqVOdVjY4jFOnwt7GZHYSItvmbSuulZZJr4qR5B0drWQ
+            mdD0v2K963Tpqg==
+            =aEWp
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:01Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAHmEpe3x/65AW3G5QTuNSd1rEr9KPVmPUG8ewZiU/1xEw
+            S17RzFsJ8zD5n4BL6jC/mcCkaSm9ngLbVFGuEspAtUrmPzEQFOT9EE8UGhyQeB5S
+            hF4Dub78fMESoMASAQdAd2Rc9l7t/rB+AJFgk1XgksR4OM/HT0FiKTK1OehI+jcw
+            ihQKyJNHqhQ74Kv1HlSsyAG9nKJA4AZ0W3YfElKS90STrD/g0P7TWegL97LsXaqr
+            hF4DM6AcvgVUx2MSAQdAMrhVNU6d6fVHqrVaggQIxB01J0sS2IW1T+mtSAC8aisw
+            VEcSKyalAZAMS5CUcdPpZzeZELYNpRJ7B0n5WHC+QboMUXA0B5eVMrb8c5hFqXdC
+            1GgBCQIQt70LOwtTpmbWL2LFZ/Xz1TuPGhyv3fJfA4u1NaYhRdkp/+4h1kIp+UfQ
+            AoQWhr9mdtGiqW69AfCZAbmnVTLBe/9GRU7a3adM/p5BbPLbLb+74nUs/mv8q8SY
+            gEVVHTjvN9xEqw==
+            =WU7j
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:01Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA2nIGHycQ3VOARAAivyxBqm4MG95W6YeiRZ54F1ljeE30osfOy9fIHDceGpU
+            Uf6fUFsljjS+jJeBorg1s2DLH+kl1NnI3TwJFxL+RQNUXvKpT4GyTkf7V7iJ1kSZ
+            7cfTkYAZ7+ZTeXk1StvKEck3EUIIR5rh5K1JdLBWdC5BQRmastGKKoRgZMR+kMKi
+            OoMsIo/aQqeo1L+CvL0RHNBC0nEVW2UvipeLOiKmdxwRaXB5F5/l7CSOBjh4FILR
+            aFOV+lpnZ9OBBpA0PPGpOw6hIXdOFPVH/72IBgaVNB47+70T/8QpSJ+ZVwrSoXOC
+            lonX3mBawpdYDoiGQLho0jnCQCp36ZTQIgLvqsYwGX/zt5P7w0ZFV0mxYiLnlBQ2
+            5UMoburfJSujVs5j/p82xv7jv4xIH0OYfmKlLpni+muxLZa+GXfyehWoQlZOuH4+
+            dZR9OX9/Scryg5O1GfB3Ehs36ei2tZnquuziefc+I0R8AqXvEqtjq1LedRDCfBcH
+            yRjVeSNggn9jtqv2W/hZ+iUFvBSXDKXF8r6LnNelZTy4IWi39BoxWAIiYzjws7/v
+            7sNQVa2C+Y+PW+VRpFR74xov0sYVqEDJ7gKSZLlYK06xhzfSp7J7ceXKUeurFFJR
+            5JzKNX0UHIQ4sOZdWW9QzbaRfaASqt9Ycu2065uewJLwkQF7MGuh8d/8KxCwx8rS
+            WAFiPNHJDUzPShfOMAxq3Ktt3l3XzM9WIIIZT7JBWm7Rm5FRZIKWgV2EXPtJyLho
+            hM7UIfxCTqsy3YXJX5fsSWc0mAjObSz6GzQniWGAQ+/xXh0/9aBZCzo=
+            =p2GO
            -----END PGP MESSAGE-----
          fp: 2372651C56E22972C2D9F3F569C8187C9C43754E
    unencrypted_suffix: _unencrypted
--- a/machines/hitagi/secrets.yaml
+++ b/machines/hitagi/secrets.yaml
@ -4,48 +4,77 @@ sops:
    gcp_kms: []
    azure_kv: []
    hc_vault: []
-    lastmodified: '2021-04-10T09:42:48Z'
+    age: []
+    lastmodified: "2021-04-10T09:42:48Z"
    mac: ENC[AES256_GCM,data:kKi9fAbikpohqIUEBR8c5ge0/fStxkrnWXfVhPvQMMeMO+rN/UPHpHJJMCC/v6TjFMC5ckTKTBflpGWL7xYiREoKONLIx9tMtaH02NrTs/MxVJZ4Ji+GKG0TY8mKGfidoJ4tM6a+8Yk1kgugeePmRXwCJDQKxQyEFyZ3BNKMxcA=,iv:l0OmGCg+DTs9KuFj2ZdW5DDH/0kKxjjX3ej43+X9x5c=,tag:/x8CigyZZJQIV3ZvqqVeXg==,type:str]
    pgp:
-    -   created_at: '2021-04-10T09:42:21Z'
-        enc: |
+        - created_at: "2024-01-22T00:20:12Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwDgSONkM+d4ARAA491uKx1mGdZ4QpjGkVeS5O8UowNdiLAvSnBZ31BGbzQc
-            MrGffPpaDJgjxRfZ4yaGVra8OKOsGg5gAinTc+SCNaHjhIqKFpyQbKjFUDGlu4RW
-            9flBowWQzz0VP475zxTALQ2i9ZrDdAIBMtycA3XdcZx241h4Ty5gvnB8WIqNp0+n
-            9RpOtK4jEZ+SSJXSGlI2RR+3cEI863N0PidepFf4wsqKhWvv34p9kQ3rVCt8VTMG
-            pPelbcxLdx6JfVXFKHSKjJApW+cOUcaVwOU27GefWHclanZWMOYsl16+eGKnmSqB
-            sTiH7z9o0khVxU5vVq6+q63Xu9reaBoAHIq/tTwpTswxGhAoY4CXbPqK1pVFcnKV
-            RfIxkjYffYR9x5W1zWuLoVwC3ueknGWj6g79aMVtcC8lJoRWT/w+GOdwW7lJGex1
-            W56n2+jcnnWtL2ljvUz3AuoJlx3dluquX1Q7H/76U8Gy0FN2TzgBoQw0jo6kvnX9
-            BDLzN/mtA7ph0oWDMCdDSKMW3OBWg3C9Ak+nmV67mIDnysNRfT93fi2OJ7Y5Tb1p
-            KuoodOOo7BqS8hbiS9G4ZUImGECb+GlivwuuoJ7LPrEPdvn87cWzsjDimTyQLgPi
-            RlFPVpw5nsVy8UihVvs/tj7LX99O4B1NNxXlW0Yj1qgcOhPBpvDcNms3o9GK+cDS
-            XgGalgUfb4BNzDclTwNYVILdNYM9AG9Ic5iJCZDNVtUXN65ptHHlCtiut08hqbFV
-            2+mMRJvH5gRTI1l+ZDAoHRV2LgWcn5s7xjENksx28xes9qH94GhWFK+b0yeoMKw=
-            =XxbY
+            hF4DLHeEFiC484ASAQdAhnTen617FhDP4kxRunYZV2fsmEYbvw8K5S0R69dBWgAw
+            C2wdjH0PXsDxuz21PFbqb0k2T1iHuBiVIH4psDLGVaM4MOJamcFwIcHK4uLZZvU7
+            hF4Dub78fMESoMASAQdAz5HfOjvVVkQIaKNIhk63trrZLb9fhXs8NVulb6R69BQw
+            NgdhzIKZ6Srg+Z35jBNcsuqSTsYQfcv3iL5bvOyqAI/wnxI3SAfNweFIiJw0P59X
+            hF4DM6AcvgVUx2MSAQdAAmbYw/lRxofcaejX5A4hLEgU2NOTT15nzqGf5Ft/FFQw
+            3lf8NEAN9o1T+p0fHo+mQM2SbXWcEZBZkdQzgm7ky+bme9Uw1jORQOogUykyj9xU
+            1GgBCQIQzuJUUDp+qsDmhGaTtdBZUl0J92svOwnjIuKB4mvJcbvuqpyaxdiwODVz
+            pj6kWaOQTNtKR7w13Qgz1GGD7t5qtnMp9Bu3hTMrrXqV7XqAp3jK+m+8OtmDC323
+            tX2td01cvwr8ww==
+            =LyEL
            -----END PGP MESSAGE-----
-        fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-    -   created_at: '2021-04-10T09:42:21Z'
-        enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:12Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA2UzePEMpuAKAQ/8DzlMIWH7nDMIeM8HlDckfzeGgYhzr6lJ40vjtYtNqt3j
-            OF3i+6eaBX/SMsqStk7zLj53sNp++pCGev+TZV+1c+yJd4t8fllLTuRh2rfPXONT
-            Pehu3VhsudOjXKxBJcWmyfnPhtLjtIxdKEQpVgLFiEbbDW+OCSn1RveSiQ63/pyd
-            Su0BNYGmpF89/jEA1ttfknhxd69wsuBKGrxQc9P4ZPQvZajnbhQ2TbLeuLnub6yb
-            QTUNbJkAofw19AgBXY77AX+qreYq4esrAMDsz8ICnisPSO6g4FJ2feMc0Tvf5fwA
-            B0janl3G6D1znUG88tjsjUwv8/x/MHsGFJQvBLm4vqLOFoPDaJ9cO0n1Pv5uFtQB
-            XEwFFgkw9TY1gwsR2eJE/4qSiFaW1JYBHx70/Wyn1ZlJMmdUVh00RhY7Xjn3LMkj
-            JiA+LxvzbTglsMSvkswPbIfUUmB4Ws42P3fF55hCXkxd8jj0NjxByrfFy0VXNgJQ
-            KVYtcQS4ZWXyko+yllEV2TbxmTQilaBEUUdty4hYaoLtSX0jh3s8ZVN9jTv7SPcs
-            VhURedXKmtzogujft1wN8lcqzVGQhWHws2qjOMEiMmeyslooUptg7FkBt/Qw6z5j
-            rlJvWeudR20LCHjjCJnPl/eoNEkQkpOeb5kz4NV7n1okA0jEcOMBbG3+rWiX+JXS
-            UAEGnN0ClALycCU8Fj9lnswEd5LP20ohZUbzk30K2K0bqRregxoY+UMWAQ1asSdK
-            Xd4DYz27BFFPHmrpM1F5Gbxhvy+NiFYNu7+2DCkuLGNj
-            =w8xW
+            hF4DLHeEFiC484ASAQdAm1dAnFLB2GBuSif2258t7ixnBXzB0+y5BGLP+y1y8AIw
+            PywjeHtwB6QKgZNmqArSsqzjOV8oCVfDv+yerMkuG4Hr24rAl4H8yTIGyF3p0QSS
+            hF4Dub78fMESoMASAQdAdGP0AsHD69DsE380RhSsPKGij4ETUhrMlikxzANg4jow
+            jImzPHVLXCi8a3j8gwypovqPCHkhrxBvfCOErSktYLLRks9ekME/S2E2+s2OrIGf
+            hF4DM6AcvgVUx2MSAQdAFkQpv3jPCNxHHPbDRErZ9Cpe5apb/38leQATEN6R0Xgw
+            G/8TyOYavyaUvNUWxYf/jRwCKEp9brNKtfSNEm6xJkQ0AmJexvk9RnokgfUDYR1L
+            1GgBCQIQ49V/6WXlwWfOmPMQ/IfbnwY3QussWqT1Fd2DwEPawXSqIbp1nEjGaRmg
+            xKF9kGlRNHiOafHr1LLpJfti/NmKiB3o38p/aZQXJ53tn3TYLE9v1mj5Tj5OtsxX
+            pWgrjURY0s/puw==
+            =YdU1
            -----END PGP MESSAGE-----
-        fp: 17FEEBB45E4245330507C960653378F10CA6E00A
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:12Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdA+Vig+61+7PNXNsMR8Kjf/5iA4Cvva6R2Jb5Eqbwju38w
+            2q1Aq4ZuzqluJgdObUJizhG8A87pMUF24U7wc1c7QJzCn1DZwwT4LL07EI+Kfsc9
+            hF4Dub78fMESoMASAQdAD6uMKMhN5w5gm4z1j4D9rq9J12Snb3flwmcREs3ckm8w
+            ZB66UNfq/ClThzr+L+MrnLkBZBIcLXpnZIWc2mr6TIerYdCnlTFgB7brQX/Wztm3
+            hF4DM6AcvgVUx2MSAQdAwOgcxmmXQe/mOK6WjVTh9BUxvWpclp9WKslO0BB5uXkw
+            lOp/UFiySxZTfLxSNExfdvAE1xz4k0mgkGSRnKEAZxA6JpIA8CsodkhssUsSkshU
+            1GgBCQIQHbtdTFPwhQbrCzU3C0FbBtwGurGUbvqj1nCcYaYZhroJ7gJexEk9dKgV
+            ahwaBvaqXBVijrjg8DRmzzgJWoYYKl9FkA93115IXV5AsJ/xjz0Hq6GETLvH2Wkc
+            fT8aDvn9w9qOhg==
+            =iP6n
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:12Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA2UzePEMpuAKAQ/9H88PfyF1okYtUiO+hwspq7NQibEXDxWRu5oT7UykVpyf
+            G9gA4OEfuvYnRXyqiR/CuffDGb9skogQy5yMM1qk9taCv7CxQVc9XBtxlvu2hRty
+            H610g7AvneN82MPWaSNjPLwtYebDq9TaTMddbXKCTLOLjT+NC5h13h3Mk8ExVtoX
+            BnxkcioP4S8eKkZlBqTM1EHvSSxNgwuiT6sceOT4RscE8Yirv7D0EJyRoMU1Ufa4
+            AqiS15l+UMtp/Qt1h6YQ1s7l6e/KxM268m0MHJcoDfP9wS/ca/fmZDUrswPCHgcY
+            4ejmhyqOxGqYIc43wQtjucQF33ipQPc3GGcFaz287/vf8lqoxyfxJk+GdJinsPHf
+            JJE/98A4oEqFyS5iZuy+PQBbdHepSHuIrM4QdAMulyVzPnGdYhD1gKv47q3AxbIX
+            F0htqTZAHxZAw8nBrtKCU1dgfRy6nqPifsmlcglleCJA/0n2hgcJyg0Pos3MesWv
+            wu8AIRni8hUfzH1vsOId3Ij9/TMidyUwUJ94BX9TdIEUMsESnuF/AJSww4ny7Vsy
+            iYAYGLaWPQvduux/nESp9jY7TUS8fT62fbB02DdDXd72Ua/vViPpnjHYTlAQz0uU
+            FWgf5zmkR0p7WqP87sx49cHKOhqBu2uXnBRI04MlEIa8FyoZZtqEAs1nB83PEfLS
+            WAEvl5Ca23bXNIjc7TCym9BCNeQ2zBVmSlSlT2GteiTvkiWbCIn7H0Jtb61ewUUd
+            R1E2x/J87iWrrRNfzn3B06DBJ+WecaRE1Tec5ba5BRdj7xK3vUUTPq0=
+            =7yzB
+            -----END PGP MESSAGE-----
+          fp: 17FEEBB45E4245330507C960653378F10CA6E00A
    unencrypted_suffix: _unencrypted
    version: 3.6.0
--- a/machines/mayushii/secrets.yaml
+++ b/machines/mayushii/secrets.yaml
@ -8,44 +8,72 @@ sops:
    lastmodified: "2021-10-05T18:14:40Z"
    mac: ENC[AES256_GCM,data:Uck/kX7BE3gqpMD8wgsksEX3DKzNSUinSRAPqpafH5UbVfQLYVOD637j7wltrtcHSOLjqGSrSbf6jhql/Ve3yTthYB72cHKcJ1UOk5cTD9xCpUJCx56Eid0yj9UZpifIM3PLRjnqqZFF2TYa/s8HcmsY4uvcN+U5dyXYpS6XYMU=,iv:2mhjUTxjU9xH0wFS0ZbgQ3GYRL+8BQboeQuVBpAQvsI=,tag:ZhAKuPo6iPE8890tkxHdaw==,type:str]
    pgp:
-        - created_at: "2021-10-05T18:14:16Z"
-          enc: |
+        - created_at: "2024-01-22T00:20:04Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwDgSONkM+d4ARAAvcpLQ4pl2zWfpNnyoi5Vu7Ok6kiQF2UveJQkxkvgQom0
-            TtvlazVEy7kBebM9sgYz9NtcWlTFTMCXC04gpJz9fGYAyssnZ9+D7J/yekK6vyEY
-            5vY9Dd6FX9HGOQuG3wAwBr98AgNHB76Rt31LBSUjIzNZj6RdsbakM2GRIRocFB9V
-            mykpRozkE1ju9l+E3NqnBm65AhjEX9q8W48oyrZLd0lFlfo3Lseda3AlGIMz+PV+
-            MNZ9jTERJZQStpeenE2u2+cS+tMJZbXGk0QBY3+Clz7fTOBlA30ePiWefy1ix3XG
-            mIm5WM12GP5cCpLc1mwAJvyNi/kTw4Myfy0+xth9j65nZCOl2xLIAGqgfikcmQoc
-            /NKs/ijpTwSaqbh3o2vmlmYoif7UkVDxoz/cQKoh9Boa0br7eEI6beKwL2bvDcn9
-            KBNYBeHftt08+sPrg8hSLGjVSpcES9IH6u1WHUWnQYH9ykN9b2VcFeMVUjjYsyWd
-            AwO+quTMF0dfo6es6t21/whzE5TrYZQGSAZzaGASPbzk9MKWQ92hJxICPyyFuZFq
-            NOdWZWRQfYS2Ia9HXqdzcEIiLtLBm4gZ6sZQ/vkv3bBKFcq1rZ2UqfJhsaL9eOsw
-            QiSOoiVpjOAq6SXLF6yQnTmPZczQV02XSvwtNjBSD3yXAIMsXt5JyIW4bCcEIJvS
-            XgESvf5cIkUUA/zmoSmiKFNhHDO7X7b9xMPAE4BqnJqFRL5iBkY9Wkwlv+DFOCDw
-            0W6U4V5dFtnGYMudnjQMp0qtsHeDkfhj/IQGAY7RuBaag7HnmBPAzWnYmgE7DW0=
-            =Fru9
+            hF4DLHeEFiC484ASAQdAqZLu1WtuX32MApKS3+WArf1Dx98sVvtRA2f+3Ohg8xww
+            ybR+vA85q5Bkj1qUwvcJjfz8YcQMqQO3UfiAjxq1+nWpFKIRga5F+4q6wNReEOF9
+            hF4Dub78fMESoMASAQdAQxvlhs2ndgxb1gyOdu7Pew2iWRQArmXbde8e29WpU0ww
+            L06LIRbKDCbVuOpWBQ8QH81zYsZtEuEBysSLF70QOZ9ghfKJlcosjpA0+4LCA7Dz
+            hF4DM6AcvgVUx2MSAQdAk72KyhnWhZHppYXecGMJI+kFP/R+VKAsi4uWSgbNDkkw
+            Wkj6UTYvOvRmwqKk1fFoGw5W5Uc3f4BUslCgY4ZXUGt+5q8VkWZJUR5ROqnA8dLi
+            1GgBCQIQDZX9QeIpllKKKXLMiNKGMJeRkXBNgUZf/veWn0XLL0DYsmKgidn4bCJK
+            VD7gNXi7XT9uSyZoArN2bWjN71ajEq9xEWBDocpBaM1YfThhwfJfClpHVqOwZGoV
+            Z1xkfw6KRye97A==
+            =8YPu
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2021-10-05T18:14:16Z"
-          enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:04Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA0Sjf6jBUFOzAQ/5AbFqOiaNS2Wy5al/H0AVNbpPNPHYYYUaAiDYitdwNgur
-            oChxTYVP+h1UVwNhy+5e1XnLpEwJNcLrzfeQgxr21CqBcaSbOzEE7G9/COX0TD7z
-            pyEP5aup2TmCx8Gzc7Ugjbfiksg1m6EhoZV1k1bsuh5mrFMQqhnhI/xQr0Kehl9E
-            dggOw6IGfu7rZ77U++AHF4b22ZqR2LuRdhpHAvC4H7qlCXIiRlV2qQBT7ArnaOG5
-            7b9WxPI+PjJUNdm/O3rv/ooAtdYz+mvsoZJIMuS0ruxKNGGO0SInxY16QFECKixY
-            n7/q5OmlNTVr4i9++JPSAu0enQsqOscSZm7TctiGF0ekHEn+axRsrMBi8pqEzu08
-            nHb4HXmf/jkdlYjg/K34I4mec9jy1L7a11y6lfsAab1FnabbKJjgm3jrBMMoM/Fj
-            hEH7CWpAAvG0+rwJ9EmuVjq1gGbi6Q8mBpmX0g6/hfSao/YWOhXMi8tDmRNeVWpa
-            eBYhRto2SRB0MhLbOeZyC3UkDASDBIsNgmFz9JTbwLh/opv6anqE7O2sLmKIuXDA
-            IfLJk+ahm05Fdv3AfbPsWGevo1OzxSOxRYn5cDEuF22rcZNDOuRylLJIkkxF9OzN
-            XpsgV7aoSYFgG84u1qa59dE+rvKlhSi8xLQm2mZTRB6L6sDZw/gQ0H4AeXCZC1XS
-            UAF7lyInB6tXrEoNCCIdON9JSrBmSyARMGLoPOX6YqvPV2MQ4OEWf7BZ+SPRgbuI
-            ZFQLv6hk0fYb0fb8xHarmI8krq7k9dsqYxBZI5DjVaPz
-            =7LEL
+            hF4DLHeEFiC484ASAQdAacLEX+butwRGjnGZjCjt/sTW9j/tc2CsOIP3ZPcgbAIw
+            sJ2Bal1Z3aiNxmmd2tmd2nXfTg/mg8SVM8jnPPIU3KFowItSjkjEhx3/AsFtTHSy
+            hF4Dub78fMESoMASAQdAzpthZ6HLXK5RQ/pLw7Q2h3RoqiAXiZBnsWrTRk0ZAQsw
+            oRPM00dxW6pD7iHNiTtnORtEOUGyPdvMx/FD84sCbyXD1+xkx/5r3MyearZp+o4f
+            hF4DM6AcvgVUx2MSAQdAqCq5RIpvlAPrORN3cwkUA3H7yfVK+DKOOZ4tVO7sAx8w
+            u0EHNfOJdQ0Dwa5NVfGogygIZ2zbfqnj363bT9DM6c2OLVNooE7Wdex2ftXhU4xw
+            1GgBCQIQLtnpAO+bPJjZ7CNk+5aJXMiajh+Cx7xch6jqQ02fAD58kRrz1qhFGwTm
+            25wuNQxMUK0uqA8OX3FLwZQ3+wOCf/rhimV0xBGjyLsvjJbYRUA3yBHYkPdJiBge
+            6wmfCzQngJlSrg==
+            =b13z
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:04Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAWPE87/VvXNDIwVYAbOPF1JVKoTCTIAkjLCRqjCyuK1cw
+            ZnvHOOA129hn4Lz1Vn6BJvmY12Ri2we15bdoNFVhuh15YT3T4uQfJ0MtEv/UdXZ5
+            hF4Dub78fMESoMASAQdABJ8zofCOfdUNnibN/X9/rEd1a07Dk1tVAXn09mAbPXow
+            ZVhFuJ9KH9tLCc7taRpMryOErxY8KOKoM/9BDsSPFrUp86b7mFAzH/RZKf2Kor9U
+            hF4DM6AcvgVUx2MSAQdA1i5Oiu6JIqkfpPVmFxU+C/u2RIPZxzY467U7PlADrR0w
+            Krr3U7KfyNvDOsLHg+0/ehTvAg1LsK52cg8Dd8pWbZ7Xn7r+kYdLZJU0pCKIq8oX
+            1GgBCQIQhBrqjYzS8kFUYgDJT8g7A6H3bXdLywblyilTB6HEhN/kB1HxvF6Si/wb
+            3HO2zcbk57zDIdki8OaMonl4wZxd8NqOZaiPUph0Hc8lEWCfbegFYSTLTrQNyrRk
+            pWA4/yuPrciAPw==
+            =om6+
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:04Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA0Sjf6jBUFOzAQ/+KOp6PTM6m8T3Qtbs/8tpnQPQ5g0QM05iuRdbofEgCls9
+            +HfEayd5AqO3VoIqgPea3amtxHUIunVXc7edlJCuOFLDxZJysZrX1BFoFHewwDKQ
+            u1h/tLAhJJpE5wA/iewXtXus+jXgRXThFSiXR5qwQGnBWdsK2XNnTQ67vBjEeH33
+            My1r484LxAZst5kCJ92VuHJevqjvsvp6Pw//zSutSGKUcUnLp/J4A+rlfglItCpv
+            vhzULQXmb9d/kX2DY46nwxjw1CfRyLmAWVhLE2RWhm6TR93eDs+G10voO/Egd0OF
+            /xOI6o3gW3fP/zhWgBQ5E82Fx1mhGdnTDwTL5UGGbzK3zS/g8uSHRiEzIM51wdjp
+            GjqiZRCHO32fGYnnX8lF+z2HdyTdnUoTS6Omch2YTrNs5aDV75qif/9yaKV7yRb+
+            0LrOaoWaSM0vfN/0gwEPd7FVt07Kov3Yxpfa/GxPIIZWAkwpAcI57u8KzeSfzYCp
+            odwMgu43TdOoL+IRiQxz3IziiY9+eQJY7pOOE1+6h8BSt3VjAoiGqwWQro8xC3eh
+            HR54/FnLrYOHlVmle4VvuAunv1HZ5iAq3dz8t2VG+Q36tPl9JjPTcCnnFdAtErDN
+            7mkw1zba5bBrlzsGiSK+7f088hGOkisy/QpptG90BVhDlBLJ2tl+fhN2LrDCVX/S
+            WAE0t8aZHva/fpbSYi0dxd9lF0/LX7lZFDNZyLrvcsaFraFC8Xx3Iodu0qtzbjSk
+            IXJ0Wn0aWVAPQ9X9mcuEzgIMWkYYdCW7ssuCdWhmZ9Gvqaf+UCb22xs=
+            =U1in
            -----END PGP MESSAGE-----
          fp: 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
    unencrypted_suffix: _unencrypted
--- a/machines/nazuna/secrets.yaml
+++ b/machines/nazuna/secrets.yaml
@ -9,44 +9,72 @@ sops:
    lastmodified: "2023-10-04T14:34:22Z"
    mac: ENC[AES256_GCM,data:LjETyB9nqN6y/mevYOGXSkWNCNtu/fTXazy3VmZANNQCTuP5J5j6QmS3o9u+VCmrLpntpeNa+BT5VSbHgdlN70zdvgSZFhKSw/cn66L+dfO9bqUwDVDN2S8RSE6RGbFz4oYxS950JHEOKPyD8svtlT8xLq9seeMcvwp+KcSZqMY=,iv:70PeKVRqKj/6/o46TAzICQZDi83m4qPTTR1K3S6JiOo=,tag:9rQR9e9ZGYMgbklV9lWdLA==,type:str]
    pgp:
-        - created_at: "2023-10-04T14:02:47Z"
+        - created_at: "2024-01-22T00:20:14Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            wcFMAwDgSONkM+d4AQ//fbn9ndkcj/KuMA7xnVgfM9M1TGxcT3g/yz4WljwfBbrz
-            D9ZNEkw0x2HihRyKC22HLKk9tKc02tXyDFnebx+ygQCqmXgQ+uv7kirNw7HK/cBM
-            DM2Iuy9nXQ5eToF4IvhNay1iQZ83EjAbA7NkcU799VA1iZK6ysjB5ytONQQmc3m7
-            tKKmOyLZJGOWSENWXcjSJ79UJgBqwvMndUSbNEdkeR7zuRMqBNpBkcXmzpwdyKPk
-            qYnepM4DRPhkLEd1x70Ygm5KOiQOIq4ck+rSEwnW3Cd2oAeu6LYWF10y+vl+hL/r
-            lUkaFyjxXT4kkZERF1ehX1LIg9k/DuxqQhM5aUqiDTAdEOyHqg9gP2JnhpMwMplc
-            5UhwxDB6lDtAdHlDF45c1E269JFokEAt6TJYwAllkSaSG6luNkylR02mEUGG7psy
-            78VEFdSjmjwEJYGJiMaffeDgwBX5Vh8KLFQH1U9DcOsZBEDlIEPWWlM8YOKMWgI/
-            q5nhVBypdAobXV1Hpp8WFMyvW6TeU0VUWqNQ5ffWewuoq2MMehH+ScoIHEcbqXkp
-            z06HylKGL2kXioTYkPEjSeWbgh1kPHmkDUU1sIXPMLgwPUtUuK1bu4qku5LOuef/
-            1HL0olT8YB1F14QEhqmpnL2Ylxee9ceQR1SrW9wa9ewEjoW9WUzGByodOLZPim3S
-            UQEDjF7H2ITDmx2ig+CwK9q1hsSKFLppmpBV+16MchCajHNlsH9f3i9heUpRo3CC
-            Gb9vZF5ceq+YaVCACBJX3Q0VBKAagv/cOijg1Im17us/Rw==
-            =HIlx
+            hF4DLHeEFiC484ASAQdAxEWZvBqUtVlpHTdCLfV1DO2DMguJ1kETM/iBI9hUg10w
+            4KBoLkO7Ocji1ckCW4dyY0m1t/MCKBvr8SCCCFXpcFC76kRUjxPUAu1+Ge18NRvf
+            hF4Dub78fMESoMASAQdAj5+rduomE5D69dcXApn3UWh0WxzHcn95AyhS71oB8kcw
+            V+H3UzZ9R7lVkDKeceulZXbkvE2IzrJw16KrlTre1fEEk9fy6CkzxgXPT5ipO4t8
+            hF4DM6AcvgVUx2MSAQdAdoJ/hSaEmC9eiKg0wcDaCiGvhfMtmPsC0xtw3zQMNzcw
+            AiZu7iRIC2nmNQrPJ+/uG2WNgZG/Xl8H+AC0xvEJjAKDFLd5nd8FQtBL9KBOaunv
+            1GYBCQIQc5vXqxoHJ9lXVIbJv5+Gir49SSWiexaeUsHVNuwFjta/HKOkkwyQIu0u
+            TW5K0A+OOaJo0FYIuWnA+BUTebIFSbRHGV+MAU2iRg0AkSfJSB50pJsF667XkFdw
+            2R+vGqmYVlg=
+            =micy
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2023-10-04T14:02:47Z"
-          enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:14Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAyxL760fnpFcAQ/+OY1aC531MJoPAL9tfrg7nEusshgk7FV6kv5xehB7KM4j
-            ENPpV3XtIfxktxWuddLS6nw4l0m7TCcd85Ggwg3LqdqRLj2e+0mNCpV2h0xRrpiz
-            OgKS3Vm9aWpGkkfhP2vFafs2GrSfPcV7JfCjQRh3IfCYwYUrkxbGHI3vYBIvm92W
-            vwHuF//K3fvt/QcnXJUjHomoCaDfkYFiU6YmZLrXBgIXydAFm9iYg+QmamlUGGZe
-            SBs3Uo3bEegUcY0/v4B0FfRUWkG5w1G3lHH+cHjiYu13/C85ePDKIooRFrGGjjGT
-            iPp9XXw0sjK+x3Cx6PUYh4aopMHx16j6cpoZf7w7hnchC4fAneI5otTp/fMAOX3P
-            LVoY1Hq9FPkSelg2E3jvgvUS9sD5iwCUKRKDiZa1cJeY7HG38pin1BIdlcquqsSg
-            kmeSwT32jTUF/PXKvh8uLmpydkfFdHkmwaeAaSaZLQdOlFLprZ+jeD5xbS/1FMlc
-            7VS5ogHApXZJWmwteuwmepecF6EsuzZsRsZUtoEHxNdtyOIs86nVwdw/C67XqyD2
-            Cy1z9lVrJl68u7x6alSLdaLai0ksOlTAqGPi9+R5e3X/PvwN+3jNtds+peCaxvbw
-            2LchLh1+xF1WzMKZwERN5VgB6dgAW+9GSMADyTF72X6b1HIZGo9T0JDuVl6zbuvS
-            VgGmxZQt65l2akTeMpgogJ1jIl+x/+TQNubacEdF928W5ncGyP0WKym5ljPJt+j3
-            /kEYpD+nlOKgTblX8NuaHqn1PT/M5wMdyTRHHKUD2LM4+RjmpuV3
-            =jXpQ
+            hF4DLHeEFiC484ASAQdAkYkb44Yn6alZy8i6rv62X9AmzuqrsFtadEzUKUixDiQw
+            cb/p+ABh+iu5F/LDiTKM4ypF2jJKEHjWUJ6PbXhhl5X8J5+Erl/p2AF2vlMPxlAL
+            hF4Dub78fMESoMASAQdAxWk+zrk/Mt2R+VsKhFQ+mhjJDoorY5+3rSSmI8oxbnIw
+            XPCctjc0jNXoAYsr1esuXeHm4gW2W+1Eg8ZsrfNi+gZpvKjWCvsJkWd132/gR8v+
+            hF4DM6AcvgVUx2MSAQdALSpJ0HcrltayEZx3jbxa8e4C5NV0qneAJFGNTYimZh8w
+            W6QzxMs6Q9PmFTjXwOy7fwW37OP/xw3EaKTWZZQ5see9fwG8mkk7JEBmymb40nnO
+            1GYBCQIQlk1kd0EcfWZzNQ+PIKxyY8jtLLw06NGEUnJu5UElcMS6zb616RUtw7h3
+            SIn+/jOxnUdWEOOlSavKUWgqEaID3vgdBAB/RBkF0v76wTrZcKa2QORDUQgwmoF4
+            VjH/F6dxXWA=
+            =Oszh
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:14Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAjzgyMWrNc5GsAEHQObWpCkz/1zcJ7kHfd3Wn88aDPzcw
+            +D2kSbSMqGXc7IRW/czBgY/m2j8z7alj1neDIx8w5moXKWgjWubDryVJVoXQV19A
+            hF4Dub78fMESoMASAQdAbvYXma4/upOcBXhIwox1co1c4HZh4n5en12in+rqJVUw
+            /gvqzxL1B+XKw958yj8288gBUcA1jw6l7Dx4BARGsrbA9ShRzRzXqi1atpbE6+Ap
+            hF4DM6AcvgVUx2MSAQdAooPut4kS7cYZI5XyUFEr+WWFVKbqxAxF0aXoH8yozkQw
+            gSzcNN+YJA+DYTPjhTPq/RYkU3uJ2KH0pYuoGa1b9Tl5/y8jjTme5CCMhkjSDk6R
+            1GYBCQIQdEXOH0mcDpGx+dVYTFz/KkRAWVOYXfRdm5JnjkKFKIa0itL3+bxf0SWT
+            5Q4SzvInxXosaCJgWPqyoo7mkcIYhiX7UwSvwJdn3QUbeno3cbLsVcuBe664UFNw
+            c59WB35H+Uc=
+            =1la0
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:14Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAyxL760fnpFcAQ//Wut5sLyYF+Ubwj9mYVWUOP2kiILKHtgAzExx7IS9mQtd
+            EwgbP/eXF4hWF1uEf0BDAY2J0uQRjB6rzUgoFZT3/+445dVBHd16x1Nqp1Vu4fFh
+            k9bntD3ePjH40eLfvAtTsUrKN91HMnJzR9TXUgYkuQSvkFYQYrz9XPujJj2IoR65
+            PWp8ZvSYEmKk8bDpE7oinwAhHXocgnRR24mJv5OgHNB1QLFLegBK3F40zJJMPaZk
+            WsoJgrbW3E4A2KxSOyU3aip2vRIlDm7+Yfmd+/P4cfh/ZVKjcvuG4+BdSCxmwZhi
+            JxWcXRu6kVWpKKlRz0WK7g/PQhsqdqDQTUrsk2lWG/jXRX5+F1kg8PK0jSCE4PH3
+            i8YCJzfdVvyruZMZZ4I6lG7kOKisMqnH/tS1VqR7itYaEBNRdjG98sThxpqw5CJo
+            j7lktnZRL+RUV6Zk9Ph1s4WnCn61fcQhBqxP/vEue+gC+sIvVuOF5uw3Ecj25pLQ
+            cxhF6pPSOvayy9qcdBG4/7ljdiEIeRaX8gUeBxEQhe2dh5x8nCZowLEQTczEil4r
+            We8BLjxdq/qEuO85J3vYsID44iPwOjOIGVeapAt+H3LXxk/tZZmpHf5Wbj48guSq
+            6IEISOGaG+KQ83EA2+tVWa4143dImofHBwc75rmxXJeR2kGCjwxf6DpcNWtvUkLS
+            VgEjHS9eL+zqSo0fxJcpTTLZx088ssS0dARtIGWj0jqHytsgl1kVq3HqUDBvCp3h
+            pdCYy0BkVZfesU5j2+lmfGZSUtgRyFIaoARprTRfp9VlvxBWkRI+
+            =py9c
            -----END PGP MESSAGE-----
          fp: 0b8be5d87a10a0e68dda97212c4befad1f9e915c
    unencrypted_suffix: _unencrypted
--- a/machines/nunotaba/secrets.yaml
+++ b/machines/nunotaba/secrets.yaml
@ -8,44 +8,72 @@ sops:
    lastmodified: "2022-06-09T21:24:49Z"
    mac: ENC[AES256_GCM,data:ULMv1q8wvG+tX+51Sv/wkjA8+v7OvnZntji09+c7KnepYUyIqeNdg6MocfGa9xeYpvFD6cWgmzE/JBdYRoTsaznC53aey6QGjYrAD4u1qeAN9FFYDFJ1/GLXmqqva4FzyFidhbMXCHx77YSRFd3Uhuig7xarHVKQZgLjXFIy9iM=,iv:YYWan4L3dqLDXH3slgHAnmCMvUQfaiBRTkMEH+l3PJk=,tag:MnAGpn1t0wRZn5CUTEsOow==,type:str]
    pgp:
-        - created_at: "2022-06-09T21:24:23Z"
-          enc: |
+        - created_at: "2024-01-22T00:20:15Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwDgSONkM+d4ARAAnBOOyi6XBeqKTygfBBjdorieYpOu1AkALtWtH7OqGL1/
-            NAYQGt55dJo+p1ngfPrG3xD3533GrlcM8yOqdhWc/QYx8L/U9HYjdzwrTGqGlN8c
-            67gQWSrCx/pQoCFy2vz7MssYlnXSariQJmKMaOhDhNjF/Cmp/4Ap47U33KSJ/Gaj
-            u9KgEE9CC/0wnqhZR8CdARTQjJqRfv3gIrTKU37GEPpOYtLUhxtmi2MEt4mH27Ab
-            4kq9aZYOr7hECpSTiE6Y/aKSnAYhl+2CMo0g7Ob/XTOuaKqEj4mkcYdYeb2oAbyC
-            QKZjLkqnmo8gl9qtM1smRPk8akrTBd+IV/dYa8kqqB3HhNp+BuLjwQT7ZXkf/qtO
-            BEeZvKdwHiHubyN/Kop9bqjfeXqw5t4t+9pqVRtOgmzwcjVMSzyG4hYyy6Usngj6
-            7BtW4xaysAWv6OY/9cqMjG1xpr9sXNdKFj+QuNqnjULWH0UVWxAyxWGr0VQZmexD
-            aP0dDk44YJtZ9clfFRkrWyLmpHg4ESU8mW0gDQSeK6zdzguJfYdK7qTGdMh5DdBc
-            XezuJD/D1/DeGN0WbdDPxrLRh2by3kVvWw59O8mu9RZLP4VyXT2Azh37zUzjfYA+
-            SmdmLaoiQrswu3fPw/6v0E76M8BPiIRqVhqWTSCL4BOvuWpvCld0+ajm2YySahHS
-            XgHwhe29ZFpH8hJAOqkAdXV2b8Y3pvCARA2txjH5dmHHmPxEwQXFafpTb78B9tJX
-            JaUkGzL7UhWoBK1/uNvaxJEP8CDK4Bnob/OTr3vuIrgS6I9l5XKR00UBnwI0V/E=
-            =UG1k
+            hF4DLHeEFiC484ASAQdAVvZpTZ6B6tmjKsB91b3sZPjzZ07KL0HXflJ2/pYsPFYw
+            nm3arYf+1DJct11C/5DLSi6D+nLkFypXMtQjAPXhDEdhOOyNPDExE9CEbe4TeQuQ
+            hF4Dub78fMESoMASAQdAIlLQbtxpQ/OaCJbeR2LWebssrynWmOH3FAhmpI5EZWww
+            gMTDuxROhh6f/tjmN9mJvZknm6Aq/7EgNwie17o6cx4iEgY3z0sc+wT8gT7DkjmF
+            hF4DM6AcvgVUx2MSAQdAYf5/lBl+h65RmaZYwQ/Hxh3wIpM/LRmQg1Oi6F39kXAw
+            Ekjzq4P5YMWPAkE65DnFO23a0bXQr++sHOwkHhQITg6awJ0sWY4jRn1TlghJoCJj
+            1GgBCQIQC6OoQlwlV8kt4Jay7wDtQmoF0XccaUhHJk+wAefIPrpE9mGoNaztexQY
+            K2U0aC0Jygxwc10jXxdcQnasupAOmUMq7wH/12ODbVwRerCaBIj5HX9nXgZwg7iW
+            PDRLILxic/uC6w==
+            =JRCy
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2022-06-09T21:24:23Z"
-          enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:15Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA08nOrzNSYBrAQ//dwgWnxN57/g6dsk1H1ekB0aYEY7tRUG540i5hsAVovZu
-            w6COdNawTCsd3LbwL6YjN8jNAD0KiRmrj7qPOwsUs2GBsOLLDIYg289uHi1lOP9U
-            YvFej2tbGht32yZc2oiFKLjs+hByTymunwtLLwks8onrLYHi5plxXSi6T0DZxlqq
-            jgIfs42wWbfs7Tc+XucrDe4PppIR8f0OlX2JlgcNEWTxLwZWwb6czJhL8772Gs+f
-            NVszm0ug96f5+QuyWiiW5Slk+IbYkB+9dRIAJMbdrKOOAj9xzczSquxfPHwmEFBg
-            7R1C/+tiNtkdKyqMEtQXYftxYIx5/2r5eX5fftByj9Z2cI1wlvUz0UfljFrlSd1t
-            3uqfTomNuLZuWOCIscYao66DL24zaBextmb029xDctaYAwrQzjwei7VbQcFFFoL2
-            vKT+twFCJuzO3gxYy1fVDgUKSkpELc8+ArhHeKzuJZTI4ycIxLyPhoQq20FH6dvo
-            QTXUI6dbz+Uxzy1eiJR/wpf4S7aZdrtjChhirTx1laG3WoR8IZnjP6LUAMYRHXYn
-            NkiSG05ReM1lEciUiXzH0qDoWxkBBpKr1e5x4Y+RetgHHwfcT/Wm4sDLqznxCgzl
-            zIZDrS74JYS+AKdCfIKOBtcpOV1CdalpPL0rL/HJYphdx1994PW7+Uj0raxaFvPS
-            WAGmTR9mYjo44Sovvey7u57Y8D5fH4m3pOGpy35nKfsUz6js3a5L6Q69n4j2aMeM
-            ceBjiAKtIH5SYx42cjZLKADAyYn8FOwthsUQrhttf6gHRfCSse3N5Aw=
-            =tuw+
+            hF4DLHeEFiC484ASAQdAKcw7+HNlWoPMEjI/k2Vc6Ug6Sa4hfOILzeH429aT1Www
+            3q1GUhE1cugCw8WN/Dd5G7Ee8nGN+slU2oyxbOwLGfbiKTl5YDHgn/iNnnffYhK2
+            hF4Dub78fMESoMASAQdAyjWq8loWLP6rv8vdxypkadi2ttEeUX4UtXLZqj1ex2gw
+            ZsNVUXTfEQSRNCLO1lrUE8WUcTdFyQWEnUqL4OT9Zf0z3JXu74fYBqGnnl9wY2ow
+            hF4DM6AcvgVUx2MSAQdASLoUugWfDb2QqtSVAQTWyO+zSFFpQvhZSmFzRZ8/cUIw
+            teMcPN/7gN3GWINS9qBvvK49K7xdjwCON6BOR2G7MWkMlEms6AuYbfiXGskS9Pmq
+            1GgBCQIQTcFv2IJfbtWa8BXycxacXUHQ7pDj5XQREf78tKWm/TYcRvjkO7g+w/Jh
+            mptqnEP02ldpG/RFdi0gFOLMboXT39rgz4omlPQEOcngMhLqapPkn0lLIErBMpv9
+            z4uBLuh2JKx2dg==
+            =vcN6
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:15Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAM6/fp671Y1m9mmXJbA8qNaOFZuh496DRUGc18bQt+xkw
+            tHmgnMDdNnoWI61xI9+nXXPMVtseCy+5bnp3eV8WBfZiaWjawz23RTkACD4rPF8H
+            hF4Dub78fMESoMASAQdAyXCy5gcrYLY2aa6j7uOMpVEHgErkPkdEWYaBP2aSFAgw
+            JCt5VMs5mH3jeoetf6xsjXFZ0HwX/AiU7iziHhP6dF3YkNxAAMHz8N6Wxrk0kAVO
+            hF4DM6AcvgVUx2MSAQdA6IwZDGZyutIkapWVlyV8zKnV2cGyWDy6LbZOi4EFYzEw
+            1YrCol/KxrSskchywqtKrBguE7mnmLjKhs11kPkdcEVkVUKknLvEtXeyS9HntdzT
+            1GgBCQIQOuFVBYoAjjRL8IVUMrnkbVt2OHfhErvSpb+m8ynBdVgdVWkEoFCB1AZg
+            J+Bs2X9qpEeqQF9Y5bTV5bGxgt+7QBO5Mdbu+n8kKFW6L9M26zOaQ/rNZgjwe/CJ
+            qB63Om5VoRytYw==
+            =HXoQ
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:15Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA08nOrzNSYBrARAAnWZ30736o1hjy/6IDmy2CDqkwDjzkPbA9jLSawVfFYID
+            VIh+OvP5A1LkEVRNJ4HHcRpWFkel6UY+oZZDG+vQ1FU56q9c+buDIxP74RX8bX1q
+            Rq/L1yaKINANKgM7IEePI8Cwogk1yQhqRni8V4l1dPItvmvS62Ziwx10Tyaytghn
+            MGP/HjJxnig3CnUQ4fyg/cH/p7YDJvlTLqNvtTt9UpXeT50KJzrDyTpaMLRy/6in
+            zq8GKu6PjaSg/8+j4n6UJv+2f7yJFmeDCHA6+f4G5fSbiVdztHhjgSImByNXOQwJ
+            /hDJvtAVLUd8I61l/23eej0ZcLC0jWpChhVgFP/06Aru8KMXnZmzp9DxU/ugZKKE
+            1WzEHyrS7Cpw8+W3IyR7RaGZoxVjJP+cRDExifRwF1X7m47yoqTX+opxTHJpVmIO
+            BTkz/SPrJNarSOFm4Whi5X/9fWp7sBWenE+5GhR1UxX1YfdYvNhxxHmyprpj0u6T
+            GTOm+gTbsrB+xFgR6HiT6vmHQq01y7r+CgdHsl3faYpEkXxFj5wIm/VNLN70bIfF
+            l8x0aTtb6XuKRR6LduUYk7urixf+m+qQT+RnqEh6P/hCyvtDTmEwFwBixVtVKct5
+            NSk3SGM/KGn1L5YSiV9mMlsXlc9r+bn1VqO0PFOarYAofJFVK8kKKJ6Mxpmc0KvS
+            WAHbJfLusF94/mhhmra0nf3cSbIhrWT/Ju4M0N/wOIqITe6G7/PmUFSaZX4BvW0R
+            LfP8xqV/yW+UAf74gfy71cChe+C/CAsrVDnyKbZ0e16msi4rFgS8sYA=
+            =jYcw
            -----END PGP MESSAGE-----
          fp: 3176be14f468c6d43ab2206b4f273abccd49806b
    unencrypted_suffix: _unencrypted
--- a/machines/okarin/secrets.yaml
+++ b/machines/okarin/secrets.yaml
@ -8,44 +8,72 @@ sops:
    lastmodified: "2023-05-06T08:49:32Z"
    mac: ENC[AES256_GCM,data:B7e3sh96p2DlqM2SgHWoJ7RZ2q5tnZ6lohNc7UKmwG1HTkrPKW/6jobW2InQnbZn1bPmCERoJIF9QyUz+OxotTiKIXxSL7BJkkfpIkWy9IgjIeADjevHkplm2rXONiXaM2sD46bPKbuRzuhbCZtNwUH74gTVfKPVLVrzpnPRC74=,iv:TTXlBGhO7xLCC3Ad+xiQKmy4b0n0vuQRaCdoe7vpzSE=,tag:dZCharRGK//w48ePu7d2eQ==,type:str]
    pgp:
-        - created_at: "2023-05-06T07:18:18Z"
+        - created_at: "2024-01-22T00:20:17Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            wcFMAwDgSONkM+d4AQ/+Mg9Zf4S9cmANlMgjcq8aj2ynrW1roKJGHiVqHfuL84Ua
-            yv32BJegPbybVAcQLDU7V7lgtz+5cbkvkPYJSeFT97q0oNUCgoXxSRWu3sNtbXGc
-            Zph/Q5YDgRll96n1Rsz5eJr6exd6vtikuGGx7XXLt2PIuT0u9ROcCntmFQfkPKD2
-            Phs8dcsAI8R8JtVur+cQGBWAtPhmII1nY/oHbyOktD0eYbRQ/+0jy4ja/NosSOqG
-            KXPdUCvS6ZJeB6jwFeX4iA+s6xwDB824wSGOUyV5QqAwAuQvaEn/4J4OD/FD6vjy
-            lk7FoTb24ukQFFHrpl6vv04R/7Hc47EGBCI3K+zL4yw+X9hGw6CNTOH3J05J9Da6
-            iUxJE6adyBMajS16b8oGVmfLAv7Fuf0oIYDJYGehqWVEEVEEa+7/mvir6nQkyK6C
-            96vxfP9C+vaJslLm4mrsCS1oXOoX/nKs3uuURKIu0a0IWfP+zFA0tSzbugllndCN
-            wQgB+pOA7dHpyhQcbKgtLNONAudMsOTdApYE0Hj7n2GL7l2SBc6lJRRFx80JYago
-            TFj1mUi1Z3gh9JxDk55XO4YSD1lgRXareb6eamSNB9cmujzniRczT2Ktc/5J7k82
-            dc8X1YNn2sz7uO6tba2t6Gn7t4rkff8wr/7SP2oNdmduaj413wQnJwF+zOpzIAzS
-            UQFxypUHMwQf5PtUs7hSA1Evo9XTZg1dGKNr1rQJR0tV2advXaymOKmunVxVdovX
-            KrEkT9ON9BqHMJ08ZSwFdHmw5nFHhCVQUcziyYBzG9GtoA==
-            =2yjm
+            hF4DLHeEFiC484ASAQdALOHWjRYEy+oURe+ERyiQYDjFPDniV0awCBMahhaLzCMw
+            faMYpJTpirKixpFnPQ1W0aIiQ2/grcEJ4qYyXYG7GrqLcFMQfZOV8humZOLnZNB6
+            hF4Dub78fMESoMASAQdAhpmpD8cyJSauuTHM/RTjLybR1VUGcIY7kLqrB33QLG8w
+            aLu7q0wjY0Rs+7PtJiSKd6O4VOBRrsBmLc7QuBZ4cgBwUfE38g8LuXayuOLZQNb1
+            hF4DM6AcvgVUx2MSAQdARr9S5DSGRJOcv2IgYMzko8fkMHlIR9uIJdJLMdcJER4w
+            RjcC/s5+P0b7wy9bIaAv3vk3FX4hw56QzhqAXcA1zU1kyjEHPnv3qsiiQbcKDjb0
+            1GYBCQIQG5VczwWUidoTYkHgZveZhkVyYIiZc/YQrY6n71OrVnUKaH5kZn1XrMKE
+            zRzcc4XCiu8CaSkQp68eqKeHwI8U5N/LAtjHbACxAq6GHatf/+LvJx4CbUrPZxw2
+            PWZwSFBCZEg=
+            =r7sK
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2023-05-06T07:18:18Z"
-          enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:17Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA+X8PKo7gQeqAQ/+LQlvZXjbIhj8ph2io9T5Si9ZkexxPBh3t8f6pOCyAZro
-            oI50vx50huckq1OV6zxuHYdnGD2rUpgEPXxxVTf3vKgAw2pIIPHQJn0G7xOO4/6a
-            dyIHxCU+iwZmAzh1Dkxxx9yr6z1CaDhdFCSEbwKEIuOZi/VAserPVJU7owRCIR1g
-            pphBTnOwL8hUo69JRUtZkG4lrLDRNcksn+uPNH6WvCiE6OTw1tI+qCqEFzHXKUMB
-            zmH/caMZFM2mf+wUODmH0y8adn0A9Q+vBWEjfwQ0p7LUmTscZ7ipytt3EjyJ3WxQ
-            t7vqXacm5Q8tlCVnByYUQEcYdJPJFvOLAhwDTcqQSwajq+Gee0uQyOTaNh9ZOl2I
-            5pL1yiLgBMg3MlUwkpZM3usRvSvdPmiv+cR8TrrWPq7EYpdrOCY3v3trGsYE+x/e
-            fw1oRUItvv1cPXMWEKpwEX+2ueN7BTRrxujkor7z9FAN4SAw6XbO4YTLw8/0r+/2
-            2SlQPO6UBGO4nj+f1kC2FzFxkLDz0AYtEXpNa9WgBVxMuMJ1c3jrJ11dhRwrlDyL
-            h5d6Aov+HMW+e4pdAVDI1z9lZ6SWVpCZG83PuAkOXdFWiBOoYt70BM1rLn2w1bBn
-            vfC8pOUaWNTyrfrW2GdY8QOoKPLkk8Lm1zaUWQ/J7/jErMTQRhp9cULLaQ+nKkrS
-            VgGImUPZROF6VMQPlKcm7ZMTpUP6XyuInbh/GlaRAaULGXEqQ7RqBDI4HXED5w6G
-            GPUmbAlFZmRTELDFekdI3N2i0JgEMaZVlzNbnSHXLcyJbEtjDWa7
-            =qBwQ
+            hF4DLHeEFiC484ASAQdAGdRYvRfki1zKA2YHnPprf1ld5kJkai4fzxuuH1D3DRQw
+            zt5XhSFMx5ii7C3LIVjGgKnn6A6KTe1Tj314OYtrLeCGV8Eli+eOiSgi4c0nL709
+            hF4Dub78fMESoMASAQdAb38j/KxQlLRJLrtE5mS1XVCmaEIvyJU1uVcSVU3Bdhgw
+            f3iepOZgggHOCiHOCs+UWRmiudwoYqMzXF8G9pb6ESsy01cc1y6mXPh6sftKc6Iz
+            hF4DM6AcvgVUx2MSAQdAhq0ynXfS/eYrDAYdxj/qyEg8c2lHFYSaUVtr6v3B/Rcw
+            Su08ppwK9wSbVaEL6p4NPJ0q9mt/36OsvZNaEWL2i7kkrD6q+2yvaGwh/fPcokWI
+            1GYBCQIQRzg0YDKpmBGZY0sC37nIkUC4blEpFTgl+lma0ZQ9PUfbRP3ijRrxyPv/
+            aNkUpVAVxjh3VnV/NEm2s03x62iO4uiGoU0BUeI8Jjy4Tvuuodvmfpd4wZw7Mq+V
+            B8h2L/JR7Yo=
+            =/wMt
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:17Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAoM3SQYYUQq6OGImJaecw42BZOwOec75IWS00ZorR31ww
+            uaRdi54liGiKpjaebhPcLkX+0TKcW0h11kw6X1wrru1JWi3YLbjohv0qCtfa4wpc
+            hF4Dub78fMESoMASAQdASH4+jxa7Qr9AkJpHHPmMx9cj3XyPXLpfzXJ7Yb40pHMw
+            zBiVmQApa4K+ZOVw/vpcSNaN6FufFoDb5IguwHIq+9vILvjvku6YFgAJ4gC76LOP
+            hF4DM6AcvgVUx2MSAQdAZGNp/j1sF0rmHhImhnuhgpn9NgRuFtL+BH5dorvrPwIw
+            mK5LsWHvyBFyC+SDNe4mrRkdia/xPECmcWrbvptGVjqlZnjmUbtrYhG+j5O6/817
+            1GYBCQIQ/du7No+ULrBrjWc3q826ju8AqekySHtteKZclRmcHSNP4UEXcmTEMRNL
+            8lMJYK0G3uA9FXO9+2E39k/nIatBGuoaukW7zCouB3bLARZE00Oqh6qHCWVyFJ/S
+            Gzwk8dC0wdc=
+            =BWUr
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:17Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA+X8PKo7gQeqARAAhtUvR20r2NV8SNWVuVSopTfCGwaJV99+PEp/l0UjHX6B
+            lpHgQNHegP6YEsAj5HNFEcV3vM+nbC0hbTtcERBZoxTkyDPOaRAyJpNfGniZVxxp
+            jxSr/unCN6aJCbdqJZZZlitq84brMQWUE373Rb9B4cNdTYONabZbzZmwTDyzkVR0
+            ctjmkdBG0upqNn7vukSIg7DM7D9pFolS9142reF7e5jTlxBFWR1Jt+O9A1zypfvq
+            tK2z9C1pM9LDRmUrKJ/HOKwu6P6USeTKFrp7Gfjr1UkmbgNunxgsdI6gwKY38SpJ
+            T+tELs68oC5pGFpZufnYkrGL313HC7Vp/+2+m+W5qXbyNqhDS6uVQHjqz/ROqByb
+            YwJw+x7810nL8+SleXst8oZpxDNDm+TnvWQAH6WiRBSpgVwy945SMvGG+1FLYps2
+            qOsRMjr+titLZAaUpmIh/oDHG/XOpKPQflcc4/V7t2HK6vLX+xvPIQU8Y5TJkr1T
+            nIIh7sMZBUldnUGUfFE3ksP5Gje5OHqK8xoFwYHFGK4QQzXFjPFN2QNvni2z9Y4R
+            LLMvyEavqgIa6AeseqMnLuB2hz6wy/JNU/EPUalNca6RleoVA0DjKgjgDTlhQ5Al
+            a6sRTy+KmXFfzdO97MJJEkNgA1Hbi1/IpREeA50lYtrDqUvhxw+l1V8N7jw+ZWTS
+            VgHYyLUxdmOUsqEgQPVA7jiqWePwFEuEDEDVE+d6CcuvFuHFNV1jJEjit3R0wJOd
+            QpqnfxW4QTD+JFNJgrD7bj4y1Gu9Z6Lg1IBnHnOwDIoCJoAHp0y6
+            =sy/X
            -----END PGP MESSAGE-----
          fp: 868497ac4266a4d137e0718ae5fc3caa3b8107aa
    unencrypted_suffix: _unencrypted
--- a/machines/renge/secrets.yaml
+++ b/machines/renge/secrets.yaml
@ -19,44 +19,72 @@ sops:
    lastmodified: "2024-01-10T18:29:17Z"
    mac: ENC[AES256_GCM,data:jsYCPL7/AFxg9mRM/mKhwiy4eH6ZGMyCCSBu+jSfIk/T8RSd9zh0AZ/p5rAwfbW20AzetivzRB4bSgcymLIcCr900EQLdPIuaZgxeGcbZ80N/7I0zF4u8K8oa1pKhyr1UUj48XjL55IdvVOsyvfq/I/KSbIbO7+fBHeQ51crCeo=,iv:CNmKwvZ61PdeyOvGP7elm/yvokll//fiKxdWFe2cfPo=,tag:PVQRV0G3VtBsD0tk34DHig==,type:str]
    pgp:
-        - created_at: "2023-12-31T13:31:08Z"
+        - created_at: "2024-01-22T00:20:10Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwDgSONkM+d4ARAAiRkTy1A/KsZ9M6d/HXABsZxzPLfqLTf9XM4u3qHhgEMJ
-            N88nP4pYpC0cn5X+plAAvAnU/y1nF6EJxAdB56HEK9EYhpyB4O0kF+Ne9Z/Oswkj
-            pMzKkcuNSZkoP8zo7Db/Pq1jTZ4Pqci0dW6VX7Sj9Twg05RQDGnCJ7369jWaKs5N
-            YKRRJWwIygygHZ+dKo6PBMnCqBVGhau201z5Bczfhw2/BNQOK7LTOGAyoy86JHTS
-            el7XChqv5q6OvKTA5oiIDBW0gIoZ3ffvjWpKNUj7VmxTM9k+i+Ub68xSZCBP2kzh
-            RexyIKE7fYze+PieMXuQ4O4sTTIUX+OeBNBrp9sQcB6rw6QLqfcSlbaIt6KYjhSP
-            FaW3wEmZ86b2lxOvmZQw1/rcPl2zIdTScGqvUDLdEWaI9uhW0VnbOT5WSVCgGM5s
-            QSHKp5myNZ0xYWGkWP3DwZz7OASOZQSPeuazz7uQcazWKXZOI3Wn3t8dEWwdf0Kg
-            aNdnSLWwCqSvEI3lH+HvV87JrLQvT1F7vTkBzUuzXCM7/SS1xwR4/r37UBwQekI0
-            YGevfnFsyhrXQHdvcLdR6XtEdWLnH9Ym2VezK3rtYk3UPJeryvb2nTr0v2KDrLOb
-            VMjIVsj86IvuGvaHf83O8lpJ7+FOpHlFlJRMewN/4ceDLC+DEaBbuEM2MQWitGfS
-            XgExOOFnL7cvswpoFDka56r+POJix2CgLx0Wn6Y5Pj/PruRneW5pTfEgDNvN7yN9
-            JSWKfbUCQbL77eD2fNgWuwmOq2C0xmud6nJhAUqVjg42UCTp9lBa1oA+cwbfzWs=
-            =rZZp
+            hF4DLHeEFiC484ASAQdAecnfv38WCQ8Qv0pMNuv009PzldbVWeyeUFO4ku9q9w0w
+            zBjSFRW15EubJZC7kbB1G3bOATEYS5pJgraXlUOE+mumax6YkXzEcrzHXS6fnm62
+            hF4Dub78fMESoMASAQdAdeZFtFSOR3SvRR6w9gd9BIb22shVDWyu2tMK0WMdOj8w
+            rS3m4wI20FX1axD30ATt/3OHMCUFNk4IOc0yLGX2+xPtBNaEEbYbrsh9s7KdT/7Q
+            hF4DM6AcvgVUx2MSAQdAKo+Smohz1lWF/oyZm6WJnTScEDYBHnw4Gm65KEto1hkw
+            9TALI3QIca2vHiiAEsjQVfQrP/wFlIgkmAgMSojZM/mGAbapbPly9SapDZOjPBcL
+            1GgBCQIQn723uPbXAb0QOSj2welUisMum1GBxNaqP0nxe7O3ROA2nO/Z53yDAK8q
+            u/Rbk0OLcl9ZVg5TpSxWJkLD5gKejJMzetnSjHX8kkvV7mSQmWanUFL26muIWagj
+            TOwJ+wRu7k3MCA==
+            =nYCp
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2023-12-31T13:31:08Z"
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:10Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAyhQdcrIW3A1AQ/+LYsrZaD1OxSZ4uDFpwPUbXp/HW8SAgzk+opgDojWImUC
-            9bQjnC0iefs0ukyHRlx5S/2uLBtBT1hG1Jecl0dmGARoLhQrHq5n+JuFsGoHW/IX
-            x8i4HAGXzKlmAH/hqUWAe4DS4DyLrPsXjHHfwQZJLZkmyKtvnkKYfzi1M6KZfsR7
-            s5+aB8KaDerQHjCtpufoFpBP63X66zOxjeXy5ODAKrcbFNahEinLqARnJCUHltCJ
-            WXMslGfmFmv0tTrd/EFWy+QpeOqObYrV132XEoPOi8guiYXVWBKIm/FFv6bu7EbR
-            WOK/VHrcbqprJoRsFrj7CqAvLfmQacvJv3cevxFVL8fEkUjwps76IReKeA/WUBrL
-            8MG3gnnA1ALCwmuEy8ILnRs84vVx/f2ceut4K5tGOoRUVQnBvTqsIs0P664UUN9D
-            AX6YrLzrK7ljUDIDHbx9/UHND+BNny7c7tT0u59ZHR09pu2LOn0AjsGCfgIJFQaA
-            8YtW/SMptjnkOa4Zy2GUzlLrhPC9Qsfc120ShNB6JLClTabrk6A1+sSavsUMRs2v
-            tpcB/SWdARq1nKeMwOo8mxyFUj5+/o5/vQ78dU+2n1Niq2/oyaej1ykfE7dhS0nn
-            hZ/6Ln2V5wUImwoaltIi7lgEPJMKkRNS2yskSOIdgsOX7jE87sqjXxImJSJQ9abS
-            WAG+4n8scEDZxGc8hpzvlfTnutuzhKqb+DAjwVrvisu3J1wKWWZ1QysdW5aNwY55
-            q7dq2H0TMosyvRtSK/yAZ5gaGH0i3OjEbVFp4xC868JbYxtVAL/LY64=
-            =jjC5
+            hF4DLHeEFiC484ASAQdAJs/1k2gWY2EhR9fdGIitfObpQ7OXafmrxfxGpbm1Vw0w
+            rA1vEH3sstu1xJo8aXGlh8s2OFavAh2jVFII2FnJEzueIlRqPoZGDXFuyaLB+RbV
+            hF4Dub78fMESoMASAQdAnsegQHgjElMF4rHwdZAvt2lwlCVOtGlKPE/W5xibI04w
+            iPUGf0218W/iTOPryK3gexsudU8zPKnvTHgxPPNJRTfvF/ouwgCMu61lk1GHLOZq
+            hF4DM6AcvgVUx2MSAQdAvgjlfummhGWmii0h/jmhZIDu3p0CvRvA9Iqp5XaCaRkw
+            KQc6I68McNPK+0pbhYOQGgIqpr/q3Maj/CT1qh+U38eIBV4XMx+gjMKeTU5Wq1cm
+            1GgBCQIQf/ZKVR8meAn8WM0Xp2yGEh2EQjftAayPcnYROyzpsFf2otVGsQ2k4nrR
+            oMNClXtjiuuLBe8wBr33Qjba4sFm0MNiuMgCT6eDbJPDRyRWptF3ztyNf3kTODeo
+            tVz1t/ps1mUlZA==
+            =1KRJ
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:10Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAGJjHK4r3sbWQr+Db8TSMhh1d/GBrKp5hQNavDfx15CMw
+            JsCpvdk8sp+BiQAKhs4uBFyX8lbN3Fp+4Kc8D1dQMRvVusmDXaF1gSByhx18fpFB
+            hF4Dub78fMESoMASAQdAK6L6bJWCSHowtsLApq2bB+KcdHWu8zEGuIcGvPX6sXkw
+            HXgM1X1dFl891kMYCnyO9lf52Wg8oo8b8TaOMhfb/WstUMxSNr4YmPgiP8yuoFrJ
+            hF4DM6AcvgVUx2MSAQdAtjMlZZRKlMi1dvrN/ac6KPNvjqulWoUirUpUIgq+ik8w
+            puxgTM3lI10YG8wJJx+JoPDaERYIBdJzZA878Qp6eTYzxuUfZmcPxStoJqBqA2eO
+            1GgBCQIQMXFKQqxhSUX56pqb2BaqUtiNQ68no9a43rZV8uL8GneDap4Fd16kq02I
+            Rx4pCdL3bXThaVdjyvWw+MKD6I0t7jgAMcCD8rYhlQ709u/21qcsdrqOJTMV8w6L
+            3CK9GGHRnxRzqw==
+            =vDCy
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:10Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMAyhQdcrIW3A1ARAAzaEuorYL7UVgQi8QhuzqCmjUdGDxty/Wvq27i+0sRw5p
+            ePyCum7G210b52R9T39PuSUgo7/ts339uk0dSHKoj73Mx4Pa+KoKT6QESsUnnlsA
+            kxy87E//c4TO5RLlBSwrpMIom0+DscihDsirC619tRMvE2hzoZeceQZVZQxvz9lJ
+            NE3g7dxsk9wZ0siL8Bjga/VvgN6ZAwxm2rAcSb1rP1zCNdefHC/30nTMv5pgAv0f
+            YoNQHoLVc/aFvFi/1U1Kw2qm2EODtF5TjC9K1NdLDRdMdsq43IAi2XzPgMqiXV5t
+            AWExnAVvGG/+X4kdUIgH1W1i+L5b4GRa6jg5rYNd0G7xuL1e3+shBM+VCFj/EcJ2
+            t434IQla9q65bmfRnMp757HLUQ0lnOSsd9uTufSRaXecJfSyXSoMogKmmkDLN1zV
+            aN1XPx1NB26cjhnZh2oliA24WQeqADncaSdKloUR1Z6+ARbqrQJVrwHzhKdMjT39
+            zCsmcMmxOMpmqG+v6pzcnor+Jgag5moUYUzrWIl+2SeofH+cNYoUWbhtZYgoO/RV
+            DPloyM48U30K75EIFUsMiJ+N2K5bMR508xdYwv4U1RyhR7wdSIfRFkRhK1RqlVQe
+            mX3u6sDS261XLqxAc5JZUUtsDoBxMwxEtzuJ287hvdtY0/goOK1/O/g5z8UnXW3S
+            WAEnQOVNUwQnFyOmVjjbWf4y5SnoL3bM6gnpvcKgC9fvxbZqsrEoNq9QOu1iRmy8
+            e3OHZJr3oJuAoA5u38+SUCrv5s4mkBh9YwT/rpu5AiDE0sfcMsXLe38=
+            =q9lf
            -----END PGP MESSAGE-----
          fp: 06a917fc4a2a1b6b0f69a830285075cac85b7035
    unencrypted_suffix: _unencrypted
--- a/machines/shinobu/secrets.yaml
+++ b/machines/shinobu/secrets.yaml
@ -10,44 +10,72 @@ sops:
    lastmodified: "2023-08-08T09:43:37Z"
    mac: ENC[AES256_GCM,data:lxoKzGyPwdfeI5Dlmgx9K9SBhfRIaokvum+dJWABUoGtIMtrhp4K4ZRF1Rjja8oTi4w3b+s9aUBpxt8TLu9vJZFsUkhY2gqW5bX3Ub/3xMAR9YSG3LtijRSMuKkdVlAkdjB6Guz9aHNVBG3fTZ+SfTlyOQdImW6bK4tydbGHKgY=,iv:6kVR4zZfHnqhcOT3N2tClGST8h7FLjIseXDu2xS2DEY=,tag:rd/f7cHSoxLT3O7HluVWLA==,type:str]
    pgp:
-        - created_at: "2023-06-29T16:44:16Z"
+        - created_at: "2024-01-22T00:20:19Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            wcFMAwDgSONkM+d4AQ//XL7P5/P31g5aA3wEuLI2Fv6NuNnf3/M2R3jpy/dMVvM4
-            rH+c3aDH6QnXvA2JzPAz235m60LKlKQPCQbakiBucuPm0al/lFf3YblEaW4l68ZG
-            75sKk5YZqVpBqoirQTT/o4/lD1pLset5UM4OJ1Tq8t6FlNVasFah1YBKbe7I9l53
-            4Y85y1/dCcuAfRTM21l54+iL5Lhz/CPd0B1glfgszI0Lh0bPoB+HHGi3HNb/S3PP
-            L91892RCF2EYVb0aK54mpeq6ZVrpdnH37mFuNOHTha6qvpklreIcUSP9TNT4UEQW
-            Pz+YytPH0vGeIq26Eb/1pfLiZvqn3eHs7p2hrV3sDXFdrAnG6MO/vy5rRd4vyTUM
-            GmUBGUHS6acaOLdnDFHMQ/+tewreq9NnJFppBQz8t/hk9mjz1XWnflMHipKe+t6V
-            kflhjDi7kwndG9sxHn7Mqj059ZKcKs8o8BTqPMgBAp/Z1IvSVyj+Q/nM/RpNZim3
-            bs5z9PY8KUzD+4Biabitj21c4ah9pFXw/6W2sesAlFQGP+DkgIKuIEhyuV6HSshn
-            m/M2Q9Ma0rgKCgtgse41TbMMQASiJPA1mdtO7RE92t5gMKVVAiVHD6kTfOJZSAkx
-            TbxGjlXDLuqugKnZI41NwnHUdCUfxTGoeFqtaqYiWQ0hdgsziHHEkMxlPEGDFjfS
-            UQGlBUSl6nB1+RI2x9lLSoQbz3x5ZdXnapi+KGLfQZb11nCegTLVyO5NO+sI54+Z
-            umyIAqj6/MqgQQGt9oWJnybbFnhcjwdfEIwW4sSWJA5geQ==
-            =y5Sy
+            hF4DLHeEFiC484ASAQdAwnYNvcwcwAzUF+sA9cAdeXNAJqJg2rw2+hQYAWT9DzUw
+            veXMAz2Unn/metQhNDevmupBmyqJfECjWcIHbEnnbz5vt11ya0lWST6ImgrheWfF
+            hF4Dub78fMESoMASAQdAVcxlH04/SewgN/q3xBq4M4K0DLpaFklaFJ63D9TXX3ow
+            G63PtTjZk9yjT5Xsy5yVYDuUXjeJbZ/LHtImfJWLhFTg4eqOS5kAGriInrrTnZ8x
+            hF4DM6AcvgVUx2MSAQdATz09Pvpg5HFGAyBSsRd7WPo7o7kl9cUit2+obbVmfHAw
+            zVg1kKxTXRt7q50Ry3ry/471WUGCNYrqH5sZ0/5zm0KA4v7kZ2ctQTHxfHIQOQh6
+            1GgBCQIQR2aBg1MgV5rDwFKc+4ivwa+5CS4tiCbwGZ1oAuSGZyoCaToO3gSrJL5V
+            aGiGR64uxMX0jf0ADI89FpodefUQ9Y34AVgG2Inyc3/HIIZd2+RGiTfY+7pRcDGB
+            nPdQPO5T3yfKkg==
+            =sxgv
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2023-06-29T16:44:16Z"
-          enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:19Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA69EXrs5yIK3ARAAvjxMdia3YDWmBDM27K/om1wUtZk+isrQ5r8U1Di6uF0Q
-            qImLsCXRPumL3ZtzZ9qls2OJlUvZQkfE9Ek2/hHINGfUIdNGkXCgJs42Edcfd6tK
-            bd8hZf/kCJSX3V3c13sUdVQWy8RavUAb0Ezc0H1rZq8K1Gp8iMO9NAm/m8UJe2tM
-            +cBVvzhBoI+onkrWBCsiquPuts+hgiWMwr+hOPsQhT5VP1HM/si7k9JgEEMlqnMo
-            NOJUaqbYSR8Q/cy3jjfkAbrpYJ/ZuvZefvU2j+nlfnyzmiWV/Xh6QVseaq1IvFqg
-            ZmdFLyursv19xTYE0HOBX3c1QlEK5vMFdzADOdu3KDO0JpGwLMcR2dzX8CRYNzyR
-            B3cbfwp679B3RvKhMHKuVTy9bdb5df6CGBjVeQCNFmBSbimVTjTpFxMk5rusp/j9
-            Ql8h4ULajrfSmN4T5xoIShsmAAFeeSdHCLrACXHjHU0v2xh+MG5dTZTLa9V+4s7e
-            wIeq4v9ED5PFFRr+mQUdlmQP+fdH4Cwor8OZxA4g09RFoo3MUgLHWaa5emL1z1YN
-            fWgZs6EsFFTNYtUoey91eFzhKYYKa1P1gXztgEbc0L95Qqa15QPeWGYgf1WIRASZ
-            POTGCjleDuqnEoFFdt+qaVYtpCoJnAKjhSFf10DvN6AQ0zraXldHdx4B1wYBLQTS
-            WAG5qS56CCwMxqjic2OfdSul2zHsCSsoXrWmqG1vtv2WGE7iIsseUor7eeLxbHIW
-            /8Y9+kx+ZcTSXcs9t1xBHCEv3LAgwneVorOhiHVS4gu6R7crYLKpygE=
-            =7Sdh
+            hF4DLHeEFiC484ASAQdAuMzLWQQq1HkTOg9t6rw41OPw6eW26wUgprjUFIblhE4w
+            nrgBq3dEB/GW77i5S9OeTaeKKFK1+LcvFvT/fFL64bfSKmQf/PqVRBt/oCqSONM/
+            hF4Dub78fMESoMASAQdADPeTGef10BE/bUXuWvyyjP9QA0hYqU61CuKfUJ+19z8w
+            8xJTbHbNgAbSDFDBcCIFQ2X6i4MrxJ7dp7uctyVYvAA5LEmNDokJkfus/+BpbQqS
+            hF4DM6AcvgVUx2MSAQdAtkjVB9YB3HfqX+EFzpdOasUbjMvV+P4G90kET7Z+hz0w
+            maR8JfV+2U7SGAqwsgPQ+awINHLGI4RzwD0Iue/obf8eaofuuVShvUUj+OrYGiYK
+            1GgBCQIQOERoj2IRFYE9hXu1PlPUsSbYHGZhQdn+n/dWccS/REIU2rJRjdqTLtgL
+            u37UqixhLFX7POPIZ0Oacolpt7Aoz6ChJAIk01VDnSpIITiSPG1xG7ltdiLyEHCq
+            qTfKSvWYQCtA2w==
+            =/MG1
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:19Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAMYq9TEcYhclj1gFUwI480DdBY5sJ9mb/eyF8LyyffEAw
+            u8PJ14JvBad2CuspDbXZPMJrf6ekENc+7wtHxbiwTUjNRtynErnkdDL35ISPSWh2
+            hF4Dub78fMESoMASAQdAW8CpyTaMnkEGNkyUE7ofugB6KSDycX0j3DgblMT7Lxcw
+            P3sxirh9Oy2urfYKTxSOX+nwS7POrlDxRpnFyrIa7+Iqh7bMIv1Efa2+8keaWkuK
+            hF4DM6AcvgVUx2MSAQdAvVb6NDLQttcAkgXlv1QtMNYip9uBYN6CW2Ai2PuA6XMw
+            sXimf/7/UBs71GBL4qhEzZ0TYMtm/5b8TmjWACSX1RpLITioNkOxYgIsMXNZj0sy
+            1GgBCQIQBWPjuJ09lcdKj1Dqg3WcCFz9su1lFi+DQ6/xjEeBPgbM+RJT4Tm/UmRi
+            ZuSX6KAMqedYD7WQNQuSBnYd6jCbzEoJIEpJqGi73mPDhl2K9yaq/ytOAgR8DD3G
+            ELrn0ACG4qHkBQ==
+            =NMMN
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:19Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA69EXrs5yIK3AQ//dZ8vN+kzW6oNuz4impfPbta/YjTUG3djbeHbSGwLjBQz
+            mJKV11juXHLDbW08zaBYaYkR2rZn5OT+oAH5qtCyUO4Bmv1IN7aCTk845LR5QQsu
+            ZlmJ7sDxcNtPlhJ4GjynNpq++vY4b+2LgtlrOVU0YkKhDl+x+usoWhf0dGopdeli
+            Nijn75J873bUQVVfBmCDYEhmNf9KOD23A/IdsEp2aLaYbrEbETC8yJK8qESKU/PR
+            lAjlZyswQNHjnhpyhiNwhO8ePojBVbN7e8DkAsijXqc4gQ2+d4l4CLDWHD+/Lp+v
+            rOvlQOz2lu17vEFWhdLUrXrL2WPU+OkeP3OyuYPQw9hZNEtxr0fGzhFaZxnhc6WV
+            /WQNg/1iaHb50U7kQ2RTwnmRlyz3RJjCa/WOYa9u6Uu2ASpc1TNU14vyK+z/Ykxl
+            UZRkBp+iT66hzJafMswVRioCHskSQy3IyDfiaPOQGxgoCB/cwXIz3VrEx+5t0VCy
+            WQ37zcTAIJohv+xIbS8DICMt7NsDc6Qc9m9STQhwgYG7wHt4tv0aL/444zuCGf85
+            6j+7oT3qZyO9vkQvzVKQnPuD/d7elAe7lo9FhGpSAjOEyS8OILwGNrLftien8udu
+            Cd3OehBGGupf6SNJRBqQ+a6xhtvI/Z9kA7Tn1L9W8XHnK27IpdNU2un9Ydrgh4/S
+            WAFKxZMI1FT4MR1GmYSMEzDbGvnbNW+wZVMiHKBhebW7v2t7UgcUrRZzzWMVJ9kX
+            grRJcWX0CZNhzEQ8y6FAWygU0vAaC+4NNPJ3R3aOkjrhaIVMT9sjuwo=
+            =0apY
            -----END PGP MESSAGE-----
          fp: 28677f2e3584b39f528a779caf445ebb39c882b7
    unencrypted_suffix: _unencrypted
--- a/machines/vueko/secrets.yaml
+++ b/machines/vueko/secrets.yaml
@ -13,44 +13,72 @@ sops:
    lastmodified: "2023-04-29T10:17:21Z"
    mac: ENC[AES256_GCM,data:UfLbX+4uDg9Kp8v9lnq9RktT4ltpJYwOHBBPRhO79a1AmLXkp6GilaoMJYjkj0foL92vTUK10wIw547omySwJeY52pTGAvw1IXVaxNp395KLlMPl3EwLS3xj4c0bhzcVEyFl/fxG2gk6BJOzvQXaMYo4COEzDdK6ZDGZKZVKEAM=,iv:mR9Nq+s7wHeZdP6/gW9+zJd/wa1Y4Q5saACwnMOFOZQ=,tag:yYYF8/mKnbxzmPa6nWIGbA==,type:str]
    pgp:
-        - created_at: "2023-04-27T20:24:09Z"
+        - created_at: "2024-01-22T00:20:08Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            wcFMAwDgSONkM+d4ARAAnIOT/+8BwW8miQ1Tl3SsWolgy0AbJzihq0Cq7mBdlY/H
-            yiwPvOcDD0XmGCCXT0zCUOGsZkp00ZHciRGuVFH14BSiHaVxOI0BNlqQXhHPWWzU
-            KzvcBjfM6xENwEFGW548Xzk0QjNG0CDaHt5/xEXGqgmfT76z8AgsRuzf5UvP9305
-            5cM2knSRZSZHZ4xZkDnfm/6bLHAeE7RSSH5kBDyVW2xBTQIPxfvqVox8ka76gEsT
-            L4pnbTZmXT64GiT3aiKbeW1LourwCciY2JD/6zrmi5GpKYS9soENEfVM6rnJr/O9
-            nHTFYkwtLmnJeCGGbiDBILisKQlK2bQwnRNNdRM/18e2wbj5vi9TNsytFAxRqzS+
-            Iop+q1Q47IvmI3ZENI9zM4ynPJ4d0KMopkfHY6TMMVXK5dJ4dUL8/cJDv61FH9/0
-            pPHTrpcLqBnFSiICvo7iFLdk6fmZbVHtFJwmaIRMJIE5SgvOvbqhd7ys8PXICFoh
-            K5uKSzNc0AZ2rfqInUp5NMNJXq8GoYvw8LpIQLHFtl68OFdtFRepsCX/3laPiuIT
-            QQ8YVKfG9oAEkkIVeWMAGj2E3KzM6vhK594VdYiRbeHtOzVK1ioBFXEfRt0/dXKX
-            D9I/yNDcB+prsfiyxl4HKXYsN1Wu4eD9UnG5q2rsqpRuC/TSyyLaT6C4F/SXzUPS
-            UQHqtBwtbPs0+2rN6CGvVaJuufNj5s3DMZFi137dHJajUvR6S0SqBaSKKdrO3G/G
-            lDB0DmZzp2KHYrye+XJNyaw0lgAcMeHZ+u+gmfI5OTE3tQ==
-            =SAvQ
+            hF4DLHeEFiC484ASAQdAQsATTnDDan74rTQHgq53ijZx4zFdgmLCqLPTex8N6gQw
+            1QLAYn2yaPmPf4vJB/2vUpaIW4AtWgEsDQAvbhgwBOuBUTkmlMNKJeA1OGhND54v
+            hF4Dub78fMESoMASAQdADx1Djn5Qnx0UXOUQFmbUoe1wk0F7NCPyi+mEL4XbmHsw
+            oVnAkyxiLuBo5ysEVbplmbxjVTR5YEMZ4L6wiGNhsFHqvArvnygEJJf1ILFFlGqa
+            hF4DM6AcvgVUx2MSAQdAYi3UCtTc2vs5uwLPPL1C5OLHgf1V2N7yERvart30T1kw
+            oT251Qk3N2baxfdPHQ2cosOVPLb1aHsnnPwesLLJ3FHRoVJDnJNLyYFwLd/CTG6O
+            1GgBCQIQGeo+FemZlVnzpv9WZpBPpR1VYYvcEFJyEQsGficleds7V592hKW0nWWU
+            vOX1Pf7gVz1eIc0P6DJbjhULzaRNbBTYKheYpBFqFnfJQxon9XbgE5mdhNnGdMej
+            KzE8JkMNOjroBg==
+            =/pH6
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2023-04-27T20:24:09Z"
-          enc: |
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:08Z"
+          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA5TfpJU9hyneAQ//fwa965U1kI8MQEyKqy12ViXJ3OsL/9J3KheyYTO7iMsy
-            hVe+KeXthJN7vNYxNDmxB4Ulmh//PwAXpAoGKMPDzkpIKmo/4ay2ebx+5Nx0fmYV
-            t3uIhvfhxAQK7H1uSljrCqYckf1x6T0aLNuzCzEedOdNIQ8GZF+Uk0QOf08Gxi5X
-            Q8SeF/80L9mnQlWVlofhRCSYS3kjRtoSmz4CVN2Tup2FsxN3Iq21lyBKxbPY7DGw
-            OSweBBy+j+DIbApgXOetxD7QfYstF9OkYmZIyudZLz6FVgLYUgsFJ3l+c4Dwzfb0
-            QZ8f04jTSWOQDQay/LfVu3AYLUXanHAfiM7KdwVcxaJSgrPg+JRW8lR7bJI379Si
-            yxPdVZvuFue7gUboOLi/cxfnxn1NlRg0OVoMLVWHCd0se1M0VyyQTN9mb+xd+VWV
-            EZ/ZUKzy03tUUbCxNZWXxyftwgvzRsPFd4vsDOAdcniW9YPIVzYz/eSpW0FYqkoM
-            MUauGXhsgCOV5dkT/6ELpR50mQk1yEOAwAB8qI/Rh7Eez04JoaWCq5HV/G2MNO3U
-            dm/sQCq7MnpMZ844/jLSZUgGcne63Hb3DCfiGmz1MW90QaOSlir/Zi0zoDdffAdr
-            ywWXNNQgxJLGn/qv8E/uIzI3GC3k/h48hMoPiwuqUD4o6NvhDkBHHRlry8tlh43S
-            VgEIW9aQktQ+tf6CiECNWw3HM8hEH5J689Nmg7B3lRzy1IDNlqo0T8raZ4oqPKY0
-            5AZ1lKMybu5l/NOFSsdhPIR2bt1GBRnkC/xVbbGXL9T7v42JtPdZ
-            =iDR6
+            hF4DLHeEFiC484ASAQdA4bTky9LX0MmhfcDH6mNln+PjntgX7bGkPlLaNfvtT14w
+            NyaLFQLwDedtletHnHLAU6W2nlMdOPvcAJXGHydIYM3Qx5pWQkOhg73t3PvIdZhm
+            hF4Dub78fMESoMASAQdAMzw9qZmJRCt9/mvK1p6bQIZT/PggGx3w8KkcaHMC4WEw
+            exjNBijzTbq8xd/komwe35q6KL9PlLG6VGyHNMNO/hP+sabf9/epCaPvLpRDwUZv
+            hF4DM6AcvgVUx2MSAQdASQs+PXZ0j4FEBsoeQpEciwizwC1b6jVB2I+DDxxttzEw
+            V0DBA+R4oTwx4m+SE2gLap5DT/UD/Xz1iqSIpbwgj1bqzOvaEkBZ2V5IDzN52jYH
+            1GgBCQIQ6Dxs4TYMM18CwQM1CGiJq5K/tf5ttJXcQmV0JAkoEm/v0dkKHzZZ5W3O
+            q+lJsohSV44bTmdGuNBKnfocaXNz6u5b4SDbFN929DaByOAnS5ZKDbewXcFiC6md
+            HOz87XzQ1FM+Cw==
+            =zCuP
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:08Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdAZSIRVtE5r62n4FZ+ubRJEgRtTAykkoX0XHLPDBBxbBMw
+            Oz8ky1EzkYQXEylJA9OK2s5JqVLObWM+r2FG4EeENrdy65EfaQILSXUe1rxJiko7
+            hF4Dub78fMESoMASAQdAvfxrjQAm+7jgATbFYANH7osCctQoypdkqYS/ngMpWGsw
+            xkgELZtEagbFjHvlWj8zF7P+IVHtXZOkOdjPtAvaa161MsQZHTqnUljt3DuvSwXf
+            hF4DM6AcvgVUx2MSAQdAfXgJdcwjDiLiYpfnISpEPoVjASPIrFl/oe3lllT/ATkw
+            FHXRISvYzqVF3jwsq40K5B1/NuvoiO4Lx2cQ2YE7ZQM06SpWMGoxay7XvBJ8CCN7
+            1GgBCQIQ6RJv+rxjbWmlYZ8nrwiiMlhmXGPbanpICoZMBO708ANfDpc7Nizyh8jt
+            hs+AmCg4/hI8dhDCcbLoa0XB5ZuTzFLjD0Y6YwOsqdsXIKAAsRZz6tcjH+RwopOm
+            g3D/CUNVH4LxOA==
+            =x84+
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:08Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA5TfpJU9hyneAQ//XUPYk0ET4hns2JqC/Stt8WkC7mpeNvMZKxrsHHmVWl73
+            xQ/Hr6rmLGYVf2/gFmEZVYv2W2O8zT689HfXgOrUYG7gz8iOMpC7L4w65fVKxjiu
+            2F9NQBydsGFiMCM8+VstDCn03v9EbGe5Gk1ENufKZVY64bmSLYguA/2fsfJZLz6F
+            t5oL3uHChQPchknnI2L9GzsuQdzgkBJiHqEwCQHFsemsed6j1R/WhjiZawPLmta4
+            IGWocX8v0oMfUhC6YfZfv4By7O1MoRGNUlTzIRcS5LjZZjjuA6v78uVPATUoPqYs
+            4yU1OYbYEaHwjjhA43+MJ9i6VczafWsWilGX7Dg/imhkasAy2nFOltEH0K8hCQaj
+            WaROx1UvPH2dGS/5pBHW4grC/WuyChxQyXpTpt4iSwEhs9903u6lAC2CzL2mlVJk
+            fZoNKBJYanxzh+X1O9BVhxLYAfnOEY1Fk7D2HbKHvkvlV9jqdldammSdrFBBpDp8
+            Pz0ygW9HNJYiRupGB94q2rnmmgyu9FaPrV7YRznMHKsP6swRfN++lIVdOmM0bMEO
+            YeVCDAOhS1y+djtuVcwsEvFidW4JINSi96QQxHNA36x9iAxtj56mHy3hLk3qLFZZ
+            BTeVcWdcL9Z4KlHnClOevYJDeafjZlewHyybbxC+sBllhAmjW41yWTM9bPkqXoDS
+            WAEjhjKzhcNa2yKM5tGhoMtxmRhuqLTI2ta5nLx/gXYgefZbBtZ36W6xPFjh+J7S
+            az2LySyi0NTqiKz1SQHNj20RVSoqn44Udy+ZLOoodkiJfGSUfJz75EI=
+            =p/2N
            -----END PGP MESSAGE-----
          fp: 4EA330328CD0D3076E90960194DFA4953D8729DE
    unencrypted_suffix: _unencrypted
--- a/machines/yuzuru/secrets.yaml
+++ b/machines/yuzuru/secrets.yaml
@ -8,44 +8,72 @@ sops:
    lastmodified: "2024-01-02T22:37:47Z"
    mac: ENC[AES256_GCM,data:oBfM/DF/TfWJIW1VlvZ4Z+vBQxCmHm8J83pjILtHFBwU14f1H09iIsswY1xyAwO9wO3cttf4xjrSa6mGGUyQFqLdEzj8z/JkCm1vwpLZQW+j8FpRjH1ryyE6G/3eS5tboUZgmAwBPDsulJr3NBi121RHhZvWf1dv2T/J5IcZMxI=,iv://TpDpO8tNaibh8ABqE1AT6CPK62rtUZiFmYP9ST3MA=,tag:5SErG/jDycIdxX3ABOcsow==,type:str]
    pgp:
-        - created_at: "2024-01-02T22:37:37Z"
+        - created_at: "2024-01-22T00:20:20Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwDgSONkM+d4ARAA1V2B8s1NyyJFa+nbKo2sFoubX9OKNYkzib6uvjs2eiOp
-            XuUsqxYZrUXCjwvWpvb9GT4neBV68mqVZMwkt6qQuiwyxSdrx+G8qKT5do0gjwmm
-            BTjOlJnUAWKn5/kzJKG9Yb+RiQZD2rV5/xj6roImCLt6lg97howP5n5PNO+TcDM0
-            0Mz2vJJHbKEgeIjnRPG3MB5IS3WFHkmSe0jBIKXRFuiP9bdVgPAaoXk1v3KmeO3i
-            c2BDOxLWjq4kHzAT/GIRQJxA4/8f6vMVfUlepmhL2jUmw72WrfSC2EfZeWnlm1np
-            M/kAVU+Gd+d2fzv9f+Ut+K8Id5vBDANlp7m5KVJV0howrCxaV/TZ9kiReWpePP8U
-            4EDx2cVi/FDlnDJEr6qDfYZ5bguYeTD0X6c8IK8r6NlWPbQD7W6cvHto71EtXKqG
-            R2XZYVbsRGufNLeNUCcfz1ev+x6Ix9VqsDzkwUFfgXMS4FavQ84TzJV9Z0zhRCme
-            yFGD8lW6LliUxUF5YDRqiceJdDV7Nx+TRIRXXNJq4Fid7b1M+7fdI0JlU3xTPqwm
-            kZFfgAAwt1ji0AtGd4khC30XSr29V3YjqX1ow0wYJ9rYEhnrexS+/iOJvygQ1AcZ
-            nzajsK7dHidC9RNpr2PHqL46KtoksdoL4DT80uT+mwevb8w2wG949WQ+KJOlez3S
-            XAH0NywA6R4KaW6fOShYtL0nDPfYOCm31t4sWpQfxJSQt/6p2fDobbz4q5tTQfjf
-            /Zq8fstojMtM8C5eur4ASa9H8dckRW6Lk/VzsW3u2tP3rl3js1eumcvYumLK
-            =bwxH
+            hF4DLHeEFiC484ASAQdA2PaNV/rFadDB/LLofBnWUkDB0OiT9/gSDIQABZoiF2ww
+            l1i8a9tTh0EvYRalB9BvQ4PmtvCF/xM+ET0XSQKnEX8KdLzGG3dnrTj4acPKW6xX
+            hF4Dub78fMESoMASAQdAFs6WOkZhY7yvZJDmc6hFj1FLTKEEMqaO76UGtOJ3f3ww
+            CLU3krFR49qw8364JyVayXdgepGnaAzlc5JHgmvJ/6j1qsH9m6vj4RJyH+I58iX2
+            hF4DM6AcvgVUx2MSAQdAZbE+fXGCqTVbBrKIZ5l9y/Sp1TjSn4OmkkfjZpSECUEw
+            MhmLNDt+/QHFHW+o9Nw3XvjqW5KQVMCAIWhDK6hzyHEDdIJLbQx6SbgWShPNeNUv
+            1GgBCQIQELk6Fb6cD/nEFCF2rxjQSe7h03xTqy3zTfsI//gqWSVfUOqXOeYQO+5U
+            UihFvxzPtS9ixlVlAlEfv40opAo/gyxkgwmGK3SN1oUkU9xojoh4mH1uI4FYwRtw
+            Lq4vnzK6dC5Olg==
+            =1da2
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2024-01-02T22:37:37Z"
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:20Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA2Sedw7G6hbkAQ//Y+ZDDXUxCRqwjTWRz9uoIHcQBrCI2LhecCt8uWRMXbyV
-            q/HaDIjYO5fLrpZ8HGzS4C9B5QH3Vr0yzbGR6l3i77W1FpzY0KYQ5jicttQ56rDL
-            n3APgqBL8sdcq90Hs9iqG4AA9/QhCIupzG18BQ8zWCqJ/2uMx2ddRYxxa3FEgCdi
-            1C0wH2kLlZT7aRH7OlKFbX8QABpGEvBQpG456XghsX92wXou/pJfcrgqh9H0Px+i
-            5kvcSHERq97+2DIQYcck9DfZ6Pf2lfnoM3f2c7Ln3OeaPrnl5wLPrIP/KQBLd8AC
-            6hU8zrsTM4dSSopXnAjc9PEi4kmfLwrcZiokw5kjfaolyRilX8V6+ewaWF6jK2Yo
-            IwsQ09ElGzfXmmkqMrUEGnWr55WZgvDXABMwTr9VwIej47ef1HcqNxwmFe37XndA
-            UDfJ+GUGOkqLBLpamhHp/A/UM8+wrUZIOXJWsJdpP5194wKXBD0zjd+HMxfq+RTk
-            4ICLChn2+MzU58V8FP9WRdYOLQWcHVAfBP8zba9zFf/FCnHrXQjv9lwadYQ8YkhN
-            uSzPB5yvzfa1YOl7PXDn/5EBu5WYGxdTNHouP1hbk8Nxmt37+0VCMDgkUln6qans
-            5FzmAlrFHTX/887d1rP2Rc2HT58Qmgou355UmnkjxMWH6b5WSOo5p+KEHkHwW+7S
-            VgF5p8vBWd9cISMG5aetMpyBwhZAcx5XTXV74pJ8Zc15B0mYvz+BcYM+1Nlqdp0g
-            NVpa3jISybMeGqkbeQmjoT05J5REmYszhGg6SEMyuiLrC64lwDy9
-            =A8pI
+            hF4DLHeEFiC484ASAQdArITFRWDp2AB4udq+8bth0hVhdZYkYIPx0CVdeEd8H1Aw
+            xxsKAPaCQlba/7KFUgxNLA0B4KaWiZLhLylBAFCDWwiGiwxSVGfCirfea0xF+ULd
+            hF4Dub78fMESoMASAQdA/tWqIPh6lOYKCJ6jci2pC3isLWn9ukTbwM5lRPPMASow
+            wMm3aEitDVWWHf44obWVyWptTvyswIkwp9xodwz736Q/dq41QfvCiEjHZvtb/Oa1
+            hF4DM6AcvgVUx2MSAQdAYOvUs3oJqX3+ojKKqQGUpvFdUQWnMbNIcA1V1ncYzmQw
+            WRKo0Ru/hxD2Hc9JOfuuIn/JGJpvhY7mzOONU/Zp3kuQV7F+xRX6d3Xyk/fNMSSY
+            1GgBCQIQ0OPDbSjPo6x9tFICrXFdmIn1ZzDCb0i5mf0KZIPRUn8sJGQFks0NSRxg
+            XfW389gi5ehm9CTEHH4pXaHpGcv3wc1BTMSYCkflKsimQ1UbTfo3TCPvvLtbmEqc
+            4MVURc4fPbFPYQ==
+            =T4S7
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:20Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdA1XNytxfOfWRhHJ/MsUjGNVljJpa1IhDvj800bRr2Mj4w
+            Mv0tZp4V/eo01J1XRsSYVgWJ/OUG1ArhzDEPGdcRL9KOTPUuFf6x/pi7j1F7dW4M
+            hF4Dub78fMESoMASAQdAC3sAjxLn65jIbZU8MWYErHUF83YulKkXSdYxm8MQa20w
+            t0k0BZx3BE8r3zaXxhXmqBGaqvYLUWRah3kQHNSI6yG1VciDcjnesxCvZAZb8LSd
+            hF4DM6AcvgVUx2MSAQdAlLY0ALDCytnBkotZod9cZbW+gRhBgxG6VgKbsIsqYjIw
+            U47KYPo0X7GhlsOZHNkuqGO9zdAN8XPQawLt+g72uGIPegaVROsLfODeRCoy0GNz
+            1GgBCQIQiEF2lOASQVovVg5xjmvoxwWKrstuUSeANmsnmiEFuEwBn3KitMB70ur3
+            hKGqWHvHI1/TvJK2G4rk88X90peZF3+bxTZrzKxIsv2Cks09pRTmFYiAqdXXn0Hr
+            dq7BGzHut6yGPA==
+            =wl6u
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:20Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA2Sedw7G6hbkAQ//fAe0W0lYcp4YjwHn+hP4t1dNUO7jXslPccNhh/bHPiPG
+            4OnAdeBKCyMYaE2iXXU4u86svxA66LgNiy+yUclKPLqn5PaWtNuyY3BfnIZ+ikw0
+            2Ag0luLJYka87qKc4fKgzyQXS3LoZNdBgbgsPY6hAYP6ruJqH09WrDEjlw2/cg2q
+            8LJLwlJ2HMmsSgSnuzMBvWZKw1UKD/lxpTWGfMDtLPCqLqxIs0vyvQOqE4y5UFA3
+            4H7Fm/dW6UFdd1kiG5Ww4vU+2ghQekgpzG2VnnCu1caET19bB/81XzSPBaM2qF7j
+            Ou7gdA9ZivB5LJua8z1kdKMFRUY2FHEvjdbO7lFaHK/O5oPzX+GIgjeMYwpa2jyA
+            gSlbcqTeAKhjK6RA9jz2oaIgWDSziU/QHI0QS7ur66zFFKaSY6zWgI6CcXBydRt4
+            gnnT47oXX4cOwUy6GKqFC2H/dlFq2Hjy4ow719DDLRgl4wkST4u5jyuPydyQtvDB
+            1mcysphaqCnSZtbV22/SzNdPsTmYmhd25cUDZjUehPPmFN3EBkVyZLvGS+KcddG2
+            s6NE6nlsGM3eo83121ILXzwumf7ONhTz9LEdBg8FXPHccplEwLp9Iar71rIw/UCn
+            frsbuy5+hkQleljojPtWHcc8uUvoU9X/p/BwWxAhOHh/MF33pNNMPAzd7ZAXcBLS
+            WAGVNWJJnKiwiVHncZmb5n60ppGPv6XVko5qm1aCQRzEzS92IXwaZnBsNR5jQq2M
+            8+3BjYmyirwPpumYADu3A1zqPVpaQzY2Z6LxGGgnm8j2axTF8W+mVe8=
+            =NO52
            -----END PGP MESSAGE-----
          fp: a1ee5bc0249163a047440ef2649e770ec6ea16e4
    unencrypted_suffix: _unencrypted
--- a/modules/nitrokey.nix
+++ b/modules/nitrokey.nix
@ -1,16 +1,29 @@
-# SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
+# SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

 { config, lib, pkgs, ... }:

-{
-  hardware.nitrokey.enable = true;
-} // (lib.mkIf config.sbruder.gui.enable {
-  environment.systemPackages = with pkgs; [
-    # both depend on pypemicro, which is not needed, but nixpkgs requires it
-    # (even though it could have been optional: https://github.com/NixOS/nixpkgs/pull/183099#discussion_r933226708)
-    #nitrokey-app2
-    #pynitrokey
-  ];
-})
+lib.mkMerge [
+  (lib.mkIf (!config.sbruder.machine.isVm) {
+    hardware.nitrokey.enable = true;
+  })
+  (lib.mkIf config.sbruder.gui.enable {
+    environment.systemPackages = with pkgs; [
+      # both depend on pypemicro, which is not needed, but nixpkgs requires it
+      # (even though it could have been optional: https://github.com/NixOS/nixpkgs/pull/183099#discussion_r933226708)
+      #nitrokey-app2
+      #pynitrokey
+    ];
+
+    systemd.user.services.gpg-force-learn-cards = {
+      serviceConfig = {
+        ExecStart = "${pkgs.gnupg}/bin/gpg-connect-agent 'learn --force' '/bye'";
+      };
+    };
+
+    services.udev.extraRules = ''
+      SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="42b2", ENV{SYSTEMD_USER_WANTS}="gpg-force-learn-cards.service"
+    '';
+  })
+]
--- a/modules/pubkeys.nix
+++ b/modules/pubkeys.nix
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2020-2022 Simon Bruder <simon@sbruder.de>
+# SPDX-FileCopyrightText: 2020-2024 Simon Bruder <simon@sbruder.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

@ -15,6 +15,10 @@ in
        "simon@hitagi" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1kQUoPII8A9/bgPA+OrZGQLPA8MxkdmPSCCsfGMh9qRZfF7BSD8W6VdE/28tLw+39QeUl1+/9VuVvGjZBP1zBAbKIcKx4DjtgxpNXCsfWMjXFtpTGk2dyl71CaY5n72YlADxXYwtEvuwfNixgE2yTCefMbBsfwqYC0GZGiDlFtjxdg+RuUC8jU++C+WFUFct9gj9ieQ0LWjud+Oh0AF0JhyGnou+wVZIIO8mwo7Cc5xiPldXhbc13XiNC3mpNGCLFj+nh1feazk8TeAVDBps6xaDkOd+hDwTBQh8LoimePK7MiShzLvC38Vd/sim5ym/IqY634CjqBDGCMp1KXnqHUTT8CqeifMv10+aRJKUPevVkO3nEE3VoSPt7Ui9ZzLnL4qhZyygoBau+PvD2WCWm+gRwBkvU1uNrYKi4HIGhB/gXcYHKJimqJwLMyqG5Wv1jfuhn3ZZN+uNqTgdAznGgPRU1Q/Mx6nMEDiQip78qdYEc0YGwdb/TldEL6aHRjuNuZPpTW+zakQHiQTRb/0VdZT1bAwyT9yL0Uf40h706Kh/pKiSQ1yq1dlSdl3RlfedbqLqGjspds1iRSrSXyH2MBghPbz/SF7Vt4LW/tXF0rcyV7CU98ZvxJDWeN60OE0vPf/AT5udYyfPO1691y0F8jGKxGYYPg9R/Y5o7J24PbQ==";
        "simon@mayushii" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ7qUGZUjiDhQ6Se+aXr9DbgRTG2tx69owqVMkd2bna";
        "simon@nunotaba" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILcOt4mAwIuAGMfRdfeoGX4UFkQDhkbihJcsAgG7JE/j";
+        # pgp key
+        "alpha" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE1KsR0pgwLfhbP/BDeyb7CLnIqbWiaS52QKUOYLtioH"; # Nitrokey 3
+        "beta" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOtp4pbIVjjXN7J277+pm5EyzIQVD5aHpoi45J1PNVCL"; # Nitrokey 3
+        "backup" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfsufQIdFzWK1B1uelCzt8XJaoublRPn1gjZvumSEr+"; # Offline backup key
      };
    };
    trustedNames = lib.mkOption {
@ -24,6 +28,9 @@ in
        "simon@hitagi"
        "simon@mayushii"
        "simon@nunotaba"
+        "alpha"
+        "beta"
+        "backup"
      ];
    };
    trustedKeys = lib.mkOption {
--- a/modules/qbittorrent/exporter/default.nix
+++ b/modules/qbittorrent/exporter/default.nix
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 Simon Bruder <simon@sbruder.de>
+# SPDX-FileCopyrightText: 2022-2024 Simon Bruder <simon@sbruder.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

@ -11,7 +11,7 @@ buildGoModule rec {

  subPackages = [ "." ];

-  vendorHash = "sha256-rql1QlbRgLhUJBE2c9owraCUv4r7O2oaZCijY1vs/3I=";
+  vendorHash = "sha256-9Ygm4ESmpLQInloiFOYN4YlS3ibf5M1BmOKttSghXD4=";

  doCheck = false; # no tests

--- a/modules/qbittorrent/exporter/go.mod
+++ b/modules/qbittorrent/exporter/go.mod
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Simon Bruder <simon@sbruder.de>
+// SPDX-FileCopyrightText: 2022-2024 Simon Bruder <simon@sbruder.de>
 //
 // SPDX-License-Identifier: CC0-1.0

@ -6,16 +6,30 @@ module git.sbruder.de/simon/qbittorrent_exporter

 go 1.17

-require github.com/prometheus/client_golang v1.12.1
+require github.com/prometheus/client_golang v1.17.0

 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/exporter-toolkit v0.11.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/oauth2 v0.12.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
--- a/modules/qbittorrent/exporter/go.sum
+++ b/modules/qbittorrent/exporter/go.sum
@ -46,11 +46,15 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@ -63,10 +67,15 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
+github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@ -96,6 +105,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@ -108,6 +119,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@ -124,6 +136,7 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@ -142,12 +155,17 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@ -159,22 +177,32 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
+github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
+github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
+github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
+github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
+github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@ -198,6 +226,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@ -257,12 +287,16 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
+golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -272,6 +306,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -309,6 +345,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -316,6 +354,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@ -361,6 +401,7 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@ -386,6 +427,8 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@ -440,6 +483,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@ -450,6 +495,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/modules/qbittorrent/exporter/go.sum.license
+++ b/modules/qbittorrent/exporter/go.sum.license
@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2022 Simon Bruder <simon@sbruder.de>
+SPDX-FileCopyrightText: 2022-2024 Simon Bruder <simon@sbruder.de>

 SPDX-License-Identifier: CC0-1.0
--- a/modules/qbittorrent/exporter/qbittorrent_exporter.go
+++ b/modules/qbittorrent/exporter/qbittorrent_exporter.go
@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Simon Bruder <simon@sbruder.de>
+// SPDX-FileCopyrightText: 2022-2024 Simon Bruder <simon@sbruder.de>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later

@ -7,7 +7,7 @@ package main
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
@ -17,6 +17,7 @@ import (

 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/prometheus/exporter-toolkit/web"
 )

 type ApiClient struct {
@ -119,7 +120,7 @@ func (c ApiClient) doRequest(group string, method string, parameters url.Values)
 		log.Println(err)
 		return []byte{}, err
 	}
-	bodyBytes, err := ioutil.ReadAll(res.Body)
+	bodyBytes, err := io.ReadAll(res.Body)
 	if err != nil {
 		return []byte{}, err
 	}
@ -176,6 +177,28 @@ func main() {
 	prometheus.MustRegister(e)
 	http.Handle("/metrics", promhttp.Handler())

+	landingPage, err := web.NewLandingPage(web.LandingConfig{
+		Name: "qBittorrent Exporter",
+		Links: []web.LandingLinks{
+			{
+				Address: "/metrics",
+				Text:    "Metrics",
+			},
+			{
+				Address: "https://git.sbruder.de/simon/nixos-config/src/branch/master/modules/qbittorrent/exporter",
+				Text:    "Source Code",
+			},
+			{
+				Address: "https://www.gnu.org/licenses/agpl-3.0.txt",
+				Text:    "Released under the AGPLv3 or later",
+			},
+		},
+	})
+	if err != nil {
+		log.Fatalf("Failed to create landing page: %v", err)
+	}
+	http.Handle("/", landingPage)
+
 	listenAddress := os.Getenv("QBITTORRENT_EXPORTER_LISTEN_ADDRESS")
 	if listenAddress == "" {
 		listenAddress = ":9561" // this reuses the port number of fru1tstand’s exporter
--- a/pkgs/contact-page/src/index.html
+++ b/pkgs/contact-page/src/index.html
@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
+SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>

 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
@ -15,7 +15,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
  <body>
    <div class="container">
      <h1 id="name">Simon Bruder</h1>
-      <table>
+      <table class="links">
        <tr>
          <td>Email</td>
          <td><a id="email" href="#">(requires javascript)</a></td>
@ -37,14 +37,31 @@ SPDX-License-Identifier: CC-BY-SA-4.0
          <td><a href="https://git.sbruder.de/simon">git.sbruder.de</a></td>
        </tr>
        <tr>
-          <td>PGP</td>
-          <td><a href="pubkey.asc">47E7 559E 037A 3565 2DBB  F8AA 8D3C 82F9 F309 F8EC</a></td>
+          <td>PGP<sup>1</sup></td>
+          <td><a href="https://keys.openpgp.org/vks/v1/by-fingerprint/D48A1ACAB1CDBD170151662BB1A0B4A45885A031">D48A 1ACA B1CD BD17 0151  662B B1A0 B4A4 5885 A031</a></td>
+        </tr>
+        <tr>
+          <td>PGP (old)</td>
+          <td><a href="https://keys.openpgp.org/vks/v1/by-fingerprint/47E7559E037A35652DBBF8AA8D3C82F9F309F8EC">47E7 559E 037A 3565 2DBB  F8AA 8D3C 82F9 F309 F8EC</a></td>
        </tr>
        <tr>
          <td>SSH</td>
          <td><a href="https://git.sbruder.de/simon.keys">public keys (dynamic)</a></td>
        </tr>
      </table>
+      <div class="footnotes">
+        <ol>
+          <li>
+            This key relies on the <a href="https://www.gnupg.org/blog/20230321-adsk.html">ADSK</a> feature.
+            If your client does not yet support it,
+            please make sure that you encrypt your message manually to <em>all subkeys</em>.
+            Otherwise I might not be able to decrypt it easily.
+            Alternatively, you can also use my old key,
+            at the cost of reduced security
+            (as it is not kept offline).
+          </li>
+        </ol>
+      </div>
      <div class="fineprint">
        <p>
          Dear <span class="forbiddenword">(don’t want to get found by this keyword)</span> recruiters,
--- a/pkgs/contact-page/src/pubkey.asc
+++ b/pkgs/contact-page/src/pubkey.asc
@ -1,52 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-R7VFGCA=
-=7eg7
-----END PGP PUBLIC KEY BLOCK-----
--- a/pkgs/contact-page/src/style.css
+++ b/pkgs/contact-page/src/style.css
@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
+ * SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
 *
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
@ -24,7 +24,7 @@ tr td:first-child::after {
  content: ":";
 }

-a {
+.links a {
  text-decoration: none;
  color: inherit;
  font-weight: 600;
--- a/secrets.yaml
+++ b/secrets.yaml
@ -14,162 +14,172 @@ sops:
    lastmodified: "2023-12-28T16:12:09Z"
    mac: ENC[AES256_GCM,data:f7gcMjAEMU6uOeS7x2zvtyu+7DvPOCbtBy+zStALFou6B2rMBuqzJC1CynFh1f+NAKGtv1P3sMdag5Es5xsRHjFqQ0FfWceAB2anTsqW3ZLu+ZKS02p03lR5Tz59GQgS1MHcNkEovY2qZ/Mk/BODJzKYjqmb7ItjXTcSAGII5vg=,iv:gZE0w3Ih5x8xJ0x7sU+ZWo289PIaBUn/y8y78QDqidQ=,tag:cxlGk81xQGifm3IyE5ypwg==,type:str]
    pgp:
-        - created_at: "2023-12-31T13:30:26Z"
+        - created_at: "2024-01-22T00:20:22Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwDgSONkM+d4AQ//Vg+lIAxfOwHhJVqcpniLspsApuViUeP7YKOey1wlhUyj
-            FBiAhcR/rS4W3jD/q7ODsEr7ms6KFOEQiw79pNUedZPuiZJtJxq67Z68dzs3xwHD
-            HWWqOWh7NOzsW9v5xVlzeOjNdWGa//EwDSD19sFAyUA901Itzos4WkZlmx4kwIzY
-            Bkhjj/YNDtUxCxJI8G9ucEvLNwxY+RWoINtSKy5YU9VXjEN85sS+FeKTSqsS1zik
-            DtIgG7H1NmzSaRK6kS8EpK+IMZHi+7oosRIIyN3wlVRl5TRvUmqiYNTHRYaUdZ79
-            8kBomoxPt/q7b1dB+jT3x3lsYjBUWBq/Wioc+Cl+wMKzFGF67Fmor59gP0NKUWS4
-            NUfcEeEmQUvCAmeNAvEW+lm9D7oI5fUkDDu9BX3LqUxGgCyeUM4Idojy3bjamn6y
-            lnAl7MGmKudSipIOFm+CuAISiNXy+MS/MXPwe6V1RAB/C8/WPBfecKP1KOBJHLLo
-            A4r6O0rcWkD1HAZzx5J6kQIrj1ZihIzESrQT1Sdx6j7vIWOj3kCf3MzNnLK+ig3g
-            Q6QkS+Z+ITzzprPhrWgTU7BwcoV7xs6bwR8SPpPX6PsE6gjYE+oZsDOc8LqhjXn1
-            WwktpA/zptfrSAgwjNF0c9k36kJX28Rv0dWiK4I8Gz/XtbCE2a43yG0MAA1mNEzS
-            XgFOo2JzapluU8UQN+z6Ztq1X69+iSjJc0WSROz+jYQBRLKukkho2LCVOjd1HwA9
-            PO68VGk4Cf+a8a2+bhmtzlwYGQEx0ksXjpY6OejVo+2dsLmUiwICYHBvA/+/MPI=
-            =7kwD
+            hF4DLHeEFiC484ASAQdAMljFciaKpt4CFhKyd3DBRdw7nXUOpoQ/uRaH42PokX0w
+            9Tt/8CLlbAfEj/fxk3OiFIEj9TWONuiY4fXBZJEoAjqtSIB5u9T4TVxoZBDZsd+b
+            hF4Dub78fMESoMASAQdAWRtlHvulNRlIuDsR8uLExkyn/wIGUbJHe4eNimHEFAww
+            u98tk0tKz6XaFWgvC4pX9l+/npq1MtFuPAAKtLXPI7gROYTU7zxglN/FUbcSPXys
+            hF4DM6AcvgVUx2MSAQdAC9pkys4R9Jri5L+AkPTQdHt5mUHyrtpjHtPktbmHKkQw
+            CpzcI3x8dX1OaMqp29YV8/mlXeJeuXtP87Ks9xQruy/YN6xFOdxrLvrdwcn1IQxr
+            1GgBCQIQiHKw9da5wP9XapqBAAbHox5FlswqhOMVxbuVxI4YwRYHr1U97dtzFtfF
+            1BEyc0xVnfNZyNMltMbNmcZ8gvKPSYl253OUmYy7m017EX68BlL2u/HzMPasFkoD
+            Q0kti55h74LRWg==
+            =/n9U
            -----END PGP MESSAGE-----
-          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
-        - created_at: "2023-12-31T13:30:26Z"
+          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
+        - created_at: "2024-01-22T00:20:22Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA08nOrzNSYBrAQ/+M5Vd//yRDmMmhix+kL+qBQnd7TMEyJ2EX3PsdvUdIbre
-            K5M05Yv6eXjo35N3E7rETApi0tQQ5dgDHjjDhPWxrjPvismiFjOaY/JUtscHFb3C
-            BNBzCeIrXrtiw7iHQlCaIqH74ff7Kxh8ooGERn/YJmkwtsyZjtK2FmuHWE8AjTSo
-            x7GkQ1WUwt9A+21eQ/kJySnkNHSkrykPzuDlsRBwTVsPddm+q3lXkoiInDDVfK88
-            74niLozvkavSqE2/0n5dUIJLSXf0Ale/2IooFoK6qkEwL0aJo/wkRDhyPm5QE3WX
-            1GkY4YZC6hQqsCSyBp83MsSUZ8xi3BLeOPrCZtT31GCa9EePA2lwUDG9XM+nhxZZ
-            bQ5wjEGt2OSXHxfZigrX4CmmPxkSVu6BUimME2wHNoGOKDRDfQQk2eHhfaRgtj21
-            OYXbXGchC+ChZa2PDSCjIpNxgVR6QQi+TsA7JPOcEYJT1oGbOdxm4G2E7Y7gAapd
-            b7vQG/C8txqVEXa+7r9bFsPhzSrNAEENGV49DhuzzrsUHIy3Z/G3nlpl4Vtn60Vz
-            pWBJkHDzHpOnZGfCSyAGpct6ybvnw3wRI4HkXDTZ3n764wf1GmEMo6KEEpPdYOqH
-            lIhp07aF945jH+R2Zk33AScB5+cP3a5u38ggExybSx2cCX7F4TWsQ8mhWWSJtRfS
-            WAE1YWbX1wJ0+0BmAGfqZhaKnpGouDb3P8Y7Ot+wwI2Qp2yUcgwfOOesBFdDE9pJ
-            vGJrA3Ar9LvsOMwQ0W1OdhIPYq7FZVE7gXEvb4t16RhLp9iP8Opp9nU=
-            =XIwt
+            hF4DLHeEFiC484ASAQdABgR3LZkCbks4CRb09YrM4Rg4RRN6aJNEztqmjuNzfUYw
+            ontBlE2TFJqAvbRAruuJ+L49IRdNfN7j45xOKFVSIbvCabhnGSDVjNQW7gAkPgSX
+            hF4Dub78fMESoMASAQdA7G+16rWPMK63gf5KPWLUONlPBqhZjt1OQs2TgAnK3Wgw
+            eFtvcgbxKnOsN9+YcXEFpWQNRNoOT4/xXOZsmUydaR9AJ611qjwGPBJIUeswUGeX
+            hF4DM6AcvgVUx2MSAQdA+NsqwKvRJ6KRfEYgiKUrVNUGDcyKspOm1PPWaTUdGgkw
+            Q1X3pIuncW1yfrPVGvA6Bapcizf3EmT7+8IaBke2ZmSXfgTxVB+WrcRKptmI42Cd
+            1GgBCQIQIweZyiOg/AYuhQwH0PO1SnfHiHqgznYXNficCiGbm7u32ZIvd10N0ZB3
+            vWw6CV5seZDCnp+AUdS3DD53i2/NYZS84vD684m9LobozMaZRHQzjxvr3lijLBPQ
+            BkXNyBIMguXAEw==
+            =weHU
+            -----END PGP MESSAGE-----
+          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
+        - created_at: "2024-01-22T00:20:22Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DLHeEFiC484ASAQdA4vQoDAcD9CBZH9yQ3E37IGqwTYiaAhwXLQcPwypxzkcw
+            GppP4rW7Ih8pyOkWzvl+5cLsLJncqw/Tsy5Bona/HJ4x7sgl9X4sbuH4azvOaSeT
+            hF4Dub78fMESoMASAQdAIZAaWNGxSR+oQAKY2ntJrMCEWHGAqtJNuamRZcW9YFIw
+            gCP4QaN4V+Ti1vWUo1r3bIx0O96MOc0VgXc01OwWpSKDKFQttZdMQOCPvEejttpS
+            hF4DM6AcvgVUx2MSAQdAeYWfEPUS4HGGraIphr3x/l12nIKdv0US7mjhbUADskMw
+            d7cvfwHyh22keNrz3vENL1nC5E4kLA5qx8Gdqm/i+6caAGwUdfWCKvoFpBfrcS0R
+            1GgBCQIQk7tCqIMBozy2OJeWC4HtWXFYljMZQqloa6vR3RGD71EL1RpcC4JFBBHu
+            tbaYzXnVKZj48HoIUAY/pXrJmKSrJYRD234mbmkEykMAvw+FD/yOtu3r4rWtpPaz
+            GX0CbVtAxiBXhw==
+            =1jzO
+            -----END PGP MESSAGE-----
+          fp: 403215E0F99D2582C7055C512C77841620B8F380
+        - created_at: "2024-01-22T00:20:22Z"
+          enc: |-
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA08nOrzNSYBrARAAh9rUz+6g8bJ2KxAwMQ4yxKuS6thjKQOo2mkszOSfAMNL
+            cpA/eX3r19u1DuU+/5CDJYK7rcmPQj0D8XPi5Ndvkqu/OE+uXGCzGL/PV9iY2eAi
+            /x9sM95LWIVVeJY7UZ9B0CNuJeNUI9xtj+U1e5ZZPFPhLAA2NgOODjeK02l11zQp
+            iD5Y0FywgQn6DkcdOQTzgzVSCFIt92C46fK6IWrwT0mJTffOqbS7vCDBMHIMaixB
+            0SaS4EqArKs7sqojMNCywzrRkrV+5AxqzuKEEppqWKg41kPL6tGtqXgS/vQY8/30
+            y70G/rj1H7Mz0ncutUIChvLuqJDnmEt0Y1N0OjvGV10j70OxDHrHKtgguyUymPw4
+            HcDEZaBqt59wCuSvnlnurZD/sz5s4/3fOfKBGTvUvQ2hZzDw+DYD+N/tKP7GJ3WW
+            YiizRMQQDg+oq86fTKTqIILi2qNw9+enllF3nEUJJW5S9CKY0s1JSXfgoyOCig8X
+            mqeHhVHv6H7glgPAg9RWshfdIttUXvi4uIBqoXfjP5y2NqMOUMTEg0vaqXOJ2SHD
+            Jhp1DMZcDK3sApBLJVM8fyf7ftNKs9vDG6Tdwo4muq0rI8CxIfS1rgTGzuEhQHzP
+            K22LubjkkDUJYabznxophUl5CqKRzG0L4hf3Wm8VW/1XHakok2j6tEmpP3AJU4nS
+            WAEE3/FidXEsO0qZ11nOZmTX9L3cw1PCLysfXo8uDGuMkGjMnVQaeKz7grL6+rRc
+            4Tep3y2H2ihytXN192TeXiluNveUaxm+a3dnfy3eAjE+5O+mYqI53SQ=
+            =eDdF
            -----END PGP MESSAGE-----
          fp: 3176be14f468c6d43ab2206b4f273abccd49806b
-        - created_at: "2023-12-31T13:30:26Z"
+        - created_at: "2024-01-22T00:20:22Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA2UzePEMpuAKARAAl7K1I0UQo0yyBo+e+AgJmnbxTzagNmAbJyULBPq9Pn4F
-            SWCdBCxbK+T7w0aBUut8SjcqPuzo1irTqzzILxgBALr41oVkh64EfqyBF5vLU3yk
-            TdEXYGsGtHq8DBxVvsVukvvIQ4uM5s9MDeQZeGEx3wrzLwPHyhUkTYeenVpuYFAV
-            n4ae1YCjeZoebEuMrQnxoC86FtBnwmjEgMJ+u0/saju8qtQtFSY0pf1a8/tt2F/O
-            TfukVC/ePjsKeoQZVkk5WcCrH0Kr0Y+TSln63dBzvjdvRlBsL41wK4QVrd/huQo6
-            mO5XNluxeqJmlo5wT6FtBLi+tB43f0T/t0wKrS40qvuQyj9AT8REMJb6cgLlHbL6
-            /GLbdRNcLty3cmORrr1g0Vz8TFlEY5ZYl0f0k9NuHDCREaB3KjRE207ZTr7gN64u
-            E99gpYmZUxhdTG2224SkJ+wD4Dxz869wGC1jzNllxfHPjulJs2lP1AyhZriuhyE3
-            WY039BiMp6RQTiJvAs5FG4mObG8j16h5EZ1rs1Dk+fTZ9iG6GmMN4oCRi87v8CAj
-            cFGvQ40dmBk8sL2aapOI2o+gzUcv/Ig9CfYSVWk8UHtU4tX8PnkVshFIWVv+QNe2
-            xeVjGSgW0oVmuItPPRgSR5qqYXVdSx1SAF4hZJB9+iEaNl0DT5ZXbu0Efc0p8n3S
-            WAEYAmFao16xdu0TiPTuaj+Ev4A2bvl614Bugi1hjRFY8BelHHorR+PaNo1nMqVm
-            dnMSlkHpQKzJf77FZmAlg6iWLW76k04djiu1bFegaSLsfW7fA1PHmUc=
-            =3YAr
+            hQIMA2UzePEMpuAKARAAhDlEsUQwEIqOQXugazUyOG2IYCasj90QNEdySEO/irWz
+            m16IVEZTmEgOWjBWsFonTKTkK11Yeg0hObB/33YVu5BiFQX5sAbmjXv+J/JShbqf
+            ytVSEisQ0iEDDRz4+z9iux9YxUE2yzeDqRIfe60W+rbZlZySS7je/WSM4jZKUZMO
+            pBlhOcBTkZo5V8igZ0LirCLMv0j8eE3yN5HJB8bu8vkUVqM23GPUKE6dAu5ExM5v
+            XuEEPnQ4SPJXLN/eaMU9wDBVB7E84ht0ZqWD6vyvdj6oH2gs9ysPw1ylRQiOxFdB
+            XiS0KLNXS2V6VWxwEVqu/ny8Ua5794n3cS4PVRyMbDF3QhpBzxdhEYgdZNCfLYmM
+            t0axMyZlj7TeXmz4Dpel0Bs1xDl55vX3bdI8v38yaeEz2Pdrd7QispdLPJvFVREk
+            gTiG7rhAK86UHBAIM2CFWyibAbBMwVKBx89+0SeEJqHfobwoKMF4yHFJxR1QxuI1
+            Lcm0/du5HKzcrffB6BFL/W4D5fmfKn0H3hRZcJDPw+Qi/vgFWWebu01WpRCDziuK
+            BrMpkWbVG2feBlhhhcxK8wyqd9kbmI3aAH+f8UIZVNQz2a4MO2N1/G8jXV6/lnQO
+            wOnd9bSMnf2bUqssZZVL8K1PZ66Jw2HkR88I9WU77lT5+VCeHX9bnihs5phG4tPS
+            WAEGCGLfFlz37pfOMMMciBv/le27EdS8JAoUjWx8wApp20ipiD1aTjc2iAHM7pyG
+            i3YgMqba0kiaDlO5enlOC0X4DwwAYBJnskaAx1re6NVSNZTsJ0OMqZo=
+            =7zkU
            -----END PGP MESSAGE-----
          fp: 17FEEBB45E4245330507C960653378F10CA6E00A
-        - created_at: "2023-12-31T13:30:26Z"
+        - created_at: "2024-01-22T00:20:22Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA5TfpJU9hyneAQ//ag5z6EYAy3tBGVUYH/5vmhxi14kbozXxO97aG2FN85L8
-            4ThMUfAFPn8Iw+h2BD+GjoikGlFXxNv/LtK7BLxnwolJKmkLCdScl5DsYJ9Q1MJ/
-            6ox+chfycg0f3i1rnvDmBe9Lrfequ8sj8+JCsvxxX8iGCGKzQGK75Is7saD9VxyG
-            WqjPF4qqG59IdkWWW2/xcOYwjFre8gkjLkI20gZ+8L8tG+yefBExNYliy+OCRjMh
-            VYsnTq2OIyRR1ggPi0SNb+LQzy6fqXbcCZj4P/I7YGhsXUzejrAnlOa0TqQhtKF4
-            umbpydw3WqhJmlCgRRqCVXrTri9WiTr6jgc2AxSvrSI08NmLuAUMgj6d7ZhcpZah
-            TuQkUGpXIl2wDGxnRR+yjqfef3irnLdDYxYHySCCbjWroEKNS7zQJYbz8U2N6xjL
-            ypii+wQWJkpQowg0cmbXRydCgOvFVqB5ttPNGB+dWFK0AbZY59KaviOYnrC/V6aK
-            HTdRaWoaq0M9dK5Xt0BGb5BVx/Ti+pNhW0I+2JOiRsslYhEO1hOC/LHS+vVjOQNQ
-            +pl/VWs02l9ANZDXuqMbXouY8AixzSHExDb1xC1hk1UypZhOS9oXMQc6KQZT85UD
-            El+n+8GS7+TD1A7yLxlcwbvZIB/BXOtqMlu66NZJy5BCIB1rWON1SgeibJUAnjLS
-            WAEc4X5PhH+0ig7CNUqGgi2YmH+cd9zkmKbh7HkIJnSL1vpfBJ7YyNe5Y6UPvWxx
-            zWW83wRPC8dfjW9X1eZ450BFRThp+cLQcNAPta9lv8MAD0w7dCynrik=
-            =hQJV
+            hQIMA5TfpJU9hyneAQ//VzV9YJKjmTVkRs0ulaSG0uAg6WDrD39jK8ZDYlASvIPE
+            ik8pT8Te5wEK6sUlQRtKrqVZeySuFhSNT1M1nDLgaSE4uqN8kii8tORAHsi1rI1P
+            rStaKiXf9dQXr33CP4W5+Lmkmkp1j+GwAVlRCyR0olsnTwBIchT6MFponSiwOT38
+            KkCaLwdrKiLrY+gA2gme0wtLig00k+07WcVB0NXljM0yV13lXoy+iblkkUUi9FVQ
+            njJqtW/kclRiJP/hhF0O89nMxx6hl/bzBwPrVAKAqvRTGG+BO5WujvwW4quKDxu6
+            Z96jmFnZNg01SEo6LVAcVIMJjwpmBvQEmnSuZNsZ4ZTO1AvQ9Z6y3l99fWO8yUi1
+            489pGyWF/f9LpyRwC65Y2YQxPyziWOFgFliJvnnMAeZp8xuTfyZ8wJwm4hzy8N0O
+            bJJVzyDhMu0Ry4Y5PaS3XecO5iKbO47XiHcIa5FhhoISVpxWKVJygtHqawEfXLdb
+            VjWAQUlOBR6JTyCu7vyf2bfmeP00X+kBDb0B1dfOlBW/RUOjxTlnNqgbwK0vaKQl
+            QZPkc40j/y6y6e5qKCd3pWskGITuMtkIEMT9UPlfGHRIQ1fuOR/nXr0p3eGv3b3Y
+            m99RuRinPMstjDtXrwl2W2LPN8t7nAWv53QPWbCp6zt7lqoN2fC8ShDxt6pM8FzS
+            WAHxnCxBcoLAxh5OrsFJZ3LJp4kDdPBWRajeGXQq+/sFE6h7n859kDBoZOAABK1K
+            sAnZwSo42z3xrmX8qH7JUaqpqBunxyZ3jH9Y5PMSNHJjGbpMdq5zk0w=
+            =YADR
            -----END PGP MESSAGE-----
          fp: 4EA330328CD0D3076E90960194DFA4953D8729DE
-        - created_at: "2023-12-31T13:30:26Z"
+        - created_at: "2024-01-22T00:20:22Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA2nIGHycQ3VOAQ/+J3G7w2l5H4kY0kfGs6iDLYZzocPnQEBRxSX3VRualSbg
-            zLtWnlxv7KNdca0P68+jfE4PehCathrR7x8UT5IdnAxexwEWEYgTmuvPskEBQdl5
-            mdV8lxA5093vqVwBlJGvJunf7BNyEzeDEWaXYpY6kF37CO06GQ38kgyCC4izW/zl
-            XZ77/FqKMfovjUjmQAoEVCArftlo5YgOd5EvZxvlfcQ0CXfL1zeTBWlVqRhYHy86
-            e1w5gW3doJqm7iykwuwoq+wk85MLDaGmZpjrQImOUcm5otfSte/TdwKYd3xn6mfi
-            Ry+vumD6omOOddrgsuviX54JE/h2WRibZazQ6/63QJyNZtlkGbgL7b4/peDOSwbs
-            catQAJYQWFOtmYKn24/BCnyp26Yhf36k0LZuedBxR0jc2htJmzQjTQqZREqJmyfa
-            SkwTDfpRcEJJp97wsXunl4HWh4IP1de8wGv2xFOv4dhRmBMjd3j4MzaHlTbDsvTb
-            geoPK1GRIC578jIfC7hGmC5kdA056nPLv7ZRvlfeeeGjRoxi6B194oBf+m7rI3jJ
-            IwGwfwV29h9MqAtp8aPGbSDGVfGEvprTrLdu++v6MtV2IPYcjikC8uZFEuGFK675
-            mFLGpcA3lKjvWm1kBG8JitQ1fgfFHNpDeWQdGAUjgZj9Fa0gwCKAM+4OdQLGvffS
-            WAGjYGcr23Q9SApNPlJaTyZqr2Unts1q4CWwlBp84sDg6IgoiEDPKfew9iuPydrT
-            5xpMaCtMPi+RJi6p+Fn3rzwlYLpS+Ak8iiuWQnXPJijOpLSkKGlbjLc=
-            =trGL
+            hQIMA2nIGHycQ3VOAQ//Wp7cLK/tIURzeZdXS3coC2nrQJxuCXwo7zlnGUNk1LIw
+            e38xMEh+zttCGdRi69ePQ9XaostRxhplytX6aSP1/ZQTEiQHL44h/UN8OZVp3v6l
+            ripIGPFpRIlEIxsRGyfucAXOl283Qav1NhnKWTovivyEG17zLs02FwjJKJzdJwjp
+            rPufEL18fM3UXahQwm0MXF4xvBjnQAyH0Vic3x0RJSejAoA+396vUu/GERTB98Ls
+            MYX5FvMrS/FGXmhcXC6vJtdXblgDqJbioffmFjJZsyyOhDMCM69sTzxCL4PoKNzX
+            nChtRPlNjEzZluf7hoEep/5TPh+OCpZ9XK2YmwK/EuO2Gg1pW+2I7rk1HBmcppoz
+            JKoDnWAAVBjGyE4a/rgehT4oQON57nk0G3HiYe/5oky5U8L3lErXM/BlP/QODOwT
+            tT+NM/tgv5ojlGvbI/t7fje/vg6qLWa7X6kSoPrh1T2tWuTDku4b+4glu94GMbt3
+            uHa/Barz8FVmteTM9zfgGkM68pjodUCvzge4X2SKzQWiFb3brFlc8Bu5XEttHUMd
+            2qESrXFuGmpWUTHQKF2aaVXzyyFIBMtEdO/yzJBGY/ocIg3ays0ChzfYTBH2VVJE
+            ZbNv8GZruRmoiyc+VYqijRaLXUCMy1KCGnFtA5/viQZWsKt2HoqG9jzh4MHlNHXS
+            WAGDaq3FYcHgTVsmttY0OWp9EPtj0usE8K3cKlBPns26UpewSF+SOp5A8dwyAuye
+            8ARgsS5OoZOGjKLHVsnkPK0eFA2qgp/CNIkgc+An8ydVn3nlUAzb/Wk=
+            =1i1T
            -----END PGP MESSAGE-----
          fp: 2372651C56E22972C2D9F3F569C8187C9C43754E
-        - created_at: "2023-12-31T13:30:26Z"
+        - created_at: "2024-01-22T00:20:22Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMA0Sjf6jBUFOzARAA1GwLb6R8R0Oe68ZTHKSfD7J1i6jrOCxwsANRYgiQnLE0
-            SgIsFOZst9JjkxUTgIfuy/I2AEjcKoiOZR4PzIiEGwjl/diRDFxsIDOAQbxjTux1
-            fNT2BENvFTR3s/b9f/t0Lx4FoD//rXZ9GNywoxr28j7hzbc6IEJKcqmHihbwZNTD
-            wK5FiXGovs0OO6pOUAsPsOnSelDz/OWwjAPidPwXPWO8nn9K1oJrcIYoo8lL+R9g
-            YyyLXbk+LG4zdR78u5Fgy9vnV9HSNVyjF8LLF4TBkmo2VMYkw8Smk3+Zm2cfYJhj
-            NQmEv5V2j1AmmMoNN28VNvC0cTRkaMlQofubXgHRWzwXiYlb1I/NOQaSO7dqd2xn
-            Ghdh5yzG4632ttgp9hEqIux4fCyp/h9AnjxIBO9nNGqtilEIpI5B1Hg++YZ4a3cC
-            qHusjVCU6Pbrg7cdQOSPbV77Cy0iv3cbdE7wHLTwc9E/tZhJeh/DyQp5doM00rMB
-            Q1Hu5oCuCLOuDGFpCns98O1CiJIJ8orNSvpjb76vZ5Ytz2jk0ExTGRxrJSUYGBUl
-            cB9p5uyNJvWREJuLqsR1u68abw4fsVPaTQk2TrvmYdQn82fpGL6NhkSAnDAs91az
-            xpeOHFtj2Cq3QsluDfM0K/6g68jzpDnVkTFxM1/Sd+p+VP5HwkpbYTRwroxb5LHS
-            WAHo6eDnXveaGcl4vZrZMtkDOSav2zofr9pGUDonXaMq8BQJhlsgR52YW4VLgsV3
-            krvTErR+mFgyJDDhwYxpZCtvWb0axNDMzlneb9vVrM+D3WHL6kOGerE=
-            =v4rM
+            hQIMA0Sjf6jBUFOzAQ//biw2LHUfJhz8Ro7Fx/8avssEZUsCO0rL0+GI0w8uOPMV
+            BwKRC9g6tbk181vsg4FyZ3k7uoYI8oCfjIvt0lsFCIcQWO5/KKpoSXCtJhfK/ECI
+            4Dw/P0P8F9If2zpm32PLI6Mzf0zhNJq+nXo94WTwDypH9gY9WmhTPSMRCbMaGBf9
+            7+YzfJ+gfPHcKdJe8ojoGU4MQy8l8hJrvM1pmcslZCMH1Ft2mlHhsVJj7KfAmhM1
+            I86uFMIMyi3nDcdzZ+mRO8lSfZzNt3ex3gMiFq80fLkTyxniAJd9nODNf6OZC0R8
+            syQHoykTBsuwut2M8MsSelZvq66GxSCzbGDjqbc9r9toL12UOPEzrG/eBFrqCJ2U
+            aqir8lSSn+IP76cdZ6aDfOufk9dEfPD8Lycq2SpysMl/vhv7yFdavNsl5/2kFYYE
+            7IUkF+fZ7u7MVUjmEV3/nlMwyx0HjrDKmvm5+yIBxasyxnP6RAd+1caoWJYne+Pr
+            J8eGiUVhcmTsKXccUQQ8V+xHZ2sk27UJF2l8LVRsLxqCkFaKPIeilyzKU2Zj60Gu
+            5YNCmg35bk7E9BfkSI/3Xt2XWBIvQHPQkFNYSfmTho+XbWX8hMKvfrFriQsx7lPZ
+            46tSzHEmz0QJOs6c8Y8YsxJL4/+FFZ9zu9P+yEmGA6++bylvX6Ye1BtMEoZJi4vS
+            WAE5RDZQEMiM54w08W3FbJf1P1x2M8ZczFqhogVZLiTqSNsG9GNf9wEZQ2QW+L3/
+            nH8vdUK+fgudPKFVj6BY3v6XPAMQEBdGUD8B+ATmapwDBSjcUv0oM74=
+            =dQ6C
            -----END PGP MESSAGE-----
          fp: 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
-        - created_at: "2023-12-31T13:30:26Z"
+        - created_at: "2024-01-22T00:20:22Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQGMA4JsBMC+MZ+iAQwAitBY6rn1IfVWmIEDgKHBS/si/j2cPuix7L+LmEqy6rwX
-            VIsHB0rxh6+mtejtSTCJFj3QU0wGc3FDGkfWFreTKiwl8IoboZmF9fORl0FoKSo1
-            INf3jU2VyrAkzAVGaAKYAjJgs6bN/y54yDQ0H4k0bE+wv2Zt6Rq80kI6Lp/FPsEH
-            FkQzj6yiilj5RmRoK2m2nJG79E0xLbpCXMf0r86iom6Lf+lbZD+rGVSNi+fGPF1Z
-            pGdJaFmtRtUrU5NX7NXCr1cE+hnJVg8G4vOWmUSInuZGsFdUObRuPiuVyh5xhsFR
-            ew3QnkvarzyRhkiQveb7tdNJvY4SdKkGIaX/mQZaMrkoEOtBZBAzJjGtM9wogiFX
-            ZA+SKePnQDku0D1RfoF51URoRYYwI+584JCmYpWytnQhyx3m5Ahom64LyCWw4mgJ
-            EqGivzrt+v1VMsdulYrtWsx5E257A99UDatfyMDZQxBC/Cvyuoym6b4sufEwR25w
-            tdcjHkas1+spWhB8/3QC0lgBrPeUevNjQ4sknr24STy2WJE+vNAoycQX/LUlntZN
-            JK6iy9kd3nigDy4BiYhNWgvq5c6sge7iGElaGIMjChb6mlMUadC12aWnWg8sj32O
-            w+fXkmKHVqIc
-            =tHde
-            -----END PGP MESSAGE-----
-          fp: FD4E1FB15DD0F36A77790229826C04C0BE319FA2
-        - created_at: "2023-12-31T13:30:26Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAyhQdcrIW3A1AQ/+JTAEoWztZXqF3mkTcOYZuXryq3JNkFqGprK3M1yEo50k
-            7jAMg8Tp17bSwlHp6WZewuo6NM1cJ1NoKrHya7OxZ/NV3dXhJcQUKROZvViAQkp1
-            cmT2pBZA+d78DF5RzsqD3E3wVcMGtsqsIBU9ANRyiIqNWX9S8iWiziEQtLoy6TRq
-            BDG1pU8rqEONb4JTnZhcmUlAmOBUHbZl5cqq4AOURfSbrSw2wpWcg1/ekr2xVGm3
-            kxrQ8qdYYLJM9KHpN8qCOQoAe/Xb73NG2KlAusubL62yNl+Jr2ImlBXccQROjuTQ
-            6cZsyUVMPQ1DHRvogCSvXG6xJo+FvELrnjeuUiNRqn71mPiys0dNkfJtSIyWv2Yt
-            9mXXsRLdC4ow7LNavclprEZ3hTXkig5dLy8E2bepqo/RSCTp2WZlL33ch+M/gmEq
-            QQNQ4rS27c8/y9O9Tz0yv4sgS/QpIOOA+yOgHioCCFU+7gkqNpPEEUmGqocxx/bz
-            mXqScaVkyVcBiWNMxd74wcopUz6Mwp4NzhBgyTmpkRIYtOK2Nf/qwAdK6gWA6eg6
-            S/FeR8YKGDcyVmg40rNEbd6La4qQ/om0x8WMu2xz61+2tpy4knN33OLBLDCSp3PA
-            hIhPc8kW1cZAEb8eYn7V0P/wwxG7OuNXkUvAm88Z4AvX9/ukoHE+yw7ZaqNZR3XS
-            WAFAgujgfDhy2qZAvs3yjxy5T+7EX9LN7zveOx745Ly/Ns0FU3C9/E8Kob6V5NHl
-            +sEiJqzByjlGbOpFFkXMED7SplHqBTAJRYundvsVNNqZ6/Dd3J3/j8I=
-            =OS5Y
+            hQIMAyhQdcrIW3A1AQ/+NirEhJAwoH1vP2tbTj+j0uR0tTBUISBKJ4f765FTFAV/
+            jL1GPDGUVjRCadDlaqjCLuAYQVwU9bnmk7WkUVQiXiZsk/Ct1EX/Feuxhmd05Kj+
+            Z+cgJf+Rs/jYO7znTjuLBOI+FHd6qum0Olwo3qUgn7r1ey7+3CzeBTOYVdcnIp17
+            FgMGV1aIvAOo6hL0KlwwsutlvQKNf0BwbGDu1EjGRXwUMQc3yX0Ih+RgqEDuq69c
+            hoHLFGxrmk38VnLrHqbjamrNrooz1TApon8FlLdHPAt1VvrAdlKG7Cz8jiE3kN65
+            HMJtJc0kwdW+U5g3bjOZyQxZv6NuylyWwKB6q9WdL3lp4Rhn2BOLjtczNPboTH2k
+            3uU14BvJpek8pBxkfroVeAmOcYhPfdcN+Vslx2lsUvLQtxGkTRrkoonPd2i9sAiP
+            4qihCT+JeGJCVEB1UP5VFjeWchxGlSMhhsqWD11qip7ImzV//M/y4shzekNfJ2OJ
+            WsvO9LtkW4VuvKlR4YmEZxRqxbWh5S//0TECWI/TgZLuM247vRac1jCe9thDGNmk
+            +4L1Th62VXZPuQPGOphRnKP4Bw+CuHyWOpmxxXbO2rliWGVvo7eUbrbhDfJ0j+D2
+            lUDBCN9vtmFqmMm9nCsgOPR/g7IC20clLEsG9K/kaNL8L4dZGLpUxCugU+UECm/S
+            WAE1JZa2e7yYhg7LOoFR9+fdfB5okaeolTWO5zpydAYlKGyoiaOrITEYxaSJbnmy
+            1kvDDid0CnrZ3pT2lhyufv6/v486fMHHQT4+B+kQYinbq1VRilwoxzc=
+            =uzUS
            -----END PGP MESSAGE-----
          fp: 06a917fc4a2a1b6b0f69a830285075cac85b7035
    unencrypted_suffix: _unencrypted
--- a/users/simon/modules/gpg.nix
+++ b/users/simon/modules/gpg.nix
@ -1,14 +1,17 @@
-# SPDX-FileCopyrightText: 2020-2023 Simon Bruder <simon@sbruder.de>
+# SPDX-FileCopyrightText: 2020-2024 Simon Bruder <simon@sbruder.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

-{ nixosConfig, ... }:
+{ nixosConfig, pkgs, ... }:

 {
  programs.gpg = {
    enable = true;
    settings = {
-      default-key = "47E7559E037A35652DBBF8AA8D3C82F9F309F8EC";
+      default-key = "D48A1ACAB1CDBD170151662BB1A0B4A45885A031";
+      keyid-format = "none";
+      with-fingerprint = false;
+      with-subkey-fingerprint = true;
    };
  };

@ -24,4 +27,17 @@
    maxCacheTtl = 1800;
    maxCacheTtlSsh = maxCacheTtl;
  };
+
+  systemd.user.services.yubikey-touch-detector = {
+    Unit.PartOf = [ "sway-session.target" ];
+    Install.WantedBy = [ "sway-session.target" ];
+
+    Service = {
+      Environment = [
+        "PATH=${pkgs.gnupg}/bin"
+      ];
+      ExecStart = "${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector";
+      Restart = "on-failure";
+    };
+  };
 }
--- a/users/simon/modules/sway/waybar-interaction
+++ b/users/simon/modules/sway/waybar-interaction
@ -0,0 +1,45 @@
+#! @bash@/bin/bash
+# shellcheck disable=SC2239
+# SPDX-FileCopyrightText: 2020 Maxim Baz <git@maximbaz.com>
+# SPDX-FileCopyrightText: 2023 Matthew Monaco <matt@monaco.cx>
+# SPDX-FileCopyrightText: 2024 Simon Bruder <simon@sbruder.de>
+#
+# SPDX-License-Identifier: ISC
+
+set -euo pipefail
+
+socket="${XDG_RUNTIME_DIR:-/run/user/$UID}/yubikey-touch-detector.socket"
+
+while true; do
+	touch_reasons=()
+
+	if [ ! -e "$socket" ]; then
+		printf '{"text": "Waiting for socket"}\n'
+		while [ ! -e "$socket" ]; do sleep 1; done
+	fi
+	printf '{"text": ""}\n'
+
+	while read -r -n5 cmd; do
+		reason="${cmd:0:3}"
+
+		if [ "${cmd:4:1}" = "1" ]; then
+			touch_reasons+=("$reason")
+		else
+			for i in "${!touch_reasons[@]}"; do
+				if [ "${touch_reasons[i]}" = "$reason" ]; then
+					unset 'touch_reasons[i]'
+					break
+				fi
+			done
+		fi
+
+		if [ "${#touch_reasons[@]}" -eq 0 ]; then
+			printf '{"text": ""}\n'
+		else
+			tooltip="Security key is waiting for a touch, reasons: ${touch_reasons[*]}"
+			printf '{"text": "󰈷", "tooltip": "%s"}\n' "$tooltip"
+		fi
+	done < <(@netcat@/bin/nc -U "$socket")
+
+	sleep 1
+done
--- a/users/simon/modules/sway/waybar.css
+++ b/users/simon/modules/sway/waybar.css
@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2022 Simon Bruder <simon@sbruder.de>
+ * SPDX-FileCopyrightText: 2020-2024 Simon Bruder <simon@sbruder.de>
 *
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
@ -178,3 +178,13 @@ window#waybar {
  background-color: @base3@;
  color: @base00@;
 }
+
+#custom-interaction {
+  background-color: @yellow@;
+  color: @base03@;
+  animation-name: blink;
+  animation-duration: 0.5s;
+  animation-timing-function: cubic-bezier(1, 0, 0, 1);
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
--- a/users/simon/modules/sway/waybar.nix
+++ b/users/simon/modules/sway/waybar.nix
@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2020-2023 Simon Bruder <simon@sbruder.de>
+# SPDX-FileCopyrightText: 2020-2024 Simon Bruder <simon@sbruder.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later

@ -37,6 +37,7 @@ in
    ];
    modules-right = [
      "tray"
+      "custom/interaction"
      "custom/screencast"
      "custom/redshift"
      "idle_inhibitor"
@ -81,6 +82,15 @@ in
        deactivated = "󰈉 ";
      };
    };
+    "custom/interaction" = {
+      exec = pkgs.substituteAll ({
+        src = ./waybar-interaction;
+      } // {
+        inherit (pkgs) netcat bash;
+        isExecutable = true;
+      });
+      return-type = "json";
+    };
    "custom/screencast" = {
      exec = pkgs.writeScript "screencast-monitor" /* python */ ''
        #!${pkgs.python3}/bin/python3
Author	SHA1	Message	Date
Simon Bruder	ec150e5a6c	waybar: Add security key interaction notification	2024-01-22 17:32:04 +01:00
Simon Bruder	013511c1c9	sops: Switch to new PGP key	2024-01-22 17:32:02 +01:00
Simon Bruder	a8201dbe9b	sops: Remove old renge	2024-01-22 17:32:01 +01:00
Simon Bruder	097457c451	sops: Fix hitagi’s name	2024-01-22 17:32:00 +01:00
Simon Bruder	5409755de9	Update contact page to include new PGP key	2024-01-22 17:31:58 +01:00
Simon Bruder	e600e15141	nitrokey: Only enable on bare metal	2024-01-22 17:31:57 +01:00
Simon Bruder	04c7bc089f	nitrokey: Force learn keys from card on plug This allows the signing key to be shared among multiple nitrokeys.	2024-01-22 17:31:56 +01:00
Simon Bruder	04a0a6e5ff	nitrokey: Fix module For some reason, using the // atribute set merge operator does not work here.	2024-01-22 17:31:54 +01:00
Simon Bruder	54218c7278	Use Nitrokey as PGP smartcard	2024-01-22 17:31:53 +01:00
Simon Bruder	2c35fc4ec0	gpg: Improve output format	2024-01-22 17:31:52 +01:00
Simon Bruder	226ce5035e	qbittorrent/exporter: Expose source code	2024-01-22 17:31:50 +01:00
Simon Bruder	ab600a2b16	qbittorrent/exporter: Replace deprecated calls	2024-01-21 21:12:57 +01:00