feat: add host

2024-03-23 20:51:52 +11:00 · 2024-03-23 20:51:52 +11:00 · 0559b947b7
commit 0559b947b7
parent bee7534630
5 changed files with 106 additions and 77 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -2,8 +2,9 @@
 keys:
  - &nixosvm age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
  - &nixosvm2 age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
-  - &dns01 age190fm3dlfxtf5smttyqxtrht4ac2ldfhkap7luppc0aap8w6r940qvjyc8t
-  - &rickenbacker age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
+  - &dns01 age1y399g6q8cg0efzqdywrswp5uugsfeuxg54ptp3vacrvaknl5dunq22wt5x
+  - &citadel age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
+  - &rickenbacker age1cp6vegrmqfkuj8nmt2u3z0sur7n0f7e9x9zmdv4zygp8j2pnucpsdkgagc

 creation_rules:
  - path_regex: .*\.sops\.yaml$
@ -12,4 +13,5 @@ creation_rules:
          - *nixosvm
          - *nixosvm2
          - *dns01
+          - *citadel
          - *rickenbacker
--- a/nixos/hosts/common/optional/cloudflare-dyndns.sops.yaml
+++ b/nixos/hosts/common/optional/cloudflare-dyndns.sops.yaml
@ -1,8 +1,8 @@
 system:
    networking:
-        #ENC[AES256_GCM,data:akTbC8VrlNiKiFjRe+8hQfainn2iif6e5HWcCdNW8Ghzo6wp18H11e+DXp6D/kS7iVjKijPWTyZxwXUkNjfOu9WfmChKOoR2ZDdvEQ==,iv:DA2jbj8Ru58F/pZjmQIVHCZT5FSlJF/q0Kw+k89Kw20=,tag:jW2qH9StRljPoyzypnYXYw==,type:comment]
+        #ENC[AES256_GCM,data:JFRHRwBs7Qdlsjp5cJyPo7xey9vwDKI4lsaWwOVLGuAeSWcIUXmoF6jkZkutKI+txyjQoxqrXtvab+M6DDBG9jCC3/qcQxiljvK6+Q==,iv:tK+9bBVgDe2T5wDArr3IrSuTND16VUdMtsfbQ9OipT8=,tag:baChOJUpTAk05LRSxwNfqQ==,type:comment]
        cloudflare-dyndns:
