diff --git a/.sops.yaml b/.sops.yaml
index 251cc96..0bfcd42 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -5,7 +5,7 @@ keys:
   - &server_sparky age10zxwwufrf5uu9cv9p9znse2ftfm74q9ce893us6cnvxjc7e3ypcqy709dy
   - &server_alo_cloud_1 age1w5w4wfvtul3sge9mt205zvrkjaeh3qs9gsxhmq7df2g4dztnvv6qylup8z
   - &server_c1 age1wwufz86tm3auxn6pn27c47s8rvu7en58rk00nghtaxsdpw0gya6qj6qxdt
-  - &server_c2 age1c2kc034n7tqztarcu7n5ldnjmy9sr3jgwrsaddsj0hwfus9mdp3sctts4m
+  - &server_c2 age1r5q7s0zj2ggh3a98l738gc9fajjj5pxsaggs7ryy536a8tjd4q0s50anpe
   - &server_c3 age1zjgqu3zks5kvlw6hvy6ytyygq7n25lu0uj2435zlf30smpxuy4hshpmfer
 creation_rules:
   - path_regex: secrets/common\.yaml
diff --git a/hosts/c2/default.nix b/hosts/c2/default.nix
index c5d717a..d998143 100644
--- a/hosts/c2/default.nix
+++ b/hosts/c2/default.nix
@@ -10,7 +10,7 @@
   ];
 
   diskLayout = {
-    mainDiskDevice = "/dev/disk/by-id/nvme-KINGSTON_SNV3S1000G_50026B7383365CD5";
+    mainDiskDevice = "/dev/disk/by-id/nvme-KINGSTON_SNV3S1000G_50026B73841C1892";
     #keyDiskDevice = "/dev/disk/by-id/usb-Intenso_Micro_Line_22080777650675-0:0";
     keyDiskDevice = "/dev/sda";
   };
