Revert "devices.srv2: fix device swap"

This reverts commit 50ca8f8232.

devices/srv2/node0/default.nix

@@ -10,14 +10,22 @@ inputs:
         network =
         {
           static.eno2 = { ip = "192.168.178.1"; mask = 24; gateway = "192.168.178.2"; dns = "192.168.178.2"; };
+          wireless = [ "457的5G" ];
+          masquerade = [ "eno2" ];
           trust = [ "eno2" ];
         };
         nix.remote.slave = {};
       };
       services =
       {
+        xray.client = { dnsmasq = { extraInterfaces = [ "eno2" ]; hosts."hpc.xmu.edu.cn" = "121.192.191.11"; }; };
+        beesd."/" = { hashTableSizeMB = 16 * 128; loadAverage = 8; };
+        xrdp = { enable = true; hostname = [ "srv2.chn.moe" ]; };
+        samba = { hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; };
+        groupshare = {};
+        hpcstat = {};
         ollama = {};
-        beesd."/" = { hashTableSizeMB = 16; loadAverage = 8; };
+        sshd = { groupBanner = true; motd = true; };
       };
     };
   };

devices/srv2/node0/secrets.yaml

@@ -1,5 +1,18 @@
+xray-client:
+    uuid: ENC[AES256_GCM,data:j2R0UtfS/es2A+Ic+Kq6FZJSqXlA/Q8tGkuAIX0ZdTsV4hGk,iv:Ovpr49isIJRdUyM3jxgiT+9Sc+qTF6ZnkKUwxIq6KUs=,tag:2VRSkiPNWaOmCqLJti8Bzw==,type:str]
 wireguard: ENC[AES256_GCM,data:TEi3LAZA0BaPxeXA1yFMD6fQPRKSndVyAzNycCD/5CYXmNVyO7zv4o23ahg=,iv:tEKFPyuqmpsWf0vDoSaw4Ai6S5DzacZFA4otNgnknxY=,tag:qZJzr/Yyoex2hDfVtT6nYA==,type:str]
