6 changed files with 41 additions and 72 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -1,6 +1,5 @@
 keys:
  - &min 78795D9EBD425CBB3E850BC45DF91852CB14CEFF
-  - &min-b age18c70wdd6kf9mt6fmn64kjcereww57edw00v7x3xrdxpgn4jfn4tszm862a
  - &eidola age1uqxzduupzes3tgfrrlret0n6thyldmlef60nqfzk689lmg6yayvsqpwxj6
  - &silver age19yhycdgqczrvttszq97ccljh684x3r7f5dj4p0wdwqsrusqlcayse0vsh3
 creation_rules:
@ -9,19 +8,15 @@ creation_rules:
    key_groups:
      - pgp:
          - *min
-        age:
-          - *min-b
  - path_regex: secrets/eidola\.yaml$
    key_groups:
      - pgp:
          - *min
        age:
-          - *min-b
          - *eidola
  - path_regex: secrets/silver\.yaml$
    key_groups:
      - pgp:
          - *min
        age:
-          - *min-b
          - *silver
--- a/nixos/hosts/eidola/configuration.nix
+++ b/nixos/hosts/eidola/configuration.nix
@ -54,13 +54,6 @@
    enable = true;
    settings.PasswordAuthentication = false;
    settings.KbdInteractiveAuthentication = false;
-
-    listenAddresses = [
-      {
-        addr = "10.13.1.1";
-        port = 22;
-      }
-    ];
  };

  # My modules