diff --git a/secrets/c2.yaml b/secrets/c2.yaml
index b1b234d..28b1864 100644
--- a/secrets/c2.yaml
+++ b/secrets/c2.yaml
@@ -1,30 +1,25 @@
 kopia: ENC[AES256_GCM,data:pZrOFlW5wy8I/leTc1mJEB31Kr0=,iv:COsdcI32ZD66M6h+5L2bBf1N8471LbVEt7TlhYQyMnM=,tag:hJXohn6/zUd5WOSYzXdPwQ==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1df9ukkmg9yn9cjeheq9m6wspa420su8qarmq570rdvf2de3rl38saqauwn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAybTNNK3lNZFJremVmUFc1
-            cjZqRjJhSDJ3OGFQOWpITFNZdVdQTi9nWDE4CkZJNjNtdHRBeS85OU8ybXNXVk5l
-            SVFBMHlVZVBKdUphWWZaRzhPaUltek0KLS0tIFVWWG43Um54Mm5LS0d2MTZkN3Ay
-            K3J2cnlpRGlNQm1abmdMMzJXdER0NHcK0HbMgUuxwa7OqvWi+fDqNBflxzZoOm9I
-            dCHVWjoBL8j6CIpn9ybCBv9oUWhb17xwxd7YIVmkZ7oIQ7F9f3r/Yg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjMjVLcGZUV1VCNFJKN3Ny
+            d2duMnpWTC9FNXRaV1JQVG5tKzZKSE1oVlJrCkJBOEYrT3J4L2JWdmEwa1BJSjU4
+            TGJHV2Z5RUlZdWRvU1NkWTJMcC80SG8KLS0tIFNDSTFhaXptc05GNTRCWUtpT0F3
+            WW5WSllnZSt0S2poampObGRPN3dEbjAKz5L8/5IQtHcDmk38e7ETVtrO32UfpHR+
+            dOLLnhhj18edXFc9UJcubFa+piqYWDtQRaLhsSb+CV4L3d6z0Osxvg==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1c2kc034n7tqztarcu7n5ldnjmy9sr3jgwrsaddsj0hwfus9mdp3sctts4m
+        - recipient: age1r5q7s0zj2ggh3a98l738gc9fajjj5pxsaggs7ryy536a8tjd4q0s50anpe
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDYzBoQURsckNBTDFBcENw
-            ak8xZ3NIWDM0OGZmVElVVWJWbndwMjRJMlFBCnp3M2EwaDJkYWxrbHkwNUttREl3
-            cWRFWVpLbGMySGNFcENXbzJyd0k0NVEKLS0tIEtNd2Y2V2ZMWC9rQ0Z2Slk4YjBt
-            S1lKalRuSmRYYmlDeHgrUFFnL0lzaVkKE8mk9PiPD/Tb+e3GEy1sXvIxdInlNGh0
-            HVHuQ/22UDTKSxXGKkD8WTl4VZVmJAwLAU4TbvtVzx96+SCi8uVy1Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQNFRNUDVFWkYvMnR5Q0F2
+            YWtHSDBRWXNQbnhCajY0dXhyOERzQnR5RmxvCnRyL1VUMU52ZldZZHIrMFRwcHc5
+            c1NaZW1WaVZhUlFnc1IxQVloNkQzWjQKLS0tIGJLdkF2RnNoeXdPNlpydHNQV1RU
+            b0RzbzBzL2x6Q201UEZEMWxPQUJqdGcK+KLVXgG0vBi2RumtzFrFoqfc2pyc4i2h
+            sAoIucvDqTy7SKckuj0Gfm3QanpN2kliSOtCFRG2qVQcXg/ymAJQVQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2025-03-12T11:54:39Z"
     mac: ENC[AES256_GCM,data:g8nz1Azs5X59ulimMRzgvKz9Y7lKnjFq2SCctdt+yMBLojlk8RXMSf7tY311dZLcd00wi8xsGlBY1XaCbDjIlkG4sLWuQIareYjfqGK5s0pRvELTTF2ZE9yY+5iYdeVkBe7yv44sWJGNN1BcgFpR9zUouA+6yKVt2/XcPu8+7Fs=,iv:zDyECD2w1bTq0xbart+cIjHBAmfSHnpFG5nHPbiT2UY=,tag:b50oQfRgLtI/XbkINuzx5A==,type:str]
-    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.4
diff --git a/secrets/common.yaml b/secrets/common.yaml
index d81ceba..bb056ad 100644
--- a/secrets/common.yaml
+++ b/secrets/common.yaml
@@ -4,74 +4,74 @@ sops:
         - recipient: age1df9ukkmg9yn9cjeheq9m6wspa420su8qarmq570rdvf2de3rl38saqauwn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKU1QzQlVLVGdxbE53Ukxa
-            UTNqdUV2TUZWeDRFTmd1UWhzTlN2M1Fmelg0CmZDb2RDM3FuaVh0TUJsY0FvTzJ5
-            cXZxY1dRczZ4Ukd0a2ZLSEZKY1ZwblEKLS0tIHZ6TWpaR0NqTVo1Rkx0VFNZM0lw
-            TGhhMjFFc2JDR3hSM0VzWGpxTzlycXcKqGwP0vgeyywxxvEgSQ0CdhZq2Lsgz1Kr
-            PusUdf3NN1HgMyXqGlmzxdGJJnISoJJGVHT6aR+vl0+iT3xyKTAV4g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYZ25aOW9YcXh5K3l1ZXBo
+            d1pKY0pqNFBhcThvNUI0MURNVzIyT1ppMUJ3CjVSY3h4a2YxbG9UY2pqSHNPYjZS
+            ZiswSUNIcEVFUDBKRnlxaU5WODAvY3MKLS0tICtETVlDSVR5WjRwMHFrcWNxK3lG
+            TEhNSlFlTTl2elRQaGs3a2NQbDBieTQKzfcVTWeQZSe63/psy4kr5/d+9tRRDC0W
+            W32AFCR7B+lBK9xL/Q5mgn8wENrpXKesGnKVn5gr4IolHulW3dfwYA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1gtyw202hd07hddac9886as2cs8pm07e4exlnrgfm72lync75ng9qc5fjac
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3WVRzRTQ2eHo2bnByN215
-            eTIzU05RVlIwQkFUVExwYnhKUUtCTDFIcngwClV6c0kyVzhKQlR5anJTQnlxNVJy
-            UmRieU8vc25xTFFyK0dEeVl4UmV6VkkKLS0tIEMrTXA4T2dQQnl3NDY5NkhnV3Ja
-            ZlVPYWxuYjFNdjdtSEVoRlh2OC9Lb00KUd3mGIY1Z7DSvj3JaSilScGj2kpl4+8C
-            /49o6Ov6A3vxneWhog+ZwLDYD5ldEP0c8KfCMr+S+FAx7XLXugYzpg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0WDVGTWhKTVlXMktpbWth
+            SHZGT2Z0MUFJNVVybTJlSE1CaFZla1NrdEZjCllEOWcrQi9ZdGlrSEowK3poYTR6
+            SUUvc0ZuTm9CVDEwMkpoYjM5VUd0MEEKLS0tIFAwLzNPN1dCZlNwNHdveGF2TWc3
+            VFVXQVhIdUtuNHUxZVZVU0tNSXk1UmsKMhisqXgdEDbhnSldytFolNfG9o43zShO
+            WeGU5MkZiXYDlXgAo7v2yiIhpRtKqoCMmWGXyG9PyqBYaFnvd+Rjrg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age16yqffw4yl5jqvsr7tyd883vn98zw0attuv9g5snc329juff6dy3qw2w5wp
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWbDNOSVZpRUdUWHFWTzJ6
-            UHIyV1RNU0puV2xNNHBvVSt2RVpRWm9YR3lZCkYxUlBlUTUyZmxaTEJseFJ5ZjZx
-            ajF3RGkvdjV0aTlFRmJ1TjBUSXpYem8KLS0tIHFyY1dheVJuSUZOMXZ0aVdTQ0Vo
-            TkNaaW9rVlpJMTd0dTE4UTBpbTBKS1kK7e1TIwNl2qTWUDZIWgckJP4zMc9tCRyu
-            7zibscT6EU9gADgF+GnkUCizY+aFq9h71V08KPz7BdDWlGgtCY2+pA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDOStrSGlmNjcwTXk1NnR1
+            VWJMZHpUcG5QNmQrakV1WnRWNWlaMU1IMGpNCjlTeE0zK1UrejRCeVZHV2FvSmhv
+            U0g1ZjVXWmVOS0V0MzQwSmlOU1pqTUkKLS0tIGtUQWg5RXVLa3d2TzNhUDE3T3NI
+            QWRURzY3L0lzWlBCRHdlWm4rTy9HZVEK7tk9xe8lHQqowopeicyd5hZrfz/qkfJg
+            c8FttbT+2AjFWfMAolk7eEfIBiJG9xD/5uyx2V/9ryeJhSt8+oRI4g==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age10zxwwufrf5uu9cv9p9znse2ftfm74q9ce893us6cnvxjc7e3ypcqy709dy
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFV3NuY2UraW1EbFVRdktX
-            NVR6R2dkSHpiWVZzcjZ1ZVZLRnNJaHZ5b1VJCmhjdjAxMFRLR2hOekkyQVUvVnhE
-            Z2JkT25SUXlRaGo0aFpQVXhhb2dzZDQKLS0tIHJGQjNLQW1JekNwOFNlOE0xMTMw
-            cnlPbE01UUFVdmNVZFFaTy9Ia1RmUlUKyEOfBALyXH4KemzFkhL1+Pewv51MKWx1
-            qLJ5sTNpAacI2XbzsV8yBwUsipY1vwzaD6k44q71ChOSNVx1s7yuIQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQVk5Ndlh5UFMxLzBxclpH
+            d0lDTW1xUm83U2w3L1pua0lPOEtBZzBCbGhFCldWdjk5d25GV284WVcyMElhcFMz
+            Umh1NWtCZVFyOXV4MEJDazVmRFFVWncKLS0tIFRjV3MyTHo4Zk5pQXkwaUpzdnRw
+            Y252M0w0clhvbkIwQlQreUtDeWg1bk0KUhF8ewHKya3xmTu7YEYoPEbuaLKzXvZS
+            eBAz+SEfVFJ66+kGCL1hAYxgKl/Xzj1k6v0deWGn9fsQrD0okD2bbQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1w5w4wfvtul3sge9mt205zvrkjaeh3qs9gsxhmq7df2g4dztnvv6qylup8z
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtZFczWmd3MGhHSGlpS1A0
-            T1NvWjR6UG5MblJ4bkNOdEVCQUhtNit1bkNvCmpsKzZrNG4rall4U2kvZ2dnYzMy
-            TW8vVkFIanhpakNPT1MrL1J5bE9VVTQKLS0tIDRmY0ZRbWE4dTUxcnV3L2NlTUlZ
-            cnhZZmRNUGxaZmV2ekpGODRXazd4d28KWcfMYm5qYfEz79s0nrJq+iNK9hsUo/Xc
-            em3jq+i14JpIAgTWXLRcBLhPlVbU8l30mwisKePDJ8Lf5M5OaI0hgA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKdzRCZTN6K2FJa0lHZ0VO
+            UTA2eERMWGN4TGJySDA3Z0xmYzVOaytOa0gwCnpOVE1Gc1UyYlAwN3dBKzVkNCti
+            OTVhaGltaTdXYWgrblp0VHJoSDdjSEEKLS0tIGxGOGU3SGN4bXpFT3UzTytFbm80
+            RTF3dFRyV2hjRS9TVmNORHphVGxrZkEKVvL+ioogtFu9trHK+rw2dRjiZNOsDDqm
+            uD0qBA/EqQr+sfX9teUY44mSgUEBoa9eKKIFQBu8CM3fbAIjp28vAg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1wwufz86tm3auxn6pn27c47s8rvu7en58rk00nghtaxsdpw0gya6qj6qxdt
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIS3hNa2pWL25FQmhGc3p2
-            LzJQMEFPZ3RiY0h0dEU2MDZzdmNSeVROWTNnCjF0OTJmdnhXVkFoRTF0RXMrdmgw
-            WStzSjFyK3FwVElCZHpKUHlUYlZVSkEKLS0tIGFTY1YzMFZubCt4cTMvc3BVK2N6
-            K25uWlRhSlNYQm0reVdsK05jYkRFSE0Kq5NViMmxNBCUD4PDPuh/Jk6zOrJx09Q4
-            bUCucRNwIMDKlPmpSQgTiy9Bu++lxwZEG1k2cOn3E2qNgDqp4t052Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0T2NiZGhQb0lqaHB4QkMw
+            TXA4MC9uZi85c3dib0RROHp6L3E1Qi9zMkZvClhsUFVhS0RxN2VWOXd1Rk1wQXBZ
+            QUVJb3BVMk1aNGNqbys3MDRueHBwa3MKLS0tIDBHbUIrRHFLclUxODVhdStUS2cy
+            dXQ4ckxCN0VjelZPWTMrMHdFck9sRDAKDITu5Wka3xUO6dpdShKex7myknJwk3Fq
+            Qn6QA6IUkEW/s5ByDk2B0fLzFEzh3IHHwIZa7CfhSuUqzZOkBzCgZg==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1c2kc034n7tqztarcu7n5ldnjmy9sr3jgwrsaddsj0hwfus9mdp3sctts4m
+        - recipient: age1r5q7s0zj2ggh3a98l738gc9fajjj5pxsaggs7ryy536a8tjd4q0s50anpe
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrNHdpQ1AyM0l0QmtueHU0
-            WVM4VEdsRWprY21PQzQrVkJQSlVOY3FFZ25VCkgzYnFhM0hNTS9wY0JWNmdiZ0Fz
-            SGxBOHhKenJGY3VyTFpuRjBrTFczWlkKLS0tIHJpVDMxYmp6ditPN2x1YzNwZkVU
-            bVdlL2Q0ODdDVkMwelBFUU5mRWVXKzgKYsHpnnbhZfY7Va5ipFz7BDdjPz3+6FV7
-            VKS6i+JIg1ZxUcH6+/I1vX+oErrFnNoSETfKfemANEx5vXH7GL1tAg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwUlp5MlBDTDhFZHl6eFA5
+            RE5qbGFOVTdBcmpOQi81b0t0SUp3Y09DY3dZCis0bVptOWxUcVN6OEpKQ2FIQWNM
+            RDRPNTR4cHJkNnRNV1k1TTh0bjZldDgKLS0tIERwM3A5b3JOZzV6cGFjWHlleHNZ
+            TWRacDhzQW4veTJDdzl3S2V6OEJBREEKeEoemfotP0Uzq0A/BR89yD9hpoFzhg8W
+            1Am0kRs81boMKrJATYTDt5HEtz+0nB0+VyzuRSjzCGM+yt6yM0XYDw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1zjgqu3zks5kvlw6hvy6ytyygq7n25lu0uj2435zlf30smpxuy4hshpmfer
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuaGo5L1FpamFzcHNpS2lN
-            NUdyRmlsaTJGR3FXT1Rpc0t6T2V2dXBVdUhNCnJGRjg0RlpGUkJIUUFRR29VRGUv
-            dElIUjRVUmVGMWJIeXlRbGJNM291dDgKLS0tIHdUajRUdEpPQ1BYK1pIclE4bEcv
-            Zmt1QVJQaURUcDJkYTNVOHdYdDhpSTQKjhjx5pE8ODn1RUHz+PuYyZFtjUlVwrTw
-            tU4MhsBq7Gj490r3I2F65XPIGuH1mJDPzshJJd8xTpv6m1gq8Bl8cA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuOWJsK3JjcTdhbkNma1h6
+            UlJoRW10aTVvN29URWxCT1VFWU5qaFFtRW04CjZPV3cvdjdjaW5odXh5ZG9XUTBw
+            OWxrRlVYdFpxZWNocjJFdkU3WlRlMk0KLS0tIGY4MDJLYTFNVW1Tb3NuMDBCZ1My
+            a0xaUmxRbVNXajF6MzM0QSsxUU1FTzgKbzGBfIM0IOJKI/P+wuUPv95MmH9Em0pY
+            pvf+PYpXbCrTJIj5sX2bMDiTFsggQXLAjJvnU9h4Jx35XMBG8ufyaw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2025-04-04T09:34:06Z"
     mac: ENC[AES256_GCM,data:YIcRrsPparPfPaI2+MLlKsxu7M19H8nndOsrDLuh/5BXzIZNiuTIWyvxODyhI745rDwlibO+7Q0QctanhTl4+IzGaYtuY4i+rb+3dzBMpcdT2VAbtCHHxcltWeanRGFq2K3WM2tbnQCERst5kejfn0Razjq3UU5vNwfBsdJMwGc=,iv:izDxy0ufVnH8ImkZIngcYhGuj0PGpLqBD/ZDvQyE+5I=,tag:oYBUEQS52pr09h5OvOadNg==,type:str]