+mariadb:
+    slurm: ENC[AES256_GCM,data:9wLQ1zF/kDaiw0s3UaRpiHgmngU7u6hwyqpddSjev0+Z0v58Q2oiJtK8vn+2VlSxx5ACfqEFbzp0PZYAxd575w==,iv:q9JTkgDymOwkbZ/PaxRAAQrtO96QmGgZcQuLTFCMoS4=,tag:dwOHlOTgZqT/1jQ+oGf7UQ==,type:str]
+hpcstat:
+    key: ENC[AES256_GCM,data:+Z7MRDkLLdUqDwMrkafFKkBjeCkw+zgRoAoiVEwrr+LY0uMeW8nNYoaYrfz6Ig8CMCDgX3n/DMb0ibUeN32j3HShQIStbtUxRPGpQMyH+ealbvgskGriTFpST4VPyQxNACkUpq/e+sh2CmLbKkSxhamkjKOXwsfqrBlgVbEkp7u7HkWGuAaYL1oPGt0Q94fWXwH0UVhRYZYQ2iFA/S6SEZY8gxaTIGDKUdWU9+fOHzPQ5WfhxtKYU4p4ydyfYsAt6ffqnPSx/SI72GsUCOJ4981JX8TuvnEzx3gQLVFYheK6NibTWCy6eODbvguieVOTHSvCPTrHmoP12lHVWU2kKzLwv70Jl7sXyzKHYROG0D+/z/4DKlNeotKM/IA0q2cST08/lwSKN7WDDmrt+O6xXhvwby28ZYKEsSvvrfV+VIKzHPl84ZKbUEX5xv/GHc3THfznUvKKz5PzDiqrkjCkEt5PRMsVW9A6MU1+QEUr+sXLLtcUd2CCL87c8CpwNHJx1us6vJ4ji1gu0PGoT+60,iv:yU6j9W2Hs2D34uHMJqqPFbNy2pNEZY2kzXoNdhPMSmA=,tag:TNvEfMVrhu7HrNxY8qe5mg==,type:str]
+wireless:
+    #ENC[AES256_GCM,data:xrg3Wxj/ghbWgg==,iv:6stu7voI5no2Y3YmnMrvTS8hev3eqjoWAyD5zTgyehc=,tag:cxkS7y7S1oM+/SJmlT10fw==,type:comment]
+    457的5G: ENC[AES256_GCM,data:QjHlyGU4JIYymyh41T+c33T3EOpbqDOoD3U+v6/BzjlWLLeZQXU2hwPCVh4fi2bwn7yNkp4ygAYmFPVPZWoT1A==,iv:Tc6Guzsn5hkjWH6UWSb1KlfWCBXIi2OWdn/wttmCXnQ=,tag:FhyH6JmjSTuqSeFy+GyQhg==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
           enc: |
@@ -19,7 +32,8 @@ sops:
             M0xoL1dQR0kvMWpzN0RMNWVCTFQxNFUKj9LPjBo5NGOrGYNvu8qZ13PLYjLEWllU
             LARzEn4XgkeHckouwvxZYMCx7WxmAruRWaOvnxTIczzSNP7wIrqnkA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-07-04T00:46:22Z"
-    mac: ENC[AES256_GCM,data:6CsoEx0aBfMFWAnlSTYpeA0OrMRdl2KkJsi9Kh4dcH6GCjBkDOFNTuSCmTt7zCfvX6cDecgxbaVCRMOSkcgEynhc6hFenJQFFGDbxyLFYSTogBf/6XOGRSWmIv1TrBu2VTNjbHvEgRDoAbSkFkNpKQn7wDMLG8NM5kKFl4qW2dI=,iv:Dmjb2QfgaF+d+hs9NSO7TqjZx0SEDi27YAjsdkdHo4Y=,tag:ElGpfoI1XZwdLrqLDbg0xA==,type:str]
+    lastmodified: "2025-04-10T10:44:43Z"
+    mac: ENC[AES256_GCM,data:6EeWT8IiCGyRdR/9WDoTTM8bBuhzf2LtP1kahCgfvFpU6g5HB+qG5O0eXaL0DMKg7OQJKHIS/wZVaEierVwno0CnP1WR7y9l6Rlab2nVG4YCNkEkwqZgIWFOUi0aZrZQc7WC3rUk1gxiJK38nEa4ebk8oqAbyHyKHsFAeUcMbqA=,iv:oqRLvYsXct+OwcymXslEH4o03vLNeV2eU/4zK8R+gKs=,tag:0d1DYjCGRewUd4aHPIpFSw==,type:str]
+    pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.9.2

devices/srv2/node1/default.nix

@@ -16,20 +16,7 @@ inputs:
           masquerade = [ "enp58s0" ];
         };
       };
-      services =
-      {
-        xray.client.dnsmasq.extraInterfaces = [ "enp58s0" ];
-        beesd =
-        {
-          "/" = { hashTableSizeMB = 10 * 128; loadAverage = 8; };
-          "/nix".hashTableSizeMB = 64;
-        };
-        xrdp = { enable = true; hostname = [ "srv2.chn.moe" ]; };
-        samba = { hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; };
-        groupshare = {};
-        hpcstat = {};
-        sshd = { groupBanner = true; motd = true; };
-      };
+      services.beesd."/".hashTableSizeMB = 64;
     };
     services.hardware.bolt.enable = true;
   };

devices/srv2/node1/secrets.yaml

@@ -1,14 +1,9 @@
 wireguard: ENC[AES256_GCM,data:zfyNpCZ2EhQdsz+/vknjtbT1vMLebil1tarIcxLoUQ3J5XOKTCQBay4jBL8=,iv:tF6I5HHhDMfoGAfrtkmvrlqsSpX9YZL8dtzxAgBCp5c=,tag:DeOFwrIGbwVtf42iO1dm6g==,type:str]