--- a/nixos/hosts/eidola/default.nix
+++ b/nixos/hosts/eidola/default.nix
@ -6,7 +6,7 @@
  };

  deployment = {
-    host = "10.13.1.1";
+    host = "192.168.1.159";
    user = "root";
    port = 22;

--- a/nixos/keys/ssh.nix
+++ b/nixos/keys/ssh.nix
@ -1,5 +1,4 @@
 [
  "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBCZ7P/hl8DOMyTm5vGZuMrxBeSr2bmN2tp8zeiK+y/zq/fOi4rMIbfQif8KmaZ2UDTnpWj8DNfrPhfz6li1nzU="
  "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIPci/gIUGWdoiLXS8Nq8T6Fvh2Wtpxv6pnqyvbSWvzyoAAAABHNzaDo="
-  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2l/sOPaC4F79AhAR5gnqMdTydOi+PKGZELB/MKo9Q7"
 ]
--- a/secrets/eidola.yaml
+++ b/secrets/eidola.yaml
@ -7,45 +7,36 @@ sops:
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age18c70wdd6kf9mt6fmn64kjcereww57edw00v7x3xrdxpgn4jfn4tszm862a
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4aDZmSGJyQmFoZk9TZXVs
-            YXVlK0VJWHZwWG1LREIvalhHcjJEVlQzNUFvCkRTK1RvMWpEMElwVDZzVkNWM1Uv
-            T0h4WW5yUVBMMk51Vm5IMGZTQ1U5OHcKLS0tIHM2eTZnSTR0aXNUMkR5T0dabmkv
-            MnhuSEJZN2tyZGFhTk1KSTFxOUJvTmcKwKM12n0JRdsWg3sVs24VFXIuYw9wdBfR
-            3AcsKepdwGQ1LbbruOCnQMIdGOF+DFMgtnfas9Ib4EehPG75/VN4Tg==
-            -----END AGE ENCRYPTED FILE-----
        - recipient: age1uqxzduupzes3tgfrrlret0n6thyldmlef60nqfzk689lmg6yayvsqpwxj6
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMZUY1bHYzZ0pzRS9JZ1A0
-            akVqbWROK1lEYm1ydlhxRE81SVp0aDlWYUJvCklZNmkvUk5HYVB0dm9FcHIwTnZJ
-            N0szYVphb0UySHhhendWam05UFV0MGsKLS0tIFFobHAvbnBpWXdUOXAwMlI3ZlVz
-            TFh0NU1RRGdaZkNpN1RIQmc1N3U4L0UKOALRjTetKm0UHKvhByDRxDzEBzoJh4l3
-            fDnOAt0z7ICfp5tqOXWtkD179DLlfsFrnlehiNm2l8RjtgYdgsYDTA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPOUhRbm95NndkQmRnc0VX
+            RFpaYVpoaE1mcDVuVTFYZ0hFbFBDalozM0RJCnVsUTZ2alJsY2s4TTJwRmQvYzBB
+            VDQ5SUVUWnRhdGN0elNybElpMmhsRzAKLS0tIC9DZGNnbU80Z3FTU1ZRMlZlUVMv
+            dVh4dFgrcWxtMFdUVVZTTm4rczVLaE0KBhCAwRHxtedfNZapyR3lbkxaiWxZR5lW
+            SQMhh9sUTnc/4B6StOhZEn+S7bVSRjPgvn9F+W7nCzcq/fpRYTcWvw==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-10-15T20:21:41Z"
    mac: ENC[AES256_GCM,data:UFxO3wb/gAg5hiYkp4lfGeO0gZA6F5sEv6jiwI+GA6BidCkrGMAaYLQm6wvJ9sPHANdzSS72oi+7fUyoQ1M7ukpocpA+qbpC5RjGWQusxrrJK+J7khSWGfP5X8qkJTxFs+FK1D2HcfTIPcwsR4LOHwK/chWg4As4aEgGHcUIZBw=,iv:6RE/Y24jIt5PVlzc8PHIYFCgpEt0QLNeXa0uAk4vWIs=,tag:JrBltUtb7hqr2LsJr2oXRQ==,type:str]
    pgp:
-        - created_at: "2024-10-17T02:17:01Z"
+        - created_at: "2024-09-02T19:43:07Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwAAAAAAAAAAAQ/+ObS2ffMDovxC9HXYLUyPiR8gAtaJK1g8C0tTAGS6s26s
-            XzfIzVfBVISCQ2Xp7X2rh5huZbFLY8gBR+B13WSOfVTnSmmGz5jsGDS8e8rD5rUN
-            dWaK/Jno2tg/KwRRgP0WXF8cUT20WEVV8D3iWM3MmwKwqQNHSZ4XwJ749jXQ/x8u
-            yiyme0oSTrOsxGQHNbu3BU0eoRsxHNsZU4nj3cOMpsFCRlOkSA1Tbb2SHA3vZAf6
-            UDk6/efFhzDyeDjh7mdunts4KUb0CAAavU5Mz3MoelKhVhcaJndrqRu2ZV367B3w
-            k4s6hpYDmkEvOHo+l6rwVG1bAJAEzyLIv//eYK9I89LCNzLWoCWL2sKMt+ZS+bae
-            pHynRmUxsQO6omDNRTIpl86n3oLSSztCFS3u39n/0M7j/fOZE8J3FQ930cMvGlOV
-            oR8L2lIRiCFb+1VH8BxladXA7T0QmaSuK3+LNOxVsrXIhFYzJHymzBeFO6mAmNK6
-            m4x5Y09AjIozrOzyXyXSpUb/CdNcSVpR9zPoO1wfBPK8BbqGloUhatGa+bIln+1y
-            Hpgub8iednvBgHlOSL6atp3vYbehhuQJr2hgnR9pdbwW84nJpZS8uxJwROweYyQ0
-            luLPl0QhE9Yo6oq/LTMALMqH249uD8ErRS1e2lzGuVGf/F6LR4GKOAQRKIebiIjS
-            XgHwTrNU/d3L65yG/CyBO1hVf79kdeP0+RpST6Dxaq3AkZaQHi7sfGlx9gqNh0vf
-            MNOago2CtT5eghLN/p6DlWVpB6GBj7/YpJkosuR9lbFqbiGCzLBHmKx2u1vj/f4=
-            =X4gJ
+            hQIMAwAAAAAAAAAAAQ/6AsaPEjdfJlZs1ktcZ/zingDBMEzmjk7ZCN7kO1luTMFs
+            F7OaxAuyTlJNHU90ihJO94Gbtw0wqLewltl9nfNvHVSAWFtrZL2ReWGaAd5tS827
+            b91tDiifCQ+AWYrBMO0Bmd0RkgOQvfc3FJbOzxhb1mdzhCXKGbOCjOD41A3/nadK
+            xaaBHv1dGhW+YYvtibgUWfntSEa/drgB0REjGwbuLqvlPL2I/aP51edYyGqok8V/
+            +2dWRggxzm4st2jWngb7jpKSweEckOXki9Fu35bVOeV0/x6/iMQ+6f2OObHKu6pi
+            OB3kes6m5hsSWPgL0s9WbrKNpyrYeFhxzweGfm4KG8hZqU9aytf6Efo4a/dKin8j
+            DQBeFk3TxDgEzy9s+4xq6zq9yJeud4knd0cM82Qkghg/96E/M/RUf1l9MkbuDXCU
+            i6HPcDv7yMMPDexLWBD4HN2Kr418TJ8rtqb1lESWhjl7LlFQeXqD9mvy6tF9URZE
+            /L2ez4RCFZL4EAD345+gA584hmmmfqfXi7WrQZiA1EAZRcfcTm3sQlyHKMHkT5jr
+            oiFXxvG5hwjrfe9ipqhQWvFn06x5PielOUy9bfG0uza9/o9AEtQWdyMOIGFqm00o
+            04Xfv7PblknudezGKEbAOexZRDwZTGPOSNU1WCSguSUrEwX+mFKCtxD1MCxgowTS
+            XgFdTAk8t/pctB4QBBVUNdN36fU8Iah+K6+T658aQjHOCcIziBWUikHtD4yT/emu
+            BSqn41/VbLfyCosyXuOjqtMYg6evKRsVtqMx1GnInOHTjw2juOV1ZklVZNk8fzs=
+            =AZ8U
            -----END PGP MESSAGE-----
          fp: 78795D9EBD425CBB3E850BC45DF91852CB14CEFF
    unencrypted_suffix: _unencrypted
--- a/secrets/silver.yaml
+++ b/secrets/silver.yaml
@ -12,45 +12,36 @@ sops:
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age18c70wdd6kf9mt6fmn64kjcereww57edw00v7x3xrdxpgn4jfn4tszm862a
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYUXdKL3VzNGt3b2RSZkVP
-            M0FybmNHVVQ3RnJWVDVVSVlneVp5V0dBRTBJCjFxd3lhVUZxWGR1cEZnNEpDMmtm
-            cElyQ2dJajg1alV4NXpKMlVwdVNSR00KLS0tIHRsWTZWUk4yek9MUmY3aEluWDF2
-            akxhTjc2QmhuUjhBbUFZcnkxZGtiSDAKrysgQBNzk0KP1ljVN/utvkCEZPd69T18
-            f8aJkfy9U+PuWYBMmZwpTp5a2AZE9R152Y5CF8i60A4vyRR9Vlfsyw==
-            -----END AGE ENCRYPTED FILE-----
        - recipient: age19yhycdgqczrvttszq97ccljh684x3r7f5dj4p0wdwqsrusqlcayse0vsh3
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1em0vRmxvakFmV1A3QUVN
-            M25TeGY2OGJBZFFUcE0zUmhBL3RrZ2w0aVVRCm55em5paXZyeFFUdjBEaVBMTnpT
-            MVNiTFEyeUpGL0dUSGJ5QUhrSm1TcUUKLS0tIExxN2Y2dW1FSVAxaE54NEMzOWhR
-            bEI0VFlwM2JwOTRLbWRBZ0oyRXNzQjgKcw2FrWl5rnx+quAcx3rv9A5K0whluqd/
-            gH4Cp7+S+OzvCNNCJl0iGrcWM7+ci/ndI9Yfq0AxLbJwcgeKMyOAhQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1emJhUTZTcVU1c3hSMjJK
+            MFcwOUYxbUV5ZUtJck9WSEpZS2Y0UFMrNTJRCjE1U1RNeUI4VUE0aURvamd6WHFF
+            NGE4RWExanUxelI5MjI3dmV2WjYyNDAKLS0tIGprYlhpd0ZrN3E2ZnRBZWZibGFy
+            Z1dZRXNCRkQ5cktZRGNpUXJaWHhrYTQKXQ1VOLDgptLJ8JKSBF8CWzyEGHnlbB+4
+            6nZlCHid4AFPRdAZ7cgEvJViBTSV05NOWE0pKYO3WZyWVKysfBKtgg==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-10-15T20:33:06Z"
    mac: ENC[AES256_GCM,data:0WuZQxRXih9XRWGwT01eiEppEIPfGOjSpKEthmY3v+kumM6ydpueCroxqIuQoLXke8eKzZ6Xg34C2AvHgCdkHTgYbC9wGf9h8cV7L2xD4F9sLQ2scGThCynG0AGcLRXm152wzSdR5dGr1h4p49WO9XGbLEXD/JzfyPIcENDTPAs=,iv:LIPHnjWJYPlvs+VBvrRpczYD6ncwqTs1Jyz+VdWFaxY=,tag:Cdu7pKIzqi5H4Qo1eW66HQ==,type:str]
    pgp:
-        - created_at: "2024-10-17T02:17:20Z"
+        - created_at: "2024-10-13T01:11:54Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hQIMAwAAAAAAAAAAARAAppvGqjrswhXW9xqomcc92TG1KQIh72s8X16KdS+jG/zC
-            E8brzaDeRWUvS4mEkOFcSQIKCrg26tnFgE1HyTLGeQR8SghPQpWeQUKhiJVmPPkt
-            rDmXhCwRrgouFrBtFjOXZ7sQFACaGyVydXQRlNJ7rqB6AY+QgdRtrZO/UccEg1rY
-            Ysx6yi6npAYIe2dcacTrk/jWsQgojeExFKw7w3cf2wtHft44PGl2VlSXZWcnMrST
-            alui+ec/TGi42RnoTCbST3YC5/p4/qu7wjxroJfGExApfAYPCKUtvoB7a9XUkdw1
-            QFhPjcfTNCyLKhF96yMm0rgajaCNM8mcljy3100I/5rpYFv+9MXUGKX4LwucgQ4q
-            9yQvKjgVaYfCOg6e73n7fZaXGuferzGYeIZLmCu7o5Zy418YxNlNIFO9m0DhZqfh
-            Te0482X/1yPIE7IoC4BfxFe/YQDc7iiYRJXNIOjPIyNWJnj8YTfu+t/ojJ7clcac
-            RzW6zEhVZrFkZEOSjU3InCgIOvXyIPu50FpWUD6kNZaFo12NtLYcf9cpiiCnaCG0
-            gRtgTs0vEToB75LrF/dcCI8tB5BcvaCKYe2h7/5+whm/Fq3fJgWbD17htlJkVHpg
-            A2kaW/Zeg+TEA9ss4ZDOmtl1ysZuUnLhlcN9F8Zkwch06yR6fYYLCD/duQQf3v3S
-            XgEIdNXjWtEhIl8wfFYgXHUk8IR4BBZ9XM8M8gN0WHveZD7ci39V74BpjihVrCEk
-            FpWKoScmlz+32klKWyQ+HUT901SogXlWUNpekyEtdwqNn+FDsrOT3gGPpURQct0=
-            =fgdr
+            hQIMAwAAAAAAAAAAAQ//Z6FAOpeM+H/nYQ/FIlcX/E87PxSwtpPoQJMcnBMaqTQL
+            vpedSVDHuvdNexJfT0cOj2Va8aguhMQcgGo+vaoKtMWXQhJYf/WsTMS3F0UJLHwZ
+            AvuH62F8C3EPPxFrrhP/bQeADtki7CDRzQuE9wLXjCT8KwY4bfFXD8NDA/9Rp+k7
+            mU5hOADqS6LBhaB55fFZ/e8MaCinezADDIDrz8VkTDzaRiU5g5VDdZnocCIp2Pz6
+            umlswmJXPic2BkbH4ALAfA/v8lsLXqi5ZnMkvwzc1YoACLKsJ0TexMXE3UgTvNb9
+            PzxDI1JzC+9RpGSBgy6uH2hnYNfgZ9S72Ha3vGR82k7WdEAQ4JzbD/WZNllb4aXw
+            oTx/XSyyLoUK1o66nV1KJRFsw9yhc4Af43lafur5cQp5snSJyYg6BKc+K25eRBYK
+            yBV0NdF9sRZlNd+FiIjj00iKJYXJ1YclPxb5NJ8OMhKYLR52migfj3F2WUj9sjRE
+            bKdXtjeRup2HhiCSS3pLlcaTSE7VaxCyaYbMT4GhZI4uFMt0WSrFHE3A1e/bk+GI
+            6v43SnCnzHX2o8ZPs6Oz7o6/HvhRLg0qarczqsEZbRVB8HFn0GrTLHSG743RFN73
+            Jyhy7/KXv1pqb049VNL7ya5+ZEEFgHAjYkEkkBUKYFcnRCwh7liJ7vTkwWfbRR3S
+            XgG1ClrtfTSCzEHrYE3FbDC05Bjaep1YiYkWEzHT7rAeFw1YkLZGPUuLcm55owHs
+            jCGCk1j97DdK5lJyJVuSoNspg57DOW6CsQaho1pKmu3c/OWx0le64sU9Sg4aWGo=
+            =TIIJ
            -----END PGP MESSAGE-----
          fp: 78795D9EBD425CBB3E850BC45DF91852CB14CEFF
    unencrypted_suffix: _unencrypted