-            apiTokenFile: ENC[AES256_GCM,data:quhI3WLwtSOAMaTGMwfZjU0ctGhb+bJaNShawEM9LnuLGHcsBkO9jKUERksU/hcsbCROGsQlhESrJ05guAlU1XXqDxuKHXEc5Q4MhzYAxnTpLuqJp21/CHVeJUMrMn3AyY4MGJHK608qZHcP8aULQvH0Lg==,iv:Z6bW312x9jyKUKPSHj9oLV7LXOD4WtYDCK7KXuVI+tE=,tag:8+7HudCbkfix0Xs+F041xQ==,type:str]
+            apiTokenFile: ENC[AES256_GCM,data:CG4KyihV3MQ9/JPmKnRAwUbOQb1IrM9yKtWeIbXtjRDjxENIcJC+tId4S9WnQ0u6WwtyDPIEbjNcZXd4pckL41mBb9E4j8Cap+ocEmuWyP4xOu/a46+yVF+Ai2mzehIx1xzx5+HsHzdh2W0WXq/T5Vi/Tg==,iv:PVQVajn/ZaA0mJEOWp+9aKECkSV0ZuQdd0U2nKw/sHI=,tag:Jj/uotKuagQa9cj7OOrcFg==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -12,41 +12,50 @@ sops:
        - recipient: age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2L2krTXZNY0FrN0U1NDcz
-            bklZeEt0dkJBcGNsTDNMV1l6dk9sWmxkanlnCmhGWDA4cm9yL2ZzRUdoajJQU0dE
-            aFNDRFdvMVJ6bkhDWlJaSzIzYktXaTgKLS0tIERtakdTbk5ZeGhKT3RWVU9yOGZx
-            ZkZ6Z2JZV0t2Q1AwaEpHTExLRTE4L2MKjzSmZz1SRvCv6bIjh5ubWd32PLZLie3S
-            euYl9cTFCE4ZZwnYVqEAox4v0J8NZgI5S3ZzcpCElzNk4bkVKT/hYA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxQnZRaVB1eWlBRTlMNlUv
+            WVZxd0VSMUxlT2prY0hQSllVZWgxSFhXY0Y0CkdBNnpieTdXZ2lWUUNYSTNVUEVk
+            OEpUaGNHNFVYcFJEVE82RWVFZzl5MUUKLS0tIHQyT3lxZzdHNkpINTNTN3ZwQ0ZM
+            WVl1aHphTCtiM3FlbzBoMWMyaS9oT1UK73PSRG50mZ8S6FajvllQFt9Ye8BoJJUe
+            iOw1H2tYr4V7QjHOaE5yCvQJTMUtc4EI+PfkmiiKRtsKbfibO1IylQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMGkvYkFjR0oySzJacTRY
-            M2xpMHpyNytqdWJHVGlZTnlhRERaVnQ3MDIwCnAwOGlneTFtWnVxRnloZ3lReThl
-            N3drNXdXekxKTWZDZDc2YWwzMU5QVjgKLS0tIEN5WTVHUnRqUWltYVBQRmJaNDJS
-            d3BwaExLbkE5ZVhrVnpUNHdiVnFvTGsK+DqQ1aJFg6xNjPgq2qUu8zd7J4HjN1/D
-            4XgtITFC0dxjTLjqzQwvTsh0+VMSdht9GOXlVe0Wl/N4aye8kaWAcw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBieUlpT2ZHYXY3bm1TUGc2
+            c2NlM1V2V2pZbFI2SjFXdnF6Z2JqS21jblRnCm5hdzJIenB4WXRweEVGV1dsUzY0
+            bVZDQjExZzdWVmlkaXdiQzhsaEhRcEkKLS0tIG03aXEzbXB6VWRxcmFZQ2IvK3lR
+            Q1RRL2pIT0Q4bk4zQUszYkhFTU54MU0KUCr7lwMzu2FNxmDkWsNxpiJ5F/DaAOWj
+            GhU0TFPJP8jEBDHJKXPJ9IMkXtyLU4F14pZBQGk6cVmQ7Ll7ABAW5g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age190fm3dlfxtf5smttyqxtrht4ac2ldfhkap7luppc0aap8w6r940qvjyc8t
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFZ1ppL2s0NXQvSkI0VjQ3
-            dXBERlM0bEZDVGJielo1bDVUbXFmQUsrOXkwCkJYcnR0ZUZHd2ZTY1UwVksyU2RK
-            VHRZRHYyRTdDTittMlQwRnAyQm1XR0kKLS0tIDJTck15TVU4bUJCd2V1SElsa3hz
-            OU5wS3lKWjhZSVJnZDdxVkhOOUJsTTgKfWGqTVDllMLHoRH01bzQiQI6sBzpfYU5
-            9F3QgbYuGHHZ4PGw6gIsLEVoa0wemg32v9130IHcPwKEi36baxZynQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiL1BjMUswTkMrU2kvRDNx
+            MGYrY25mbS9rWThvQ05lc1VnWExpRk9LQjNZCkF3REt6bGIrZTNKTGpnalZycVdi
+            R1NSOTNoeGdCcVZCQW0rM1B3cENHT2MKLS0tIFIwQzk5cFIyNkwvZm5rQkNnVU1y
+            ZEZEaWUydmV6VXVFdEpubkZRcjNvbUkKMuX2cuewaVDQh3WcEvTq3b/OT9D4eLQ8
+            dP6e2umiDuWO7xjSDtN2hMvAtwzJ2ac0hpGCl0yVFAcDeCP17O9alA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArd0E0a2FtUmt3cmRMcFBo
-            TFlROWUyQm5vRjhOTlV0MkVGaE1GQ2pDZlRzClRHWHd5WE42QUV0MmhINHE1akFV
-            YVRLSENJSDlIbUlDU1Fvbjl0NTlEdWsKLS0tIEEzcm5kYktTdGJPWENqOXZncU1J
-            T0hYbkgrSlBuTms5cEliLzlGYlREVXMKNAcri4/FFhYk61NyGbrGCEt2WygwKCTT
-            nagpiYUefVWCEOJA+oOhiosH91dFowBjD5kOmhilNiePqkRnw1Ekjw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaNjcvMFpXbkJDZnoyT01D
+            Mmc5L09KMCtxVFhWWW9YWkh2YSs5c1RscnlvCm9BbmJWZkQ0UmFuVWFrSVJMY0da
+            TFNLUXVKWFV6bzN4RXg3Q3hoaW5UdTAKLS0tIEZzWVd0d1hFZ0xPczE1NUt1SWl4
+            Z0hZcTl2OWNsRU9ncWhjMW1CNGtuQUEKDGSbGS4CTWWZuyH2DqcMd+SmH8Mmgn6Z
+            jqEfzCWcV0eUWN+89ic75I/Yy9JpBPvhyNnTatMeEOk6gypebgk6GQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-22T09:04:04Z"
-    mac: ENC[AES256_GCM,data:AONax3l32loJDdW3tuhXxHUyj+kcKpLWqe4Ewak6qRn+bIaTQCJs+QkeUDezDv6oB+lzKB40iZY319pVpvIc9U56KN1qUSiBxoWCWhdZ2m/dPmhVq0C76LwySb9zXwvKtysI4iSN61aZdd4IhXV4xzb4Uo5Ne6Z0OkJb0ZMJbCw=,iv:n/Uc0FkLkV3e/lvlwHurluDPWv1BGRXn36g+5+daFhs=,tag:IwKb4iBXq7+i1lgcXRh1/w==,type:str]
+        - recipient: age1cp6vegrmqfkuj8nmt2u3z0sur7n0f7e9x9zmdv4zygp8j2pnucpsdkgagc
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzNHdwTHVGWGNWajdGTHVp
+            aTdndkl6SlE5TWM4dm5QOVZJMkxiL0VRaFhRCnlOSE1HdCtxbmlEak44VDloa0U4
+            ekIzSFV5bldldnZ0eVNnV0t5MzllUjAKLS0tIFdwRjZIT21FR3VDeVV1V3VnRDZu
+            YjYrckxVRFFQcDNHVDNTNTVjVUZWV2cKkGTwaweH584hootSwsldyoiHfBFYMaNO
+            K4PuA8SHQMBP5obqljiplFx+ld+cFii10BLKbuNLx97oRJy5WyRqzA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-23T09:42:43Z"
+    mac: ENC[AES256_GCM,data:9B0TsfNaVnt7WrO0jkP4dd37Ys3JKj94d4Js31wCsPw5JZbfb+eC5meqIti1PJhw19xRG1BdpXLXGQ6XEpVPY7mU+BiVNpgaGv9+tYlxibie7+oHuCuVhnQUnqh3/FllDlq1U3jwtwHjXrEkJyKD85afPdegFrkbVozMCoNE7Cg=,iv:8tHw/5A+6IHnFURCDwsw8Kune0vNilN3CBz1e3T7Mpk=,tag:8ZRnkOd/DfoPzkEjwhK+iQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/hosts/common/optional/dnscrypt-proxy2.sops.yaml
+++ b/nixos/hosts/common/optional/dnscrypt-proxy2.sops.yaml
@ -1,7 +1,7 @@
 system:
    networking:
        dnscrypt-proxy2:
-            forwarding-rules: ENC[AES256_GCM,data:bf8dxDhpC4oovrKvXpp/Bi88munuJhLRbMomUCaSDqfuS1kXBR1r1l9BIkNFF+7vYRQ1sdD0Orxas0GbHw2Vv7EmW7Ra70C3EhgWSccdCBXljzvYHqna7gnSzho0HeFQWsO6vXOZb3+32lTGNjV+PEQ1+96Sy7jCzvxSjzaxkNM6wODlt2nNXbNff+xBVHDWosis4NdlbK3HHYhlHW58SP8uc8yCbzhPiTzlFJLPsq1KHHh20JrS/DWOCVx8tWMZiFd8TKU0HM+9pbeCgTeNn5KbBW6szswdmbDxjsM7l02Dqpyg2pXOrJWLNVT15oQxC9davcHpI20+ffJLjltqDCgVTaTSwaxxUcU4pTA4bMG/mMBqAT24/84QuB8y9Bt+4fsHbzAfFXA6wQIcmbZCyK3OS1i9evdY2waubaPQacMozghu0CprhNmCITG0OwdveeUh5WLMbg31cKlYJzj6qtQ=,iv:eepiiimaUg6iRKJ0f9JrGAT5QAXjYuouRuVoGUCQAyM=,tag:gLq9pspJjGKygxazvtSXDA==,type:str]
+            forwarding-rules: ENC[AES256_GCM,data:/Bmttk/FpmpN7IvxUgR2Hv/x0nqXP/YxGVSssYQUEcSIq0P5D5biyXK86yrbEsqUJzhH3kr2SjRHIWnZbJbtcYp/SfvqmktBfACmraYsrwO8uYkZq9dcMjBLO6T+UUeZzbD3nRF6TSgxpFYR7SWCn7P/DejcfSFT8wUJyLCqYMtkkilgOPXIzfYMH+982fmRHxQeswTuMUPXk/iczvAfQ6F85ZhFbJojzvf7eXZ3uxUwkGRE7kjsqguA5GUkYzQXsiXD2Tg2iAco5V2fQqmOEvdK/a0NCPogijIdPxgxJZENG/7ssz7k1U0egToCbPy9DcC/n3FEH+5hCEvHt5ErlrR63QBfwAf8K3TJHygCpWx5qMx//+JIUfPtWsS1y6tzvZ+2eQYscolZBQSIPkgD8KbHjEAkIlUtNqYPgGxwvyGCiucEWWc8BQImUYm+OpZwFiM1tfOAewB0W8v8o7b8PTY=,iv:MBq6w9o8iHQ51C53uLh34D5C7D1wMSGkwXQtb09y3tI=,tag:vZ5SQWmm72ytJr1zOqVgCA==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -11,41 +11,50 @@ sops:
        - recipient: age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSK0ZBSmptK0NFZDIxZVcx
-            bEJsTHhENU5odVh0eTVJdFlScmFlN0ZlUlUwCm5BcVp1Q0QzM3ZZd3ZBajgvRTNm
-            Z21Qd2FUWmJReFhlTmJXOG5FbzlXa1EKLS0tIFN2S3hmRFB2NkNZUXRXdTlCTDJK
-            NmVRdlF5eWE2MkJhOHV0U2pBQXBEOWcKy1tLWJ/D0//hhlC6LTq5geIEjx5uERhP
-            w/3OB4q8zsq+0qQftynDP8WiEedbt/WmyvQ9Lc1hkNSghGf4hk7EKA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOaUkyWnhXZDNBWUx6VXZx
+            c1h0S0dJKzVlTkdkVTRsVlg1Z2w3c3pOS2xrCk9TTGpsbyszRUg2N2RzZG4yYWYx
+            Sk9zaEFCbjJQb082Zm9La1hLN1h0QjgKLS0tIDNmUUcybFdiOVhLZXY2bUlmeXpx
+            eGRkRDl2MlhJeEJLdXBYcE9XSFgxVnMKx6nlTItqsde0ZzudnNyy3IcWyE9OfyDM
+            Iq7S1xNyMxFNKoj7ZQ9O+WKpf4/A7nCgB93qdKi8dyFcQsNL+7z2/A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOYnpMYmZ2VVlrMTBaaDZq
-            TWpDc3F5am5GNFE1K0pna1lMOEdKTllSMUVJClBhMHFZR1N2Q1FXdTN3LzNnRlBX
-            emNqVXlZZzFLVlNvaHhBWXc5NkJsdjAKLS0tIHd3cTkyN2s0VXFtQ1U1Z256eDZO
-            RjNqN1pDUnRBdnB5VzE3WHJYRVdLRkUKRBHs+6Um4iltS1tLnY8aN1q6N9e2WqV5
-            S/iIEezFN0tyu43U9tt2sTLtvXnadqVy/MpIMZEnHfj/sEM90GMb4g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4ZnFldVp2Y2NzR0dyQVVZ
+            b3pxdUExcDExUWg3YkVYZVBOTm1IKzRwYUVZCkxNUitNK0syS1JjU1N6NWNlYVk5
+            UFV4Wk55cEd1bWZ2WTJjaHB5NVg3K0UKLS0tIDV2bGtPZ1FhVjNVRUE5VWdQSktQ
+            aHJEa3hVSy90U3ZicnluS2dxMXU0L2cKGLPwOid+L7IWZtKgQ8lF2pPrAOrxZBFA
+            ctYXJHi31T0U2MDBrOsarmRhMd1ofvUQnz/lemgIG2F2HxTad7R2Rg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age190fm3dlfxtf5smttyqxtrht4ac2ldfhkap7luppc0aap8w6r940qvjyc8t
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0V1EzZDBYUDJXUzFRRTI3
-            WG5RbjZaQ1A5eWdYTnBYSjBSUmdSWFFpaWhBCkJBNnNQVUxwVGN6b2o3aWpyVTM4
-            N0Yybnp6NzdUUVVtUS9Ha3U4R2pwMDgKLS0tIEJlaGhlL2xmSVJLdFBseU9ZUUJh
-            RFZ5N3hRWC8vTm9HRjBadzlVeU9yRTgK2L+OQIsmZ9UgbzAass0vvcmB7XE6apT1
-            h+uSB0GpTz/+bebn3pTVjRjZXvy2ofMd1d+77NTR4LMm6WObXuI77w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyWTVma1hMN2NHMithazJI
+            YjNYRHRDcnZ1VnUrOWxnczZ3Q2QrdjNpcHdFClQvb2ZJMDFKRlVabUk0Mmc1NE5E
+            NjdRcmh3ZG1lN0FrMDJZU2RndW5nM2MKLS0tIE01cnpJMXRZY25waWdaa00wbWxP
+            RmJWVld2Yyt0OXdZVzRQeFBQTDdQZ0EKewL6evla5/CrqsSoDgK5TbQv2B26Unc/
+            /WU+Zi/bo0bd4iDfbUPdtxg9hUqsnP4cjnX0bFR9PP1IHcbTaS3cMw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLRDFUWEg4K2psL2Q3WnhY
-            cjVRbzI2eFQ0OGkweCtQc2NUa2lUMllLMUVVClVTZHdSZGI3bk1aWjJ2UnBhdnJu
-            M3QvamVJVCswSnltd0Q2V3A3WUZMWUEKLS0tIEk5WHJKRW1GVXNZN09jbGxaL01x
-            RWFaY0N4TnUvaSt2VFBiVUM1ZmgwbDQKdbZSPiMacUnCX4rNhIHOrO1Pi/zu2A9y
-            Ro+OYrEql904vJSbVcaTfdj6VwnLnulEzPFFyBfn2MJW/kMxkxa2tw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNbmltMUd4OWpzL3VDVk8y
+            N202YlIrWXg1QnprdjNJRUtiaXZvVVBOdWlrCitoQnQvbUxLN3E5VEhaZlh0OTln
+            eXlhV1YzMUFVK0hzNTdyQ2gwSUxzZEkKLS0tIDFaWTU2WUR1aWhxM0M5am9sOFVQ
+            VjJnbE1SQ285MVJHeExxbnpwV0c3Z0EKZsw0o7hZgswaqVh/K3kDORJiSxkGK9Zr
+            cJHnA2e7osm7F4wrkc++GXCEsjvdM1V8uXp8bHrrvBwlbBJA4C09HA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-22T09:04:04Z"
-    mac: ENC[AES256_GCM,data:fbkL3OLExxWMcmpanUwCEPbMgr/sAJrrsjLFAkqe9Jqjd+Oyrk/Lx4rzCFIU2EvX/eT+EhTy37BkwpBnV9dVyFAcYdwWHheiUdAh9zT64ioA/59kjM1V9o28ZtYbILybJFpiOKCN069uJ6MsmhIgllET9ocEQJebbezzSfbjvpU=,iv:YNCUEe45zX/LUU0IONLLRLXmdfDshrFv9Rnazc2il6o=,tag:Phu0IYqI1Z4g94lENRHNxw==,type:str]
+        - recipient: age1cp6vegrmqfkuj8nmt2u3z0sur7n0f7e9x9zmdv4zygp8j2pnucpsdkgagc
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpdXU5N1FyUHdZNmI1UEhX
+            NDcwR29UNE9hd2dsMHlDSjV4b0Qyd0lhelZVCjdhd3hnWFZncGlyTVJxdHZabXFN
+            dExUMmdRSm43UWtIYmhzZ3hTd29WRzgKLS0tIFVjZy9LbGMzR1VJTGs1eFFzZG1B
+            OUVlYXh5MENVZ1YxempVYlQzeUQwMXMKn5AzTMxMGCbQUGdtsOt9d4yxK1R6Vb0G
+            +IwgbUNS6+djhuW5TMoW7Avc/b3JbQ3oc6VgXLxTG5X2qBqasKw6Xg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-23T09:42:43Z"
+    mac: ENC[AES256_GCM,data:U7y0kd6xcz2S/1X0/FDqk4kq29K6nGE38WAfnmpgbfYXUQnbbe4dBPTbyo47tKRZiY05baYSi4cqUwYiGU9LX6KvfZSq3bYJRLiqKGrk5AMUyrzygWvceOaO2yYhjRHKU7J0rNq9pbXwtn/vjbKfzDQxXnWkAQ+/SIJbDebMlB8=,iv:5lTN4qd7XaRK0H/S6bYTMQJ3XIRGsoTVS2oK9MDBfOI=,tag:wgdr6/XA1vO3/ZqbvlPVEQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/hosts/common/optional/maddy.sops.yaml
+++ b/nixos/hosts/common/optional/maddy.sops.yaml
@ -1,7 +1,7 @@
 system:
    mail:
        maddy:
-            envFile: ENC[AES256_GCM,data:JeWV2weTxP5yHRPwX5+cbettIzvG/ZE11UXwJ6rI9eJhlfGzlRcfFz6fFgsbkiisj1V/jYiWavCn6dcvaK2wzgnt4wPYexjRXDci/4zv3VJ6+Y5PuSwwrAwlA8RtdKTDHZ8OOgYmNmByW2LgIQi4s+qdVtrCO8NukrcHaLFPJx525xU=,iv:FP8+TAvrxFNDeeUQDSGhuBm7OpH+uTPDvWIClUnZQRI=,tag:ktWR20EKEPdFGXUZya7ISg==,type:str]
+            envFile: ENC[AES256_GCM,data:Tl3ho1MPmjdoDnCF7it3zFsVpv7l7D9nzFFKWfyqhBYmk41kq8SXIFsHBci0tAc8ON628/zb4D1rwXtj1N3AVcCEQeM8snjwo0wd6pc6yoCLnkf3mRITZAftLEgLPJbAsb/OAtDQY7IKiPYubZwBCDjbsQrWez1ZYMO5WpsPD+2VOTI=,iv:HhZCs4uiJK2iXJiAupMQ0NQq0xs0WRiBJchc19UbgQM=,tag:t1SbqqItK5wX9Wbli2V4Aw==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -11,41 +11,50 @@ sops:
        - recipient: age1d3qtnwd73k0npgwhqwpwysdpqa2zyyjyyzs463f5rak9swmw45gsxdyjyn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMRUhOR1FrRkFER3hGN3Ra
-            SXVhdlRFRDNtTGJ4REsvQmFEN3AxZVFad0JRCktZZVVBZk1GcDV6ck51anlFL01r
-            c200SHY2cWY1cEdDTzdjc0pWQnhDajAKLS0tIGNkbS83SHJjQWZ6NlcrbmYxaE9y
-            NkhYQzdqWjZnKzhZMGVRV0QyajNJblEK3B9+oBGIPWB1Cgo51FNC9EdVJVgsf3Vx
-            4ZVL0xTf0+/cCgAvVRQF36uGwOJTxeyW+RcbAsythW5cGigsYBJ8Aw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZZU9rU2JsWVF5OEVsbTBF
+            QlJLVDFWU3BISzl1SWk4SUUwL3VCNFZQY1VvCk5nTXJlazFQNXo1ZVhJMEpTRnVE
+            VlNaalRqTUtTUlBVeWVVaTFvMmJKVVUKLS0tIFM5SEIyOURhUWFHa3RrbVBSRFlT
+            VS9WaGhGUWpMcEJ0UUVsRVR2S2FtR2cKhePhqrlZ9KpD9CQOJ7tObqLOXWCxIxUv
+            X5jPf2gEsWSPnrVPehSbLjsyAFlMOVCgEcc1o5qec+cFgqwN3HcuAw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age16mwx76r29pa9lnmagujw9adxrpujxmxu38hjfastf6pgw6v66gjs5ugewz
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxUGFsYkNCR05LRDBBWWZC
-            NFFhYzMrZGFvM2E2SGk2UVdHU3lsakdzZW00ClB2K084VEhreWNYaTZSSWZRU283
-            SVpCaGRVM1hvV2toSmFRajdJRGxjdlUKLS0tIG5KSWVYTkZqdkVwZkptZlY2S0Vo
-            dEdRRXVZRDJUZmt1eE1QVnZXQnNlQWcKZhnZ7YvWPP8NAV2XdLepsLFswDz8Zc2X
-            HI9amGzzFHx3+qWZTjOnU419yB2EOG2ky+HBJ/jZzMfjfGhFztrTTg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFSTBWVXlyN1U4dE80MnpR
+            UWNFYjZycUlFR1FETEJLRDdiNnZ1NzRZOEF3Cnd3QkI4TlBZRkxmL2kwaTl5eUVC
+            UGNGbnc2T1hPcWxOZjNBTTlrWDdnTTgKLS0tIEFjR3BFMyt1NUhhRUdmMzlMNHow
+            RVlqSmhZQVZXcXZFOVBhTEdDMVQvTzQK2ZMfPvX7plEopZH1mXLvc1cxa6SD/GM7
+            EBaUbiRM4IccKf+6Q9w4Zna/3naHgr2EyDhJnXiNx6C5sMPpx+0Npw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age190fm3dlfxtf5smttyqxtrht4ac2ldfhkap7luppc0aap8w6r940qvjyc8t
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByMmtFZzdESmE0aXdzQ0ww
-            S3kzNzI5RWxDbTA3RnFvTW9PWEx3bk9za1hjClQyMjBuRWpwTHJodUNKVVFZSzlm
-            SUVQN0EzMjJXRzM4OTJnMjVncEVmaE0KLS0tIDl6UW1acmdGdSs1eDgrbmhYZmpT
-            b2tXQ2FMSzdvTURxQUgvdkMrc0J6MHcKo53yp9yS8oKkq04wbIkY2KPy3w6Om3Tq
-            wkzWFMnQsLUzEZn5QGOQOLMx3vcA50+axu1Rtg6875S9xWRIVgwUgw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwQ2tiTUdTcjcxS3VIdDN0
+            NXBqT3Vsc21CaTBxaWRMcDRDOEFhNDIwZXdJCkdtY0VyWGVPTk5VQXhJQXV3RWtt
+            Wkg0SWI3M0VzclM0TFliNmtBT0U0akkKLS0tIGxWZG9BelVHSzNROVVUQ0VJLzdF
+            OEphZmdxN0kvc2tpUlJYTXZ0M0ZPem8K3xHBOjygxjQsyXUFh8kK5YPWLDPUAJho
+            AiVmd5EtWzFJikz4MW9a6P7eeUUzdVEBa4KGI9VdJ8JDFtLGZmmG+A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1u4tht685sqg6dkmjyer96r93pl425u6353md6fphpd84jh3jwcusvm7mgk
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3clhXMkpsMUVGSzhPMm0r
-            eFVBOXc3c0NKVDlLdThQS2JvOVd6ZmxvekQ4ClV1NWRxUVIrLytlSUpNVDl6QlBa
-            YmJQVXU2cnBGQWpZMGRyOXorYUtiSlEKLS0tIFJkVnMyclNhOEJPQi9ESVhrWXN0
-            ZjR6cENFbDcyV1lvQ25RaGpGdnhWc0kKfmlbziidJ1714MRWuAZtZ/wLWccGMjtr
-            3YHJ6FF1kexDapxe9perMapXaxq/tY6DxAoOH/BOtjwcS7aeaXJFYg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnN3VrcFZZSXp0eHVaZXpz
+            R0RWUkpTOXVTb1Z3ZVdRK0N4Q2NsNTE1cmwwCkxWd3BRWDNpYXFrNG52S01paFdh
+            U2VwSDNVaDdySDh6dTcwQWszU1dBSlUKLS0tIG5XVWkxUFhhZTMvL1pOYnZwdWJI
+            NE1ldE5lbDRKZzd0clhSMEl0dUM4d1kKa1EJEG5Vs7MAlCjJJN7rE/9u18enxjdM
+            noJCoHviMHymGL5SR7BccPyrsJ3V3wH6BTEYQ6iVbC5wV2jkRFH+tg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-22T09:04:04Z"
-    mac: ENC[AES256_GCM,data:vIHgpWqr2AFZtVxHaNKAnI21+5h1LVfk0U32eARDCXb1OEgbP5voTDtzbVlKxEOB91/Yj50SMUJ8u5+JgBkwim9HB07xEfBrhbOIdgF0O5KKo9L15+xexLwzLsq22XJ35JBmvw21O5nPIibsC4u8lUMWsHHAjuy5hdUky+Pt4lY=,iv:Gu9T3GhuUZkKxFWH+p9ZE5MHZHLwBE3t5v6VcKlmt4I=,tag:ZoKd0mpd7bFTMgXWrJ9Log==,type:str]
+        - recipient: age1cp6vegrmqfkuj8nmt2u3z0sur7n0f7e9x9zmdv4zygp8j2pnucpsdkgagc
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBveFZjREFtdnFSaWFmdlh1
+            OTRhdElyS2l2LzhxK1A3WXVYYUdHanFZVlRnCjIvZ1JkTU1haWVoa3BjUWhyVTQr
+            ZnFLUnUvVS92N05UYU5KNitDVGVnV3MKLS0tIHJ6TWE1M0NaL2lSOUZEek9STDMr
+            eUphaFNjN3lBTnBJeFcvTGlMRG1VTVkKA6NMCTagSRvGP9buvAcHrkBlvAH48JDF
+            bRc92UqgD4PjK4uwjyQX25t81MBMAhcCBcVxSAIQwhRol1WXa2k7ZA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-23T09:42:43Z"
+    mac: ENC[AES256_GCM,data:c9u1+jT/GYCckbdGACGATi9gBRFW5YBjz74vUBMYUkz609BxMG0IQdQSCLNvF/3WM3MDABW6qooxsArVu7Cofq2peD59x5DJVM6Q2Q6SHhqOZAgg1YketI+LFrpuS0eL20EwrgQStRDrbPR0kk5KLlAYyWEfSK4HOqY50IKrPYc=,iv:pzPrtQ2vzyajmGlNqFI+NKrIrqbqoYFsxdAFebSgq0c=,tag:3D7EOXAiV0VWjj3abofyjw==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/nixos/hosts/rickenbacker/hardware-configuration.nix
+++ b/nixos/hosts/rickenbacker/hardware-configuration.nix
@ -8,18 +8,18 @@
    [ (modulesPath + "/installer/scan/not-detected.nix")
    ];

-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-amd" ];
  boot.extraModulePackages = [ ];

  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/701fc943-ede7-41ed-8a53-3cc38fc68fe5";
+    { device = "/dev/disk/by-uuid/fe728106-aaf8-46e6-ab46-1610f1f4398a";
      fsType = "ext4";
    };

  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C634-F571";
+    { device = "/dev/disk/by-uuid/44D0-91EC";
      fsType = "vfat";
    };

@ -30,8 +30,8 @@
  # still possible to use this option, but it's recommended to use it in conjunction
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp12s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp13s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;