-wireless:
-    #ENC[AES256_GCM,data:UP/uE2gBFXwseg==,iv:9DjQnlWVrMfs/MnmKmoTXME0NFyzBNihhOHn/lUla8w=,tag:Gvs+CVVXmDos9FVLsRDpAw==,type:comment]
-    457的5G: ENC[AES256_GCM,data:upSaONZY1l/K3CeIAoyKZwXWZmFb39nzyFSMQoXu7Ee8xec25t38I3d67vhkr8xLbwF+OjDjHkcMLovnJHi80Q==,iv:4iDnwEifJa06XjMWuBSggCMKva9MkD6J6EpjzZ1+nDk=,tag:PnjNKsBAQ7AYZ3FTcBuk2A==,type:str]
-mariadb:
-    slurm: ENC[AES256_GCM,data:yylauf27wJte0YndHluwAKQm+MeH2ksJLlu/CUuPUBSxspW1Q3GTIJTey6pLcDjl13JpFHv2VbEJC+5GEg3wHg==,iv:OgfJN8eGv3+cY04qQdRLbk8DixDM1lfwmkPUx1Q/QfI=,tag:BoiKmS5jATIdpmHFAPXkZw==,type:str]
-hpcstat:
-    key: ENC[AES256_GCM,data:HjYC8W390OB+bLws2DsAtLNs5QEhQvTVFwujsuJVRovMeboUhp8cNpRWwi0ecbztcCDDQdLWwYqyi59ndVv80zvANkm6/S8KmzWCHERGJfsvIeSJe6zeChXbcGPCssIG2H7MkhXSg+EtofMzagyCfWeWUwFmvxjeu5UhQCJqThtty4RoijsZaP8x08XBWYIodbGvCJnMiv4HIoj4EzoY0QnO8i7nuh6q6xA8hKemGCkS/Uv0ylgHMDRGZCHrUrJpxyiGhT4rfWbpq7b3sFvzWgIRDUv3jgKINbYkkvF/GVoRpDCGAR4Q9+YFSOOIU5uAA1VYT9WkVKGvotNkNBPrLlbir2c2kk6idHIufpJMcFX/4h2IdjoT3Yl5554AqFeN8wwNHEzyeGHHpy2PWIzg4Hyo8fl5iqhmfUNr1O1HMPTswdXLY0qYg0ErooTZut4Hs8P1gMjIWnoBRUPHgRybgohbAy7oe27qagB8Pz1YXIOI/F+MSE8bwkcDXQQBEnDAFfVONlp8olCGUHoM7pZs,iv:b3V1/zA+QxMJTGpRm0xbpyGlGgI3d68/g1MbtghLQMs=,tag:dH81+WzkjrIx8R4rbAJ8Iw==,type:str]
-xray-client:
-    uuid: ENC[AES256_GCM,data:LioPHThouGWG8BMviMnnDWPJuT3YknpWq6yLU6TSZJBc/gEC,iv:ge3+Emj1mgk+LCelP9+hQIOYQ0CyDTSy2I0pFeL04g0=,tag:QoxoePQ5uyIckx7zEXMTDQ==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
         - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
           enc: |
@@ -28,7 +23,8 @@ sops:
             c0I4VUdiZytoQWRsUUhBVStDR2VPT3MKDkDQ3sKJjotYUfoBWF85t3LYtz1OVFws
             2IdtJBHISb5j3xnAs/UUHDPzjUUsgb+sTHm9krQy3LDuELNY6KGMPw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-07-04T00:46:24Z"
-    mac: ENC[AES256_GCM,data:NpU6uivyp699EHZvnJfa7GYSOwfFl2XmPw2x5NpAvjhnFFK/GXUI/uuuaObehPW63sJ/DZafRAUIvbSHspWwGLhUZU9A8syU2b977QFgiU/TBenc9JTO6V/lFRy11xfxubosvMrSxo357kAehamzgf4dkCc/+Tu2yVCMlU/HrbI=,iv:jadOCEl7iZY4+3ag7geFqPMfQX14MxUyAx4Q5iX7QVg=,tag:dVuf5nsYO2ZXbdWUljuJqw==,type:str]
+    lastmodified: "2025-04-16T05:05:21Z"
+    mac: ENC[AES256_GCM,data:aPNsWBi4sm4UhX1qpk412eYNCZltKkRMWWgopZw6mjMLSOSb6E1yi8NjRJMj04RpE2XoVCkKP6R5Qo0I95wxY5qZHJuUp/5srqjAf/fHWz1QmXThogaMzM2jue7+NHUSQXrPnh0ZspXD47HyxMUOhlnewZ3EfOw7B5qKAYR1f6I=,iv:mnwtf0B7x5AbMzivg27zqIkhBdkDb5qq8eDBCGMdK0c=,tag:PCtirta++gCSsQsQo+bSmA==,type:str]
+    pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.9.2