services.ollama: init

This reverts commit 0026ff0382.

.clangd

@@ -1,3 +0,0 @@
-CompileFlags:
-  Add: [ -Wall, -Wextra, -std=c++23 ]
-  Compiler: gcc

.sops.yaml

@@ -1,6 +1,7 @@
 keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
   - &chn age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
   - &pc age1ffvr5pqd2lfj24e3fh53s92z6h76fda3du4y4k6r3yjumdwvpfgqzj033a
+  - &vps4 age1nnd6u8l20julg4jz4l6kw5gmj6h2tsngpm7n8dx59umgw2s66y4shq6jv4
   - &vps6 age164tyqklwhdm57tfm5u863mdt2xrzrrzac4py8a0j9y6kzqcjy9zsp073t6
   - &vps7 age137x7csalutwvfygvvzpemlsywvdxj3j4z93a50z2sjx03w6zau8q3r5902
   - &surface age1ck5vzs0xqx0jplmuksrkh45xwmkm2t05m2wyq5k2w2mnkmn79fxs6tvl3l
@@ -8,12 +9,18 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
   - &xmupc1 age1hnarptkze0ujpp05dqr8uma04cxg9zqcx68qgpks5uf5l6rpk5gqhh8wxg
   - &xmupc2 age1l4stuz0vr7gs7pqwjrmezam44702jp2vmqaqyxw0l0r42kf9updq4dfhrw
   - &pi3b age1yjgswvexp0x0de0sw4u6hamruzeluxccmx2enxazl6pwhhsr2s9qlxdemq
+  - &pcvm age1jmu4jym0e0xkq5shx2g7ef4xzre94vaxy2n4fcn0kp94dtlupdxqkzyyp7
 creation_rules:
   - path_regex: devices/pc/.*$
     key_groups:
     - age:
       - *chn
       - *pc
+  - path_regex: devices/vps4/.*$
+    key_groups:
+    - age:
+      - *chn
+      - *vps4
   - path_regex: devices/vps6/.*$
     key_groups:
     - age:
@@ -49,3 +56,8 @@ creation_rules:
     - age:
       - *chn
       - *pi3b
+  - path_regex: devices/pcvm/.*$
+    key_groups:
+    - age:
+      - *chn
+      - *pcvm

.webui_secret_key

@@ -0,0 +1 @@
+1c2lE/E3swpYeU8F

devices/pc/default.nix

@@ -14,18 +14,19 @@ inputs:
             btrfs =
             {
               "/dev/disk/by-uuid/066be4fd-8617-4fe1-9654-c133c2996d33"."/" = "/boot";
-              "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+              "/dev/mapper/root1" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
             };
           };
           decrypt.auto =
           {
-            "/dev/disk/by-uuid/4c73288c-bcd8-4a7e-b683-693f9eed2d81" = { mapper = "root"; ssd = true; };
+            "/dev/disk/by-uuid/4c73288c-bcd8-4a7e-b683-693f9eed2d81" = { mapper = "root1"; ssd = true; };
+            "/dev/disk/by-uuid/a9bf47e2-8731-4236-a3eb-0666d49f6150" = { mapper = "root2"; ssd = true; };
             "/dev/disk/by-uuid/4be45329-a054-4c20-8965-8c5b7ee6b35d" =
-              { mapper = "swap"; ssd = true; before = [ "root" ]; };
+              { mapper = "swap"; ssd = true; before = [ "root1" "root2" ]; };
           };
           swap = [ "/dev/mapper/swap" ];
           resume = "/dev/mapper/swap";
-          rollingRootfs = {};
+          rollingRootfs.waitDevices = [ "/dev/mapper/root2" ];
         };
         grub =
         {
@@ -55,7 +56,13 @@ inputs:
         };
         nixpkgs =
           { march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
-        kernel = { variant = "cachyos"; patches = [ "cjktty" "hibernate-progress" ]; };
+        kernel =
+        {
+          variant = "xanmod-latest";
+          patches = [ "cjktty" "hibernate-progress" ];
+          modules.modprobeConfig =
+            [ "options iwlwifi power_save=0" "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ];
+        };
         networking.hostname = "pc";
         sysctl.laptop-mode = 5;
         gui.enable = true;
@@ -75,7 +82,7 @@ inputs:
       {
         waydroid.enable = true;
         docker.enable = true;
-        kvmHost = { enable = true; gui = true; autoSuspend = [ "win10" "hardconnect" ]; };
+        kvmHost = { enable = true; gui = true; };
         nspawn = [ "arch" "ubuntu-22.04" "fedora" ];
       };
       services =
@@ -139,11 +146,17 @@ inputs:
           memoryMB = 90112;
           gpus."4060" = 1;
         };
-        xrdp = { enable = true; hostname = [ "pc.chn.moe" ]; };
+        ollama = {};
       };
-      bugs = [ "xmunet" "backlight" "amdpstate" "hibernate-mt7921e" "suspend-hibernate-no-platform" ];
+      bugs = [ "xmunet" "backlight" "amdpstate" ];
     };
-    boot.kernelParams = [ "acpi_osi=!" ''acpi_osi="Windows 2015"'' ];
+    boot.kernelParams =
+    [
+      "acpi_osi=!" ''acpi_osi="Windows 2015"''
+      "amdgpu.sg_display=0" # 混合模式下避免外接屏幕闪烁，和内置外接屏幕延迟
+    ];
+    # 禁止鼠标等在睡眠时唤醒
+    services.udev.extraRules = ''ACTION=="add", ATTR{power/wakeup}="disabled"'';
     networking.extraHosts = "74.211.99.69 mirism.one beta.mirism.one ng01.mirism.one";
     services.colord.enable = true;
     environment.persistence."/nix/archive" =
@@ -151,7 +164,7 @@ inputs:
       hideMounts = true;
       users.chn.directories = builtins.map
         (dir: { directory = "repo/${dir}"; user = "chn"; group = "chn"; mode = "0755"; })
-        [ "lammps-SiC" "BPD-paper" "kurumi-asmr" "linwei-stuff" "BPD-paper-old" ];
+        [ "lammps-SiC" "BPD-paper" "kurumi-asmr" "linwei-stuff" "BPD-paper-old" "SiC-20240705" ];
     };
     specialisation =
     {
@@ -164,6 +177,11 @@ inputs:
         };
         system.nixos.tags = [ "nvidia" ];
       };
+      cachyos.configuration =
+      {
+        nixos.system.kernel.variant = inputs.lib.mkForce "cachyos";
+        system.nixos.tags = [ "cachyos" ];
+      };
     };
   };
 }

devices/pcvm/default.nix

@@ -0,0 +1,33 @@
+inputs:
+{
+  config =
+  {
+    nixos =
+    {
+      system =
+      {
+        fileSystems =
+        {
+          mount =
+          {
+            vfat."/dev/disk/by-uuid/AE90-1DD1" = "/boot/efi";
+            btrfs =
+            {
+              "/dev/disk/by-uuid/5a043ec5-7b47-4b0d-ad89-8c3ce5650fcd"."/" = "/boot";
+              "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+            };
+          };
+          decrypt.auto."/dev/disk/by-uuid/a9e4a508-3f0b-492e-b932-e2019be28615" = { mapper = "root"; ssd = true; };
+          rollingRootfs = {};
+        };
+        grub.installDevice = "efi";
+        kernel.variant = "xanmod-latest";
+        networking.hostname = "pcvm";
+        initrd.sshd.enable = true;
+      };
+      hardware.cpus = [ "amd" ];
+      packages.packageSet = "server";
+      services.sshd = {};
+    };
+  };
+}

devices/pcvm/secrets.yaml

@@ -0,0 +1,39 @@
+hello: ENC[AES256_GCM,data:7xCy5PqPVdUNIdzqaGQLsPA88mAfRt6T57LjFDwOaTlhdejLPrBdyN4=,iv:dM0QWDpylPjnbtdNrjV8LHISNi/U718+xooFm0qTcbI=,tag:d5HbLG7yF3QRz7nP+4aeiA==,type:str]
+example_key: ENC[AES256_GCM,data:K5SD4k9jL5r4ZSUwNQ==,iv:mJrZshT0PKmT7OJE/ZBUWzq1Gc6xXymFbypxwQtQJq8=,tag:I4+AyMh+AVpmWa1fdIJpyA==,type:str]
+#ENC[AES256_GCM,data:vHj6+kNand8d1AzgXTaOMQ==,iv:j6b3SDqzVgY8U/puEm9UcpJYGK84gF/YIXzRbG0radQ=,tag:yzfXKHReJ0++3fhk2ztbBA==,type:comment]
+example_array:
+    - ENC[AES256_GCM,data:vRjjfVSy8g5mBZVM/oU=,iv:C+HE4Q157eNhEmcDJSMJINfMgztf6XfELCjotg8q3XU=,tag:JSQDItdYbCCs65tmbeR6tg==,type:str]
+    - ENC[AES256_GCM,data:xzfN6WiT8r8YcWtS+H4=,iv:btlOvqrn0pITT3rCTIjgS2b5TrfNKym0yPEnE7bJDqg=,tag:Wf40b8zBhrv452OKodkU+w==,type:str]
+example_number: ENC[AES256_GCM,data:akqZ12u1wl4Zww==,iv:hS3NBWI7o6dZLtsIsoVHYdtyqpUmbQrpMHPhRRzEd18=,tag:1voFm4LuupWJMGP3xd0k4A==,type:float]
+example_booleans:
+    - ENC[AES256_GCM,data:wWEU8w==,iv:rf8uwo+sP9YFyPmoxROVVmrx+q6Yr0PIOWznM96w9XY=,tag:nVJdD1Z7U8zVRBxs8gLvQQ==,type:bool]
+    - ENC[AES256_GCM,data:gVe51tg=,iv:eOJ2TOWStHpckNyYx2UdLcipshFpjcWtEids5c+Q8bs=,tag:0iSjlC/TgNfl7ZtXmttgaQ==,type:bool]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyTGliaUlvOVlxejZhSDZi
+            YU96S0VPOE5Ldk56WlJjTzBSRm9oYnBoQ0NBCnhJWmg3KzUrT1VyemRiSWtQeklS
+            UFFFTjdod0g1d1EvYWJoOElJSjIrWTgKLS0tIDlaQnJOMTZRUms4am1mQjV5MzFJ
+            QlhKL1ltY2lGZGU0clhIRTRsSW5BOTgK4gKbhvF1bV/YdKOxzqrecHPDAKPOd81V
+            YnWgLpP6h+zycx80iqwsfqiQJdPyDrfhB43ksn2oxsX0qXtLI9j9TQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1jmu4jym0e0xkq5shx2g7ef4xzre94vaxy2n4fcn0kp94dtlupdxqkzyyp7
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzRU1IRXZkbFQ4elgydTlv
+            VlRVKzJIWDVCZk5xaTd0Y2JXS2l0Mi85Zm1jCnNkS0NETm5SaG9WUE9Mb3RtbE5B
+            YTRmWHNXTk9hZHNBT0FxT1RNNnFMNEkKLS0tIGRWNWpLcDVtOEdGZHFPT3paeVo2
+            QWsreTlaVW5Bd2lZb3JZeTdjcG9WQlEKy3p4QnjPrJtfaueLKBzMz7VZ9QfrTer1
+            lEP8mInFprR65LtpoKabsTWQwkzURzB/OdbKSYG2o6Rlqy9L3d5eBw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-07-02T23:46:35Z"
+    mac: ENC[AES256_GCM,data:OncqYSgPSoge5Nw6eh0A4cm0KXSQhmSpGIu5WSv38LdMto5fNLIK2VRIwaXfq9nyf10bxNN7xSADj2GPhMiwlHM8nIQXtxdlWsZfEOc/qOWM8nz+9DPKtKGD6RZcDLDRhNTDxzPXGWIuY1tDKQpUlt/iDlymSskcqSrdTfBqCGk=,iv:NesxRr6FXXApE8aafnAV3x6hwCoAxoEly/QkcyAQ8Pw=,tag:3o37dr4vKLqEENIdj8RHXw==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1

devices/surface/default.nix

@@ -60,7 +60,7 @@ inputs:
     services.iptsd.config =
     {
       Touch = { DisableOnPalm = true; DisableOnStylus = true; Overshoot = 0.5; };
-      Contacts = { Neutral = "Average"; NeutralValue = 100; };
+      Contacts = { Neutral = "Average"; NeutralValue = 10; };
     };
   };
 }

devices/vps4/default.nix

@@ -12,19 +12,25 @@ inputs:
           {
             btrfs =
             {
-              "/dev/disk/by-uuid/24577c0e-d56b-45ba-8b36-95a848228600"."/boot" = "/boot";
+              "/dev/disk/by-uuid/403fe853-8648-4c16-b2b5-3dfa88aee351"."/boot" = "/boot";
               "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
             };
           };
+          decrypt.manual =
+          {
+            enable = true;
+            devices."/dev/disk/by-uuid/bf7646f9-496c-484e-ada0-30335da57068" = { mapper = "root"; ssd = true; };
+            delayedMount = [ "/" ];
+          };
           swap = [ "/nix/swap/swap" ];
           rollingRootfs = {};
         };
-        grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
+        grub.installDevice = "/dev/disk/by-path/pci-0000:00:04.0";
         nixpkgs.march = "znver2";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
         networking = { hostname = "vps4"; networkd = {}; };
-        kernel.variant = "cachyos-server";
+        kernel.variant = "xanmod-latest";
       };
       services =
       {

devices/vps4/secrets.yaml

@@ -1,58 +1,13 @@
-acme:
-    cloudflare.ini: ENC[AES256_GCM,data:X1v1QuOZemIuxldd1bzIvbUsq+8HMGLh91zUB+fnrxaW40z0OQh9L1rF/0Nj3gmUmgT4KEV7nkHFYYpZBp4/Kyc=,iv:fQmbhx9wV3l+DVPaBrAyJbTCsS3q3s5F9Go1F7pZ2pQ=,tag:P4vuruX460YSOUsx6zGHXQ==,type:str]
-frp:
-    token: ENC[AES256_GCM,data:T8b1ku4HNCNSJ+33QgIt1GILFA4wTu3Qd0rDqHPVgdqsGo0R90k0u8z+dElSO7q9PapTqUbZ,iv:hwnMu6JxfYLgw4TyhujX5dI2IAytgZh+Bexhgta6ATQ=,tag:lqgwvXlS/jGPxasmk5Vh3w==,type:str]
-xray-server:
-    clients:
-        #ENC[AES256_GCM,data:DXEC,iv:SZ1AhmK6fWQ/HGDk97kDUcRN84zQMp99eiz4SpRhig8=,tag:Fkdf28ZvB8XKCxSYdjuuHw==,type:comment]
-        user0: ENC[AES256_GCM,data:rJ00sfe/oJSry6Ixn4Bn+p41syqsOrdWv6fRGVCwPvn/unMY,iv:htTvFMvhIRkORA/gIU8J7CgA+tOncYQWh7sUh+F6XDs=,tag:VrSJBD7ti9WtSLHoWjMClw==,type:str]
-        #ENC[AES256_GCM,data:OVgDU+zqcQ==,iv:8KuEqBuL5Ca6pUOFFA+vySJx/h3BhGAAC0CgnxiW46o=,tag:TY1MajSSy2RjKVI2SSAAFw==,type:comment]
-        user1: ENC[AES256_GCM,data:S3IHO9FcVHTJOsRxjSohM9MgnrEwLdDpFU+efLkQaXT2jNJG,iv:KOesvPzjDfm1EDLFiegbk0wgjp7di5mUwUuuY2hwvOQ=,tag:ZsYyUyyEhO5S3weCw/gPMw==,type:str]
-        #ENC[AES256_GCM,data:OQOPobpbbhajgA==,iv:4jG3bHKzWcR+JnvSlJsc0Qlv5kywqVN5UE96J31CP7Q=,tag:P+jJkRxPu99tLXyO5k6dRA==,type:comment]
-        user2: ENC[AES256_GCM,data:e7ITe2ZouKr8dXT7SYATyzbzHaVeu6AKt1OcQKk3U0nsQgoa,iv:UbOOuojy6OAFEH8lGhKe5Hs+2K6FX5MZ8Br9AB007gs=,tag:5XeB4YngzTcHZvCpXe/ZXA==,type:str]
-        #ENC[AES256_GCM,data:93BxR0AEdQ==,iv:rf69GWpuxYt7fu1Fyv55pynuQDhi+TA5CwZK3cc3yBo=,tag:/hLy6atNMxLw6G3/qgMM4g==,type:comment]
-        user3: ENC[AES256_GCM,data:r+6jXaIj4HJoYLnJcnjJB+WEZlGaoSy/ktc1Aw77hFtNrrGp,iv:P+YUKns1yaOZokH5WkDB0jssGyHg3ncc54tF1PyA7Oc=,tag:/pxMEr7l4ye5EDAOsllxJA==,type:str]
-        #ENC[AES256_GCM,data:4gqZh391hg==,iv:No22DrD6EBs2FA4/qH8msWEjs20fc+ZpEeZep+HIv+c=,tag:aHrYNbI83POI4PRj1nd+Yw==,type:comment]
-        user4: ENC[AES256_GCM,data:ujiml/r4aFiKOkSJkaD/KE8rKuBtLSnpZREBH3vRJUzDT0QM,iv:a3VFlXpMLNFihvFa7gloANtHmBLg4szTL5LTm8E2kNs=,tag:W9KZ1GAVx9IBKfda7Zedng==,type:str]
-        #ENC[AES256_GCM,data:PTYBkBHs16U=,iv:qr3u7OveM1CmTBIf9gZK4fTRuLCpcZCwf8jmnd1L3Co=,tag:w3O41NG7yCwCVqPGh/6SXA==,type:comment]
-        user5: ENC[AES256_GCM,data:iDuLRb4dhLUOjpamioMwoTYrn7Cy+Ln4SaedVXkwVD05rjJ0,iv:AqzBBvLpJuIJCUJq0IyDcHrlqb0e84nQC0c94Rj85uw=,tag:0xou1i/iwAxGngO74OIMXg==,type:str]
-        #ENC[AES256_GCM,data:D5xiJW0Oyg==,iv:9a/6myiT9Crf/fff6ZkXj/obW2k95cABUNqQdPmcwcc=,tag:chs8BA8YtVkM9m3Ey9ETlA==,type:comment]
-        user6: ENC[AES256_GCM,data:YzLlf37SxKmU1/QA7gUIJsGid3KZNoAGOew8xR7cmw5l8ZmX,iv:SfKubo2jfjtxKn9odDiokMEZyPFfYZ/wwyYtBrgvgmM=,tag:+hxwIU5uBhzQyrKX4r3oiw==,type:str]
-        #ENC[AES256_GCM,data:8FxApg==,iv:vPa5p3QVHAvw+ECusWGqx1ugTcHh42CVFDQcMhG59wM=,tag:lHiZtydcYFBQiXnWh8pCrw==,type:comment]
-        user7: ENC[AES256_GCM,data:H/jje9ONEY6XuBXTZmTVGIcWUgGSMf5OB1NNRPtqGCgRP1ei,iv:xew+0BkRqz3nfOoBXTPbBv5hRczy/3tgYSKq432q4iw=,tag:da2ljcffiCVJCsMZaNPZyQ==,type:str]
-        #ENC[AES256_GCM,data:QdaYYH3RGJ4qIg==,iv:79NBTEKCPtgVVv3G7wg+vdoLOWxc+bdqT1lF4HJpTC8=,tag:8mRFGjy7lBrdyGyX9vaSOQ==,type:comment]
-        user8: ENC[AES256_GCM,data:H1gPtqF8vryD0rVH7HYzpMuZ3lufOBYczKwaTr4PidQtTyQK,iv:wh7NwFc/1ogNrnTTpm5L9dBqDVkvWiIsJZelR2mtR4Q=,tag:oEFdMFZJ9UYhsSVdefJ4rg==,type:str]
-        #ENC[AES256_GCM,data:aYWIiLxs1UvupQ==,iv:AisokHuAzD5B6fEF6ak8WfAe151CM3a8MsaWC4uJPnw=,tag:cdk5S4n9ulyWrqsD+jcqYg==,type:comment]
-        user9: ENC[AES256_GCM,data:HVK9KvGfOcwn1joc3VrkjBjE6hrxQPOBD5RTtQUgBPepToh6,iv:VK9aQ64L/GajpledBxC8PNB1BdNYEqwcdL3GKttgxvs=,tag:O/piztCYBARtAFxTMNXGaA==,type:str]
-        #ENC[AES256_GCM,data:b839t/OihMOmz0gIcTo43r2MIw==,iv:8kaAFG7DhFOoitcvbFaAvE1NUSLFrFhy1KiMrqs4r/c=,tag:G4vSADa52ZfN5y5ytoFJoQ==,type:comment]
-        user10: ENC[AES256_GCM,data:xjVkr/wy7OxRuNZKfQagfNxdVxTEyQP1ZhnR6jHy2gjBQ0RD,iv:G6iOBCHOqlvfEENY/ega/TUm81wgT2OOdZKZ6bPfg9o=,tag:p8AMa3bGsIl0hWQ09lSzgA==,type:str]
-        #ENC[AES256_GCM,data:+s3MMeNU5Q==,iv:CUrg+nNxCpJFbHQmMNXmSE+JcZK6Dfu8cGwtznx3CFY=,tag:G5CYMtao+hz3hs0fPVPmcw==,type:comment]
-        user11: ENC[AES256_GCM,data:BIZ2zRgGv5/9AexiZZvu+m4A62YUWtAkjWWMu89GteqpWMBq,iv:13IJcDf18LjoxJk7uoKnuFZT6Ihxrxsy7DBaAaiFqus=,tag:RN7wj+uPneCkqNlMRyYrXw==,type:str]
-        #ENC[AES256_GCM,data:spyQkQIHwg==,iv:7+0DUK95MPH7lpr+GMbbLu4/5yA11/4gTuLhQKlStfE=,tag:G/gIXML8UhYoCi9FfoTvSA==,type:comment]
-        user12: ENC[AES256_GCM,data:FAF9lXOzXW9CrZgnQ1a2+E8snZj2+JHqP5Gny92k09o/Wzga,iv:/qZuAtFmUQE7A9lMzJUoCvGx+3Sv9Ioh2ahch3puaC4=,tag:urwbLwGkSX3e85NCjyPhhg==,type:str]
-        #ENC[AES256_GCM,data:HueqiREBet2bxQ==,iv:WCjTAGg2gXgBSvY3zc/YyB/1X0XjvphPduVXLsjOwH8=,tag:wC+On6lyyYQ1Dt/BHDvONw==,type:comment]
-        user13: ENC[AES256_GCM,data:ExbnvWDIBqga5+k2mpoT8AKBOXAvUNMjBTPXUKrmtWzz4l+L,iv:UI7CvSx2FHYGf6BEHS4e3iwHZZWkl2Zt5xg2WdKbLvY=,tag:ad0c7YW2Bxo+Dn+BoSZ0Ng==,type:str]
-        #ENC[AES256_GCM,data:R8lN5T0=,iv:FXLf8Vtjg+PkwNhxXWDViMKqwn7tFMaPhio9zhnudZw=,tag:34gxRH+P9lmkUxlOPKcYMg==,type:comment]
-        user14: ENC[AES256_GCM,data:dgNPPlJD5JOFPbKhlvlRHBLmUNKeDm/JAiawUVpBE7H07Box,iv:w+t9BkqYvlxVKr+x0MwtBz0/YSR/7z1OnZLIoPdW4gc=,tag:CR3GLbaO0jSQgA2HuwzRqg==,type:str]
-    telegram:
-        token: ENC[AES256_GCM,data:xsJoGgQ8pLeZqA2alGKkCyrvnjY6rVF5TlXn4GWDrStFBl65XXzwVY/9ZZthYQ==,iv:qTLfpRUyuIGFM668URfknhSRtx3WEHp/WTGzGUPuFd4=,tag:p8mF0tM+t02g7v2EQZN3Vg==,type:str]
-        chat: ENC[AES256_GCM,data:X1JxFQw0bPCu,iv:hf+TOSH2p9RdnXDFKxTpSRzxDLdJyzNHVV8MfOQuGWY=,tag:iiWw9IFiBGOOyOSl9Jj2wQ==,type:str]
-    private-key: ENC[AES256_GCM,data:ts/LRGFAsYqvGvkvlxUI42IW1a8cGsSkpZhMDd3QVceRKvhPb1SRDaXoSw==,iv:6xX9xFIFUNlLBZ6CPBOz9JbHpvC4+QG9ZaCZcWdl12c=,tag:DYIa+QTV8vyl1l7OKKykTw==,type:str]
-nginx:
-    #ENC[AES256_GCM,data:85LrqdTMIhSa,iv:mIQPYz8VPd5AxeMCQEdTGMD0Iqa5QEAa5+8JVFaj3JM=,tag:TcZd7S3WRPpEV9lHI1fzbw==,type:comment]
-    #ENC[AES256_GCM,data:rVTLpe3uIQ5LArPnEY8N8kjtHq8kZddbqR+nyUaia72Y7PWEfHzy6wgx3Q==,iv:AZEufH3zfVL0XbUh3CQZGYcx6zIMFV4tF+jHf73IplU=,tag:B/UbtQh5dGrctNih2uoO8w==,type:comment]
-    #ENC[AES256_GCM,data:InzwjKl3R4SJSXTz5u1Pt0kf2HYEtKfSkJO0cbPhhXADNp2/Tn0nwQJFy9EzpMvK9mw8+l5LadbY0tIwmTVvV5yxUQo78HcgXWInfp/zJ+GG1L/RQOHck74lEA==,iv:UBMRYPd0loOQBs3mNyndiKPu72aRA8HbOKWDfUWPQg8=,tag:t/ONqdwpWcbo/2vy5TOjlA==,type:comment]
-    #ENC[AES256_GCM,data:HTinhnsAbVujUOuLIVT/CkvdtTN9Nk7wZKZ5SyrPC+vZ/cB9E10FffMYLQ==,iv:Clby9A7MIUSknNFkzKuWEDL0yUW/ctd6KShCIEYrDZA=,tag:CJKORoXrspDjRmaSHUnlqw==,type:comment]
-    #ENC[AES256_GCM,data:cwAb68VgebTwCCeAFUbOG0CUAuggfRnLNv9NWldJN+E9NY4WKxs12Nz7yX/vtelcqqJ2TOUL78uAR88Nzavv7VtCTZRivWjRG6GvAUyRdv8lAZo=,iv:PScTSTCuVnsoZlvyTVL+ZgqqEm4m2/fUqWzPwE+PvuY=,tag:1jeRsHqgMheXbcnhRicsnw==,type:comment]
-    #ENC[AES256_GCM,data:V5XRrTvyeezkcJqw1/BhhZz5K/egpl+PtNwjAGELjWRp7IqDfRsInxBKEg==,iv:LdOTkL22HvaNbiUi6hG8o0ownfZ22OKFGxCuGPqG8xU=,tag:/06I/mLzBlgS489iuwFTuw==,type:comment]
-    #ENC[AES256_GCM,data:i9PXzaO1od7HimP/6vxYfh30SxFbdXRDcnXujH3VrvngFcWaVcXgigncp3cboi6RoERSZ6yakxviVyEBIS4v0qRfombj2UtJg8N3Kg==,iv:aohIMhAYfZhlGDrcEvi+Qc16nF8ZgrPUGhWj/7nl8Fs=,tag:o70qsk/2cAbZgbVBwfl3Ew==,type:comment]
-    maxmind-license: ENC[AES256_GCM,data:sESU6uK9EYLido9/0sXO2Zw1SjuKmxPh4r3giJcaG7068gn1kByjsA==,iv:htnFgnLrH35zSvmlRAdoRDLFIpKroKO5dW9TNK9soUc=,tag:6pJuc54SrKP5n0kJJ7fGyA==,type:str]
-send:
-    redis-password: ENC[AES256_GCM,data:6zVKw9AmKwSWvHUZhzy0F2KcJW96uFoZY/N1Zq8ilUJOLZeX,iv:viwLIgJz9v8oadr8784OgETbEsxzGsJvVoxmOwWEFxo=,tag:XEYFnoCGwlnrkqaUbgeH+Q==,type:str]
-coturn:
-    auth-secret: ENC[AES256_GCM,data:50KqO4GQ1ERbCnK4IjYu6aywT+IPMtVlTzh/TE4MwWApU4pO9yqz25ENGUAKRLi4p+Ecug+Rn3InRl1b+q6bAQ==,iv:SgHkHvHg/+yA1Z5E9effgCnZMVXv5amGNUsVKErai54=,tag:PoYLV9Xr0IXXsA39n7wiTQ==,type:str]
-wireguard:
-    privateKey: ENC[AES256_GCM,data:4DKPPqQkjb33rQzFIz863A2arDRQA9AivWFBaWTf0xXDX4hWvJFiIlJQfvE=,iv:0R2TH3CMxHgwVjojzjE2Gnp8SXonmBDLWF7hB33NiX0=,tag:vgtV8JkuCdspleN/SvgIqQ==,type:str]
+hello: ENC[AES256_GCM,data:mX0hKnLdaujfHSyIikkannf8DDo+r7R0,iv:my9nYiaburkWHQLsNetqD3dYVwsEkJhC7hoh0XagoOk=,tag:D7uhoFGMrTWT3K4LNMFcUA==,type:str]
+example_key: ENC[AES256_GCM,data:ezHOG8aSXYlosn7ymQ==,iv:NLm785UMihcL1K/M4u7k+P2XftyLlIxtQGPmMLc+rs8=,tag:h9xk+do8pYzxYzUaKKb1PQ==,type:str]
+#ENC[AES256_GCM,data:pgOf9IVK9ijocRr0uEO0ZA==,iv:aQ2dvfAVhkFWtcDM4VeJQa+NN6kw9IlvidL/usoP/lE=,tag:49iS4s1EfQK5VhlF9nqWRQ==,type:comment]
+example_array:
+    - ENC[AES256_GCM,data:W8QJiOY6ofqE+XRodK0=,iv:KQ/mYY4N/YA9LhZvJtPJPqRVQq4ob/xa8JSQY06Vm4M=,tag:7NQgidSCjER//ru3AXgLzQ==,type:str]
+    - ENC[AES256_GCM,data:nNML0iYEFdW4S5rJVHM=,iv:LQ1/E/7FExXB16Ur4b59XAUlWSFPub6LQBaFCY+a2lE=,tag:LqPymQ7k5ZsS8d9Z09xJuA==,type:str]
+example_number: ENC[AES256_GCM,data:UiALks+CeKFusw==,iv:8gQ0aB+9YHXKVDX7moqdQmNJLGDNGfo+glezE39xXgQ=,tag:sJG+DJNzCtx+l4bBgQTtCQ==,type:float]
+example_booleans:
+    - ENC[AES256_GCM,data:n3cV5g==,iv:z2p5oh8BhEMvwwIDaO8aM8VfxmsR6Z7473pd348tsmU=,tag:oSYsNuk6vY21Nepy8Hkb7g==,type:bool]
+    - ENC[AES256_GCM,data:ns3chHI=,iv:db8M/qF03VKaT/8Q4NqfCdI1zAU9H8JWZFqnzwI7QvI=,tag:FdgUanhezouVdv+9a9/gxQ==,type:bool]
 sops:
     kms: []
     gcp_kms: []
@@ -62,23 +17,23 @@ sops:
         - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1QXc4NzREZHlhMDV2WXlM
-            a2I4d1pjWm9Xd2gzUDUwZ1ZSTkFGR1ZQNDJzCmJwcWFxRWNNVGxTNno2b1NxNktO
-            aHhINXBjdmE3alFGYk9kUHZ1UzdJUk0KLS0tIFdKMDlvb1Z2Qi8xRjl0MXpKMDMz
-            cVVNdDRDNmtHZlJEcVRXR1FLVkZrMWcKn2iTHH7/52fJNXcbDFbzOxNAaiQRA0nO
-            we74EeNzcaaQwuEmBQPKxd/g7/kjhnHzTkoX3OneXMd/gBZMn2knXw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIaE9nWEZFaE51alYyTUgr
+            RVBKZ1MvNitBdGpMWURIUkhCTlF6Y1hueVFjCnp2Q0JVL0t2UEZrSmxMbFVwZ0k5
+            QVZDdXNjWmg0S3BIaXF0NDBHOThiMDAKLS0tIDBpenAyTE51MWVkaHFvTFhzNmVV
+            WnlKUFZWNWtaYUpPZkplSm04Q3RFb00Kghj7jLLcLpc8njNyxPj6JWZbBRn2Ou9j
+            FJLfCGLePuJPmdBBN4AGHmtrkfw/SMZJ50DXhKSJSxM91zuJSqFV1g==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age164tyqklwhdm57tfm5u863mdt2xrzrrzac4py8a0j9y6kzqcjy9zsp073t6
+        - recipient: age1nnd6u8l20julg4jz4l6kw5gmj6h2tsngpm7n8dx59umgw2s66y4shq6jv4
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBycEw1bXA4QUZkUzJ0Z3pM
-            Z0xHam5SLzRGV21XYUtxTFh1VnhQUk1NbzAwCkU1Z3VTR1FtZ05GOWNDOENlZTgz
-            SitzYXo2Q2VEaGtLTGE2UGRoUDkxN28KLS0tIHhRS2Y1cnQreC9Fc2FLdGR1ZXdJ
-            ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
-            ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzYkJ1NllUR1pMaUdmZ3Z6
+            OEVLWC9nZHNxNWJSZ3VZUVZ3eWlLNWN5V24wClZ3dTh3SVNRS0Z4TFJrNDJBVnJj
+            aDhYNTdSV2JmUVNXR1ZkN1BOdzZzRHcKLS0tIFNhUGIxRVM5MFdvUWZWOG5kYlFM
+            RjZtLzY5b00vMExFSU1xZEl0NFJQQlEK4yUe3V0u6A3niES0Nq28rRYZ1fTEL0Fh
+            RBGZNCute1SShrLZPgNr/lFAc6d8DH6N0IuDKcjguuWtyHY/LFYuYw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-28T10:31:05Z"
-    mac: ENC[AES256_GCM,data:6Z+ltjbvQaYhDPoiCN7ajQeWcp6vj3TIcUXUm/r/tZU4mIOvfxA7hxW971b76bYPTeVwgp7ZB9qQy9emDHV9i+aSyJpTPKQHRRz5J+T+NJhTP/IL3R3VmG89ssC6NH8FSk0S487JkPd8tNz+G6bvwFCPRxRLNj1pXX0Dp6tgwIw=,iv:xLw2iX1ODAbJCTJ8fEvG7SdZ1GnGwADIckH8DibVM2Y=,tag:TTzlHdcyIQr/92ZHmViRXQ==,type:str]
+    lastmodified: "2024-06-27T09:40:19Z"
+    mac: ENC[AES256_GCM,data:ZdocsIbkzcWsTia7s98T5hjM5HDyBc1a0pwAb3IEFAom9Q0LjOs02BjsBKQT9Z+eMU+Ugkaz+kgP4hwYbcUuAbiVChU6sLMxUPwQDE8E7sJINZvJzth4Kl5SF4qz9fEuY8ZTP1hHc/HC6fSfWm+zH8n755aBjrzdIUvPV0Qv3xI=,iv:SSjyvgMSgZsoKHspRrNJpkmRTDdFqQlJGLUybyMcXbg=,tag:EBLpGZLNwDZxsWwh7Eva7w==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/vps6/default.nix

@@ -30,13 +30,13 @@ inputs:
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
         networking = { hostname = "vps6"; networkd = {}; };
-        kernel.variant = "cachyos-server";
+        # do not use cachyos kernel, beesd + cachyos kernel + heavy io = system freeze, not sure why
       };
       services =
       {
         snapper.enable = true;
         sshd = {};
-        xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 18; };
+        xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 20; };
         frpServer = { enable = true; serverName = "frp.chn.moe"; };
         nginx =
         {
@@ -81,5 +81,10 @@ inputs:
         beesd.instances.root = { device = "/"; hashTableSizeMB = 64; };
       };
     };
+    specialisation.generic.configuration =
+    {
+      nixos.system.nixpkgs.march = inputs.lib.mkForce null;
+      system.nixos.tags = [ "generic" ];
+    };
   };
 }

devices/vps6/secrets.yaml

@@ -40,6 +40,10 @@ xray-server:
         user16: ENC[AES256_GCM,data:fo6KJXlPDn7+FmxjEJQo9d79rDYemLFx6LanYZcJpKJR7Gxq,iv:yEUKPNZ9idrSqyVO9fhksP/7bjPMT/LzNK2VSq503/c=,tag:M87D44SIo9JzDB3ZyKu7fA==,type:str]
         #ENC[AES256_GCM,data:/Kec+CdtnT11EA==,iv:DnmbWfgriaE6XAnMqq2UXhHhN+Rd/3YRodKVUCJo6p4=,tag:NimqZpbslKxwzoljaZqEdw==,type:comment]
         user17: ENC[AES256_GCM,data:gQInIcNFxJuCSsMDGq4yTp5JdMMmJRy1tY3PGLoLuuIXWV0a,iv:ya4n9Z7T9/bxeHqi5QqwJprEzDMsT6X0BuEXRS67wWk=,tag:RcjQfAHv8uc3PgN5c4bySA==,type:str]
+        #ENC[AES256_GCM,data:h7E4P6BiGjktYg==,iv:DhkK3NNppBqo3sXt9U7kbgfaBPYcSEX2hu6VOAesDiE=,tag:XoVbZklwCmU1EBhv0ujcSw==,type:comment]
+        user18: ENC[AES256_GCM,data:dssxPEv8srXydunolaaDAYYo+BOXhp2PoqidOWH3z6NYBpyB,iv:WCLcMMwQJiHZBwreQpaOZp2saXvjBwgYUqSf7HQhMgA=,tag:5jsAVcgAgO+7JhBINz6tzQ==,type:str]
+        #ENC[AES256_GCM,data:qGsMmWrUIzVdHw==,iv:DXayEA5zquwOzm+TqECYNHM98r0WSzcP3gA8zkzdPy4=,tag:OKTx12RqP9VxJQOnrBLkmw==,type:comment]
+        user19: ENC[AES256_GCM,data:+Mh15DR9xvFAwks86iuHEA9FpObKWTSuVOEzUDpBUS/h0hOz,iv:zYIkic2bibvwCBpomnJ9465mda1rbm3RERBZY9twXuc=,tag:bwdL6DAGgkGYhYFI2C4A+A==,type:str]
     private-key: ENC[AES256_GCM,data:ts/LRGFAsYqvGvkvlxUI42IW1a8cGsSkpZhMDd3QVceRKvhPb1SRDaXoSw==,iv:6xX9xFIFUNlLBZ6CPBOz9JbHpvC4+QG9ZaCZcWdl12c=,tag:DYIa+QTV8vyl1l7OKKykTw==,type:str]
 nginx:
     #ENC[AES256_GCM,data:85LrqdTMIhSa,iv:mIQPYz8VPd5AxeMCQEdTGMD0Iqa5QEAa5+8JVFaj3JM=,tag:TcZd7S3WRPpEV9lHI1fzbw==,type:comment]
@@ -83,8 +87,8 @@ sops:
             ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
             ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-25T09:01:19Z"
-    mac: ENC[AES256_GCM,data:xYK5VTYHwryDcH0fhnezn5aYQ+XAPAJ7PIrL1ygKw3F/rAwRQlWk0/zmqypmpqbPX4mAJKzDfgoTNh8iUtF8ehmfOS+7OPUTuKVRvPI39HfcJbRN3/oOdN40AXSa5cZjgKrAGdhWvwyw0WdDMkRfwJztAR5Jj0dKzZ5THW+5zSs=,iv:Y5UUe1I95ltiVcUPBUcmIpnKHFfAlQmcF8ZlxZht1i4=,tag:3mA/epV254+P7WkkuhDOqg==,type:str]
+    lastmodified: "2024-06-30T10:43:57Z"
+    mac: ENC[AES256_GCM,data:Mg/DZghIkaWM5KEjk5zg3S0L5qPa8/rkc2ooSjA1ewzbDhTKls2tzv7fQqLx2WQtcJiKkoVx22UkiL0AzBwJdCr3473vx93ajTVK9HNu3jqXmuzSiv2iVS21EX9tyBNiL6uWlVAtlVfMMs69PEUF+EJIYY5TkVVPaQjzEebwo5w=,iv:tFON7RVSnNNHo5U4dRuMGDhH5iPGShW9uoda+apiIjI=,tag:3nG/u7vaChFBHoDsLLb23w==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/vps7/default.nix

@@ -26,7 +26,7 @@ inputs:
           rollingRootfs = {};
         };
         grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
-        nixpkgs.march = "broadwell";
+        nixpkgs.march = "znver2";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
         networking = { hostname = "vps7"; networkd = {}; };
@@ -46,7 +46,7 @@ inputs:
           matrix = { port = 8009; redisPort = 6380; slidingSyncPort = 9001; };
         };
         vaultwarden.enable = true;
-        beesd.instances.root = { device = "/"; hashTableSizeMB = 1024; };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 1024; loadAverage = 4; };
         photoprism.enable = true;
         nextcloud = {};
         freshrss.enable = true;
@@ -71,5 +71,10 @@ inputs:
         xray.server = { serverName = "xserver.vps7.chn.moe"; userNumber = 4; };
       };
     };
+    specialisation.generic.configuration =
+    {
+      nixos.system.nixpkgs.march = inputs.lib.mkForce null;
+      system.nixos.tags = [ "generic" ];
+    };
   };
 }

devices/vps7/secrets.yaml

@@ -68,21 +68,18 @@ freshrss:
 huginn:
     invitationCode: ENC[AES256_GCM,data:+m2AabRzUiCFy3MAKTB8d1IE05WHTcmZ,iv:ccdIPHl9N+bvPR/QCwZUwZOfWTeW6gWhhBjOpL85JRg=,tag:Ir2085K04XUGkAuoCG+7VQ==,type:str]
 fz-new-order:
-    manager: ENC[AES256_GCM,data:qZc5U3SZQPWzcKVjN2+A2qWNae4GItcjvEQFgkThvIQ=,iv:fJpiUlViiUg1ea/zGhgedQG7TeTbeb9dPviYoiUBLqI=,tag:6T7rgJflsjgK++28SgsLtg==,type:str]
     token: ENC[AES256_GCM,data:qhwWRflJbW1QMOhiPfbTIrEdQJyVtfZ1QycCgstdKD1Nh40=,iv:GvZ8MJig64l34jkvuJbMMjyNaPT5yz0/pFCc6KEPTvA=,tag:cMXo/6F9thl8k2iAhT507Q==,type:str]
     uids:
-        #ENC[AES256_GCM,data:WJszzA==,iv:KvyEnUu69+L5ZxNbRmjtP2R+8lHKgdlMN0WuvDbYgE4=,tag:LP2FJ2HXWZJmTdvXpHflVQ==,type:comment]
-        user0: ENC[AES256_GCM,data:Qw18Ht6qXo3n7DD9NgNB+3IRbCmKuvJQiK5UBsg/FC8=,iv:TeeTcR0tnRrniySqKrsKfOfr2JO7+kqS3iETdCFX5ZA=,tag:rRo2yNku9JWxmILWBS/Wyw==,type:str]
         #ENC[AES256_GCM,data:O3DOE3jFCg==,iv:9shUoHCLXsJPKHELlyWdreouEcyOqhsfVI2KaqwC4CU=,tag:tYKVv+/DuesSijZwWGdrig==,type:comment]
-        user1: ENC[AES256_GCM,data:vY4qTPNqdFp2H348jAgvwKktywdVVvQK/lR2NgRE4Ho=,iv:DrweeSEJ5ETomIkRtkcVboiQindzBoxvxjlSmrQIfI8=,tag:sMz1ITHkDclBc4OY91dMGg==,type:str]
+        user0: ENC[AES256_GCM,data:2sieulGmi7mCYrJH24djrrmHArrFbOHZ9wUuKvY4f2k=,iv:lb5ODFOeQQ+D9HZnMw48n/DGRB7L51U4frBVcPx1mvk=,tag:MwZua6u+G478uGOwtGu4fQ==,type:str]
         #ENC[AES256_GCM,data:yeA9zF8Tug==,iv:VZuWLZnt1RBmkBWudKVvgJkYfqxIj/umEHVCfR6IG3k=,tag:1kj7HyjVT59n05VYJ1uP+w==,type:comment]
-        user2: ENC[AES256_GCM,data:7hlq1FEauGcKkStREDbxA3tOA5NmFo9AbXiOPUt+kZ4=,iv:urOP3ENSviWRKDIWGc1P5PkEtkoBSCSYlgGqJQznp8s=,tag:NNKCW5bFPY7t/PC7dsSJwg==,type:str]
+        user1: ENC[AES256_GCM,data:Aw0ydspmf+PXKU27Pdzn4q/nY4sxXCADL1WGB7vm3eo=,iv:uTmVvGlW1HfdvoNbupSw3GyShsWTGVCoNrvVJ5BPUy0=,tag:k9KIoCWM6bSprwR8dmN+Hg==,type:str]
         #ENC[AES256_GCM,data:4G7DyLVVgQ==,iv:Ht/exln1QtL2BxjCaOTIXHRPDiSFYP4zIa7VaeMCuhE=,tag:btVLXf+WS/YgzRFbVFoAfQ==,type:comment]
-        user3: ENC[AES256_GCM,data:nBTbmp9OP14ayVBz1UGC5g76txfUwxL2NPQCKGxsQyw=,iv:2B8ISdT+8WpfeiU9peKoMlpwcRoGZVh11VyAnS9IKP4=,tag:uBMxqrPlb6TaftnAMqodKw==,type:str]
+        user2: ENC[AES256_GCM,data:P5gmhaQ+VOWVOjTrsx34zUS8dsqIkzCwOImIE8TIfUc=,iv:IoJIUcNJmaBTyr0Ut6R7BN/UqyK8p4HtiwbXUl171pE=,tag:k99PGSL1cEALTmFVWH1uSg==,type:str]
         #ENC[AES256_GCM,data:TGrZBuCRgQ==,iv:9IOJ3Bkw9udS/y93TTtZ9o79aDq3Bb+DMEogJG77iqA=,tag:S/XcPX1f89IyfZnMoR9s/A==,type:comment]
-        user4: ENC[AES256_GCM,data:LVendDEBlPUCkXPfgbYf2X0EgJsAdLKjAudXeAgy2Is=,iv:bR0emkQa6OHUP1ucgAvJU0eEop0gp+3rwDB5XJhh4+s=,tag:YZsW9Yyr+ey9AbTO3ucWDg==,type:str]
+        user3: ENC[AES256_GCM,data:cAzf2X20rtQYyz1rLK6b4jo8utuUOdUHVYfCWdfPTDY=,iv:L5cg7aNdfnLTH2dKl4bWCqaujJ9tIvBJrJIoDIaBLwk=,tag:9Al6Wig4lz1my6hgozSsIA==,type:str]
         #ENC[AES256_GCM,data:b4iJ73sUoQ==,iv:A2hmi7lCR15E5jVR8E71GQuHgF4TdjDuQadXOtBon6k=,tag:eopTJdjN16u7PtpZdhKymQ==,type:comment]
-        user5: ENC[AES256_GCM,data:wG4awLnfB4B0qLWG6Aj+OslLMnViPjIzicfB4ZzkZPA=,iv:b9C1IDmZTMV0RYXqkM/Y3khZeSQEOISrQyPjhQe3WKM=,tag:cRMtLNU6TCwTQG4UVhvTng==,type:str]
+        user4: ENC[AES256_GCM,data:nUJ0lPuFOUVGCtq0IRSh5dAkAna7hoow1YOtFEgSoZc=,iv:D8phoZxdbQ2/Zaeq8498eRb0a7SZD5WnVdKv+u2pBak=,tag:Obu01n34JjyAVnF0f3uKzg==,type:str]
     config0:
         username: ENC[AES256_GCM,data:p8+q8u1A,iv:9s52kS5yLB4vQuGVXNtA4amZqT3eHTTybsbsQZRiFnk=,tag:7SA4SEzMHpP9H/rwoE+UJQ==,type:str]
         password: ENC[AES256_GCM,data:58+gFodT,iv:ohZlT1BwnzCYv84xHgFsLRkiPMpE8lB8QVHwr0QtDWc=,tag:XF047RnXs6IbKsTnsm0D6g==,type:str]
@@ -143,8 +140,8 @@ sops:
             SnFHS1Z0SXUzTFdEd29KTy9DU3Y3R0UKfhh+rUmWDrf+UGjclP57dHipPLFoXSqy
             HdelmfV6q4/c7ppx2E+oZw3VNgoZCsrxxzYZfwxHJiZb+5vkE0D8iA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-08T09:15:52Z"
-    mac: ENC[AES256_GCM,data:EY6sFc4EcTuxPgIZQ51HFZZZf+khb7mkNEvb6U12kCtoJAEo+i83uszwBZCo/QWw6VCCt9c//9y0mNH4FjZPJAxweJHcRtanyTXa5jdyv12qINUceYe7Uhcb7JuiiEns9DEbrr3UeAKfbPC+N5mD/2trzht0E8hqnFlWU/fysz8=,iv:saymdP4nFveEWx0JrBR2bW8SUl6xCJKhYqw+CsrfRG8=,tag:CHGvJAO8hpSMNdU2YE2OGw==,type:str]
+    lastmodified: "2024-07-11T13:55:38Z"
+    mac: ENC[AES256_GCM,data:5mYdz+1v6LZBW2TiM6CROaU6TUtFemOvbqJUQfqO3Lr8UnDM9AdH/fD//xDYNR1T1tMhBJf04Jchle7jRl45HKCzuyOGFOABu2m25nJeJGGDTSVDaRUUgCcmN4NQ0h1ep9gmZM9u2g5KLdmenXqcVD2tVgWNLykHtEZ/MyyEPC4=,iv:te1/rjBWhBIvJol51S4hehI4gxr3nsTH+YhmINDfy0U=,tag:mGXzGi309B1er8atMJta3g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/xmupc1/README.md

@@ -16,10 +16,25 @@ SLURM 是一个用来对任务排队的系统，轮到某个任务时，再调
 
 ## 常用命令
 
+我做了一个 TUI 界面，用起来比较简单，大多情况下可以满足需求。命令为：
+
+```bash
+sbatch-tui
+```
+
+或
+
+```bash
+sbatch
+```
+
+如果需要在提交任务时指定更详细的细节，或者要编写脚本批量提交任务，则在 `sbatch` 后面加上参数，这时是直接调用来自 SLURM 的 `sbatch` 命令。
+常用的参数见下文。更详细的内容见 SLURM 的官方文档。
+
 提交一个 VASP GPU 任务的例子：
 
 ```bash
-sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia-640
+sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia
 ```
 
 * `--gpus` 指定使用GPU 的情况：
@@ -30,12 +45,12 @@ sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia-640
 * `--ntasks-per-gpu=1` 对于 VASP 来说一定要写。
 * `--job-name=xxx` 指定任务的名字。可以简写为 `-J`。也可以不指定。
 * 默认情况下，一个 task 会搭配分配一个 CPU 核（一个线程），一般已经够用。如果一定要修改，用 `--cpus-per-task`。
-* `vasp-nvidia-640` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-nvidia-640-gam`。
+* `vasp-nvidia` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-nvidia-gam`。
 
 提交一个 VASP CPU 任务的例子：
 
 ```bash
-sbatch --ntasks=4 --cpus-per-task=4 --hint=nomultithread --job-name="my great job" vasp-intel-640
+sbatch --ntasks=4 --cpus-per-task=4 --hint=nomultithread --job-name="my great job" vasp-intel
 ```
 
 * `--ntasks=4 --cpus-per-task=4` 指定使用占用多少核。
@@ -45,7 +60,7 @@ sbatch --ntasks=4 --cpus-per-task=4 --hint=nomultithread --job-name="my great jo
     * 对于 xmupc2：`--ntasks=4 --cpus-per-task=10`。
 * `--hint=nomultithread` 记得写。
 * `--job-name=xxx` 指定任务的名字。可以简写为 `-J`。也可以不指定。
-* `vasp-intel-640` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-intel-640-gam`。
+* `vasp-intel` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-intel-gam`。
 
 要把其它程序提交到队列里，也是类似的写法。请自行举一反三。
 
@@ -186,7 +201,6 @@ samba 就是 windows 共享文件夹的那个协议。
 
 VASP 有很多很多个版本，具体来说：
 
-* VASP 多个版本可以共存，但为了简单只安装了 6.4.0 版本。
 * VASP 可以用不同的编译器编译。目前安装的有：nvidia、intel。nvidia 使用 GPU 计算，intel 能用 CPU 计算。其它版本性能不佳，没有安装。
 * VASP 的 std/gam/ncl 版本有一点区别，一般用 std，只有一个 gamma 点的时候用 gam 会快一点，系统中存在方向不平行的磁矩时必须用 ncl。
 * 无论哪个版本，都集成了下面这些补丁：
@@ -199,14 +213,14 @@ VASP 有很多很多个版本，具体来说：
 如何提交 VASP 到队列系统已经在上面介绍过了。下面的例子是，如果要直接运行一个任务的写法：
 
 ```bash
-vasp-nvidia-640-env mpirun -np 1 -x CUDA_DEVICE_ORDER=PCI_BUS_ID -x CUDA_VISIBLE_DEVICES=0 -x OMP_NUM_THREADS=4 vasp-std
-vasp-intel-640-env mpirun -n 2 -genv OMP_NUM_THREADS=4 vasp-std
+vasp-nvidia-env mpirun -np 1 -x CUDA_DEVICE_ORDER=PCI_BUS_ID -x CUDA_VISIBLE_DEVICES=0 -x OMP_NUM_THREADS=4 vasp-std
+vasp-intel-env mpirun -n 2 -genv OMP_NUM_THREADS=4 vasp-std
 ```
 
 其中 `CUDA_VISIBLE_DEVICES` 用于指定用哪几个显卡计算（多个显卡用逗号分隔）。
-要查看显卡的编号，可以用 `CUDA_DEVICE_ORDER=PCI_BUS_ID vasp-nvidia-640-env nvaccelinfo` 命令。
+要查看显卡的编号，可以用 `CUDA_DEVICE_ORDER=PCI_BUS_ID vasp-nvidia-env nvaccelinfo` 命令。
 
-这里 `vasp-xxx-6.4.0` 命令的作用是，进入一个安装了对应版本的 VASP 的环境，实际上和 VASP 关系不大；
+这里 `vasp-xxx-env` 命令的作用是，进入一个安装了对应版本的 VASP 的环境，实际上和 VASP 关系不大；
   后面的 `mpirun xxx` 才是真的调用 VASP。
 所以实际上你也可以在这个环境里做别的事情，例如执行上面的 `nvaccelinfo` 命令。
 

devices/xmupc2/default.nix

@@ -77,5 +77,12 @@ inputs:
       bugs = [ "xmunet" ];
       user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
+    environment.persistence."/nix/archive" =
+    {
+      hideMounts = true;
+      users.chn.directories = builtins.map
+        (dir: { directory = "repo/${dir}"; user = "chn"; group = "chn"; mode = "0755"; })
+        [ "lammps-SiC" "linwei-stuff" ];
+    };
   };
 }

flake.nix

@@ -3,31 +3,28 @@
 
   inputs =
   {
-    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable";
     "nixpkgs-23.11".url = "github:CHN-beta/nixpkgs/nixos-23.11";
     "nixpkgs-23.05".url = "github:CHN-beta/nixpkgs/nixos-23.05";
     "nixpkgs-22.11".url = "github:NixOS/nixpkgs/nixos-22.11";
     "nixpkgs-22.05".url = "github:NixOS/nixpkgs/nixos-22.05";
-    home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; };
+    home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
     sops-nix =
     {
       url = "github:Mic92/sops-nix";
       inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; };
     };
-    aagl = { url = "github:ezKEa/aagl-gtk-on-nix/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs-unstable"; };
+    aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; };
     nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
     nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; };
     impermanence.url = "github:nix-community/impermanence";
     qchem = { url = "github:Nix-QChem/NixOS-QChem/master"; inputs.nixpkgs.follows = "nixpkgs"; };
-    deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; };
     plasma-manager =
     {
       url = "github:pjones/plasma-manager";
       inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
     };
-    nix-doom-emacs = { url = "github:nix-community/nix-doom-emacs"; inputs.nixpkgs.follows = "nixpkgs"; };
     nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
     nixos-hardware.url = "github:CHN-beta/nixos-hardware";
     envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -54,8 +51,6 @@
     nodesoup = { url = "github:olvb/nodesoup"; flake = false; };
     tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; flake = false; };
     v-sim = { url = "gitlab:l_sim/v_sim"; flake = false; };
-    win11os-kde = { url = "github:yeyushengfan258/Win11OS-kde"; flake = false; };
-    fluent-kde = { url = "github:vinceliuice/Fluent-kde"; flake = false; };
     rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; };
     blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; flake = false; };
     slate = { url = "github:TheBigWazz/Slate"; flake = false; };
@@ -68,6 +63,7 @@
     zxorm = { url = "github:CHN-beta/zxorm"; flake = false; };
     openxlsx = { url = "github:troldal/OpenXLSX"; flake = false; };
     sqlite-orm = { url = "github:fnc12/sqlite_orm"; flake = false; };
+    sockpp = { url = "github:fpagliughi/sockpp"; flake = false; };
 
     # does not support lfs yet
     # nixos-wallpaper = { url = "git+https://git.chn.moe/chn/nixos-wallpaper.git"; flake = false; };
@@ -80,15 +76,12 @@
         (builtins.attrNames (builtins.readDir ./devices));
     in
     {
-      packages.x86_64-linux =
-        let pkgs = (import inputs.nixpkgs
-        {
-          system = "x86_64-linux";
-          config.allowUnfree = true;
-          overlays = [ inputs.self.overlays.default ];
-        });
-        in
+      packages =
+      {
+        x86_64-linux = rec
         {
+          pkgs = (import inputs.nixpkgs
+            { system = "x86_64-linux"; config.allowUnfree = true; overlays = [ inputs.self.overlays.default ]; });
           default = inputs.nixpkgs.legacyPackages.x86_64-linux.writeText "systems"
             (builtins.concatStringsSep "\n" (builtins.map
               (system: builtins.toString inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel)
@@ -101,7 +94,7 @@
             in pkgs.pkgsStatic.localPackages.hpcstat.override
               { inherit openssh duc; standalone = true; version = inputs.self.rev or "dirty"; };
           ufo = pkgs.pkgsStatic.localPackages.ufo.override { version = inputs.self.rev or "dirty"; };
-          nixpkgs = pkgs;
+          chn-bsub = pkgs.pkgsStatic.localPackages.chn-bsub;
         }
         // (
           builtins.listToAttrs (builtins.map
@@ -111,7 +104,24 @@
               value = inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel;
             })
             devices)
-        );
+          );
+        x86_64-w64-mingw32 = rec
+        {
+          pkgs = (import inputs.nixpkgs
+          {
+            crossSystem = inputs.nixpkgs.lib.systems.examples.mingwW64 // { isStatic = true; };
+            system = "x86_64-linux";
+            config.allowUnfree = true;
+            overlays = [ inputs.self.overlays.default ];
+          });
+          boost = pkgs.boost.override { zstd = null; };
+          magic-enum = pkgs.magic-enum.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++
+            [ "-DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF" "-DMAGIC_ENUM_OPT_BUILD_TESTS=OFF" ]; });
+          range-v3 = pkgs.range-v3.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++
+            [ "-DRANGE_V3_DOCS=OFF" "-DRANGE_V3_TESTS=OFF" "-DRANGE_V3_EXAMPLES=OFF" ]; });
+          winjob = pkgs.localPackages.winjob.override { inherit boost range-v3; };
+        };
+      };
       nixosConfigurations =
       (
         (builtins.listToAttrs (builtins.map
@@ -149,64 +159,49 @@
           };
         }
       );
-      deploy =
-      {
-        sshUser = "root";
-        user = "root";
-        fastConnection = true;
-        autoRollback = false;
-        magicRollback = false;
-        nodes = builtins.listToAttrs (builtins.map
-          (node:
-          {
-            name = node;
-            value =
-            {
-              hostname = node;
-              profiles.system.path = inputs.self.nixosConfigurations.${node}.pkgs.deploy-rs.lib.activate.nixos
-                inputs.self.nixosConfigurations.${node};
-            };
-          })
-          [ "vps6" "vps7" "nas" "surface" "xmupc1" "xmupc2" "pi3b" ]
-        );
-      };
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
       overlays.default = final: prev:
         { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; topInputs = inputs; }); };
       config = { archive = false; branch = "production"; };
-      devShells.x86_64-linux =
-        let pkgs = (import inputs.nixpkgs
+      devShells.x86_64-linux = let inherit (inputs.self.packages.x86_64-linux) pkgs; in
+      {
+        biu = pkgs.mkShell
         {
-          system = "x86_64-linux";
-          config.allowUnfree = true;
-          overlays = [ inputs.self.overlays.default ];
-        });
-        in
-        {
-          biu = pkgs.mkShell
-          {
-            inputsFrom = with pkgs.localPackages; [ biu ];
-            buildInputs = [ pkgs.clang-tools_18 ];
-            CMAKE_EXPORT_COMPILE_COMMANDS = "1";
-          };
-          hpcstat = pkgs.mkShell
-          {
-            inputsFrom = [ (inputs.self.packages.x86_64-linux.hpcstat.override { version = null; }) ];
-            packages = [ pkgs.clang-tools_18 ];
-            CMAKE_EXPORT_COMPILE_COMMANDS = "1";
-          };
-          sbatch-tui = pkgs.mkShell
-          {
-            inputsFrom = with pkgs.localPackages; [ sbatch-tui ];
-            buildInputs = [ pkgs.clang-tools_18 ];
-            CMAKE_EXPORT_COMPILE_COMMANDS = "1";
-          };
-          ufo = pkgs.mkShell
-          {
-            inputsFrom = [ (inputs.self.packages.x86_64-linux.ufo.override { version = null; }) ];
-            packages = [ pkgs.clang-tools_18 ];
-            CMAKE_EXPORT_COMPILE_COMMANDS = "1";
-          };
+          inputsFrom = [ pkgs.localPackages.biu ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
         };
+        hpcstat = pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }
+        {
+          inputsFrom = [ (inputs.self.packages.x86_64-linux.hpcstat.override { version = null; }) ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        sbatch-tui = pkgs.mkShell
+        {
+          inputsFrom = [ pkgs.localPackages.sbatch-tui ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        ufo = pkgs.mkShell
+        {
+          inputsFrom = [ (inputs.self.packages.x86_64-linux.ufo.override { version = null; }) ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        chn-bsub = pkgs.mkShell
+        {
+          inputsFrom = [ pkgs.localPackages.chn-bsub ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        winjob =
+          let inherit (pkgs) clang-tools_18; in let inherit (inputs.self.packages.x86_64-w64-mingw32) pkgs winjob;
+          in pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }
+          {
+            inputsFrom = [ winjob ];
+            packages = [ clang-tools_18 ];
+            CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+          };
+      };
     };
 }

local/pkgs/biu/.clangd

@@ -1,3 +1,3 @@
 CompileFlags:
   Add: [ -Wall, -Wextra, -std=c++23 ]
-  Compiler: g++
+  Compiler: g++

local/pkgs/biu/CMakeLists.txt

@@ -13,18 +13,17 @@ endif()
 
 find_package(magic_enum REQUIRED)
 find_package(fmt REQUIRED)
-find_package(Boost REQUIRED COMPONENTS headers iostreams)
-find_package(Eigen3 REQUIRED)
+find_package(Boost REQUIRED COMPONENTS headers iostreams filesystem)
 find_package(range-v3 REQUIRED)
 find_path(NAMEOF_INCLUDE_DIR nameof.hpp REQUIRED)
-find_path(ZPP_BITS_INCLUDE_DIR zpp_bits.h REQUIRED)
+find_package(Eigen3 REQUIRED)
 
 add_library(biu src/common.cpp)
 target_include_directories(biu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> ${NAMEOF_INCLUDE_DIR} ${ZPP_BITS_INCLUDE_DIR})
-target_link_libraries(biu PUBLIC magic_enum::magic_enum fmt::fmt Boost::headers Boost::iostreams Eigen3::Eigen
-  range-v3::range-v3)
-set_property(TARGET biu PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
+target_link_libraries(biu PUBLIC magic_enum::magic_enum fmt::fmt Boost::headers Boost::iostreams Boost::filesystem
+  range-v3::range-v3 Eigen3::Eigen)
+set_property(TARGET biu PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON)
 install(TARGETS biu EXPORT biuTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
@@ -35,3 +34,14 @@ install(FILES biuConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/biu)
 get_property(ImportedTargets DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS)
 message("Imported targets: ${ImportedTargets}")
 message("List of compile features: ${CMAKE_CXX_COMPILE_FEATURES}")
+
+include(CTest)
+add_executable(test-serialize test/serialize.cpp)
+target_link_libraries(test-serialize PRIVATE biu)
+set_property(TARGET test-serialize PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON)
+add_test(NAME test-serialize COMMAND test-serialize)
+
+add_executable(test-process test/process.cpp)
+target_link_libraries(test-process PRIVATE biu)
+set_property(TARGET test-process PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON)
+add_test(NAME test-process COMMAND test-process)

local/pkgs/biu/default.nix

@@ -1,11 +1,12 @@
 {
-  stdenv, cmake,
+  stdenv, cmake, lib,
   magic-enum, fmt, boost, eigen, range-v3, nameof, zpp-bits
 }: stdenv.mkDerivation rec
 {
   name = "biu";
   src = ./.;
-  buildInputs = [ magic-enum fmt boost eigen range-v3 nameof zpp-bits ];
+  buildInputs = [ magic-enum fmt boost range-v3 nameof zpp-bits eigen ];
   propagatedBuildInputs = buildInputs;
   nativeBuildInputs = [ cmake ];
+  doCheck = true;
 }

local/pkgs/biu/include/biu/common.hpp

@@ -72,27 +72,24 @@ namespace biu
 
     namespace detail_
     {
-      template <bool DirectStdout, bool DirectStderr> struct ExecResult
+      struct ExecMode { bool DirectStdin = false, DirectStdout = false, DirectStderr = false, SearchPath = false; };
+      template <ExecMode Mode> struct ExecResult
       {
         int ExitCode;
-        std::conditional_t<DirectStdout, Empty, std::string> Stdout;
-        std::conditional_t<DirectStderr, Empty, std::string> Stderr;
+        std::conditional_t<Mode.DirectStdout, Empty, std::string> Stdout;
+        std::conditional_t<Mode.DirectStderr, Empty, std::string> Stderr;
         operator bool() const;
       };
-      struct ExecInput { bool DirectStdin = false, DirectStdout = false, DirectStderr = false, SearchPath = false; };
+      template <ExecMode Mode> struct ExecInput
+      {
+        std::conditional_t<Mode.SearchPath, std::string, std::filesystem::path> Program;
+        std::vector<std::string> Args;
+        std::conditional_t<Mode.DirectStdin, Empty, std::string> Stdin = {};
+        std::map<std::string, std::string> ExtraEnv = {};
+        std::optional<std::chrono::milliseconds> Timeout;
+      };
     }
-    template <detail_::ExecInput Input = {}> requires (!Input.DirectStdin)
-      detail_::ExecResult<Input.DirectStdout, Input.DirectStderr> exec
-    (
-      std::conditional_t<Input.SearchPath, std::string, std::filesystem::path> program, std::vector<std::string> args,
-      std::optional<std::string> stdin_string = {}, std::map<std::string, std::string> extra_env = {}
-    );
-    template <detail_::ExecInput Input = {}> requires (Input.DirectStdin)
-      detail_::ExecResult<Input.DirectStdout, Input.DirectStderr> exec
-    (
-      std::conditional_t<Input.SearchPath, std::string, std::filesystem::path> program, std::vector<std::string> args,
-      std::map<std::string, std::string> extra_env = {}
-    );
+    template <detail_::ExecMode Mode = {}> detail_::ExecResult<Mode> exec(detail_::ExecInput<Mode> input);
 
     static_assert(sizeof(char) == sizeof(std::byte));
     template <typename Char = std::byte, typename T> requires (std::same_as<Char, std::byte>)

local/pkgs/biu/src/common.cpp

@@ -18,87 +18,54 @@ namespace biu
       else return value;
     }
 
-    template <bool DirectStdout, bool DirectStderr>
-      detail_::ExecResult<DirectStdout, DirectStderr>::operator bool() const
-      { return ExitCode == 0; }
-#   define BIU_EXECRESULT_PRED(r, state) BOOST_PP_NOT_EQUAL(state, 4)
-#   define BIU_EXECRESULT_OP(r, state) BOOST_PP_INC(state)
-#   define BIU_EXECRESULT_MACRO(r, state) \
-      template detail_::ExecResult<(state & 1) != 0, (state & 2) != 0>::operator bool() const;
-    BOOST_PP_FOR(0, BIU_EXECRESULT_PRED, BIU_EXECRESULT_OP, BIU_EXECRESULT_MACRO)
-    namespace detail_
+    template <detail_::ExecMode Mode> detail_::ExecResult<Mode>::operator bool() const { return ExitCode == 0; }
+
+    template <detail_::ExecMode Mode> detail_::ExecResult<Mode> exec(detail_::ExecInput<Mode> input)
     {
-      template <ExecInput Input>
-        detail_::ExecResult<Input.DirectStdout, Input.DirectStderr> exec
-      (
-        std::conditional_t<Input.SearchPath, std::string, std::filesystem::path> program, std::vector<std::string> args,
-        std::optional<std::string> stdin_string, std::map<std::string, std::string> extra_env
-      )
+      namespace bp = boost::process;
+
+      // decide input/output format, prepare environment, seach actual program
+      bp::ipstream stdout_stream, stderr_stream;
+      bp::opstream input_stream;
+      auto&& stdin_format = [&]
+        { if constexpr (Mode.DirectStdin) return bp::std_in < stdin; else return bp::std_in < input_stream; }();
+      auto&& stdout_format = [&]
+        { if constexpr (Mode.DirectStdout) return bp::std_out > stdout; else return bp::std_out > stdout_stream; }();
+      auto&& stderr_format = [&]
+        { if constexpr (Mode.DirectStderr) return bp::std_err > stderr; else return bp::std_err > stderr_stream; }();
+      auto&& actual_program = [&]
       {
-        namespace bp = boost::process;
-        bp::ipstream stdout_stream, stderr_stream;
-        bp::opstream input_stream;
-        auto&& stdout_format = [&]
-          { if constexpr (Input.DirectStdout) return bp::std_out > stdout; else return bp::std_out > stdout_stream; }();
-        auto&& stderr_format = [&]
-          { if constexpr (Input.DirectStderr) return bp::std_err > stderr; else return bp::std_err > stderr_stream; }();
-        auto&& actual_program =
-          [&]{ if constexpr (Input.SearchPath) return bp::search_path(program); else return program.string(); }();
-        std::unique_ptr<bp::child> process;
-        bp::environment env = boost::this_process::environment();
-        for (const auto& [key, value] : extra_env) env[key] = value;
-        process = [&]
-        {
-          if constexpr (Input.DirectStdin) return std::make_unique<bp::child>
-            (actual_program, bp::args(args), stdout_format, stderr_format, bp::std_in < stdin, env);
-          else if (stdin_string) return std::make_unique<bp::child>
-            (actual_program, bp::args(args), stdout_format, stderr_format, bp::std_in < input_stream, env);
-          else return std::make_unique<bp::child>
-            (actual_program, bp::args(args), stdout_format, stderr_format, bp::std_in < bp::null, env);
-        }();
-        if (stdin_string) { input_stream << *stdin_string; input_stream.pipe().close(); }
-        process->wait();
-        return
-        {
-          .ExitCode = process->exit_code(),
-          .Stdout = [&]
-          {
-            if constexpr (Input.DirectStdout) return Empty{};
-            else return std::string{std::istreambuf_iterator<char>{stdout_stream.rdbuf()}, {}};
-          }(),
-          .Stderr = [&]
-          {
-            if constexpr (Input.DirectStderr) return Empty{};
-            else return std::string{std::istreambuf_iterator<char>{stderr_stream.rdbuf()}, {}};
-          }()
-        };
-      }
+        if constexpr (Mode.SearchPath) return bp::search_path(input.Program);
+        else return input.Program.string();
+      }();
+      bp::environment env = boost::this_process::environment();
+      for (const auto& [key, value] : input.ExtraEnv) env[key] = value;
+
+      // start
+      auto process = bp::child
+        (actual_program, bp::args(input.Args), stdout_format, stderr_format, stdin_format, env);
+      if constexpr (!Mode.DirectStdin) { input_stream << input.Stdin; input_stream.pipe().close(); }
+
+      // wait for exit
+      if (input.Timeout) { if (!process.wait_for(*input.Timeout)) process.terminate(); }
+      else process.wait();
+
+      // collect output
+      detail_::ExecResult<Mode> result;
+      result.ExitCode = process.exit_code();
+      if constexpr (!Mode.DirectStdout) result.Stdout = {std::istreambuf_iterator<char>{stdout_stream.rdbuf()}, {}};
+      if constexpr (!Mode.DirectStderr) result.Stderr = {std::istreambuf_iterator<char>{stderr_stream.rdbuf()}, {}};
+      return result;
     }
-    template <detail_::ExecInput Input> requires (!Input.DirectStdin)
-      detail_::ExecResult<Input.DirectStdout, Input.DirectStderr> exec
-    (
-      std::conditional_t<Input.SearchPath, std::string, std::filesystem::path> program, std::vector<std::string> args,
-      std::optional<std::string> stdin_string, std::map<std::string, std::string> extra_env
-    )
-      { return detail_::exec<Input>(program, args, stdin_string, extra_env); }
-    template <detail_::ExecInput Input> requires (Input.DirectStdin)
-      detail_::ExecResult<Input.DirectStdout, Input.DirectStderr> exec
-    (
-      std::conditional_t<Input.SearchPath, std::string, std::filesystem::path> program, std::vector<std::string> args,
-      std::map<std::string, std::string> extra_env
-    )
-      { return detail_::exec<Input>(program, args, {}, extra_env); }
-#   define BIU_EXEC_PRED(r, state) BOOST_PP_NOT_EQUAL(state, 8)
-#   define BIU_EXEC_OP(r, state) BOOST_PP_INC(state)
-#   define BIU_EXEC_MACRO(r, state) \
-  template detail_::ExecResult<(state & 1) != 0, (state & 2) != 0> \
-    exec<{false, (state & 1) != 0, (state & 2) != 0, (state & 4) != 0}> \
-    (std::conditional_t<(state & 4) != 0, std::string, std::filesystem::path>, std::vector<std::string>, \
-      std::optional<std::string>, std::map<std::string, std::string>); \
-  template detail_::ExecResult<(state & 1) != 0, (state & 2) != 0> \
-    exec<{true, (state & 1) != 0, (state & 2) != 0, (state & 4) != 0}> \
-    (std::conditional_t<(state & 4) != 0, std::string, std::filesystem::path>, std::vector<std::string>, \
-      std::map<std::string, std::string>);
+
+#   define BIU_EXEC_PRED(r, i) BOOST_PP_NOT_EQUAL(i, 16)
+#   define BIU_EXEC_OP(r, i) BOOST_PP_INC(i)
+#   define BIU_EXEC_MACRO(r, i) \
+    namespace detail_ \
+      { constexpr ExecMode ExecMode##i {(i & 1) != 0, (i & 2) != 0, (i & 4) != 0, (i & 8) != 0}; } \
+    template detail_::ExecResult<detail_::ExecMode##i>::operator bool() const; \
+    template detail_::ExecResult<detail_::ExecMode##i> \
+      exec<detail_::ExecMode##i>(detail_::ExecInput<detail_::ExecMode##i>);
     BOOST_PP_FOR(0, BIU_EXEC_PRED, BIU_EXEC_OP, BIU_EXEC_MACRO)
   }
 }

local/pkgs/biu/test/process.cpp

@@ -0,0 +1,9 @@
+# include <biu.hpp>
+
+int main()
+{
+  using namespace biu::literals;
+  auto result = biu::exec<{.SearchPath = true}>({.Program = "sleep", .Args = {"10"}, .Timeout = 3s});
+  std::cout << "{}\n"_f(result.ExitCode);
+  assert(!result);
+}

local/pkgs/biu/test/serialize.cpp

@@ -0,0 +1,17 @@
+# include <biu.hpp>
+
+int main()
+{
+  struct student
+  {
+    int number;
+    std::string name;
+    std::vector<std::optional<double>> grade;
+    using serialize = zpp::bits::members<3>;
+    auto operator<=>(const student&) const = default;
+  };
+  student bob{ 123, "Bob", { 3.5, std::nullopt, 4.0 } };
+  auto serialized_bob = biu::serialize(bob);
+  auto bob2 = biu::deserialize<student>(serialized_bob);
+  assert(bob == bob2);
+}

local/pkgs/chn-bsub/CMakeLists.txt

@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.14)
+project(chn-bsub VERSION 0.0.0 LANGUAGES CXX)
+enable_testing()
+include(GNUInstallDirs)
+
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message("Setting build type to 'Release' as none was specified.")
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+endif()
+
+find_package(ftxui REQUIRED)
+find_package(Boost REQUIRED COMPONENTS filesystem iostreams)
+find_package(range-v3 REQUIRED)
+find_package(biu REQUIRED)
+
+add_executable(chn-bsub src/main.cpp)
+target_compile_features(chn-bsub PUBLIC cxx_std_23)
+target_link_libraries(chn-bsub PRIVATE fmt::fmt ftxui::screen ftxui::dom ftxui::component Boost::filesystem
+  range-v3::range-v3 biu::biu)
+
+install(TARGETS chn-bsub RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+get_property(ImportedTargets DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS)
+message("Imported targets: ${ImportedTargets}")
+message("List of compile features: ${CMAKE_CXX_COMPILE_FEATURES}")

local/pkgs/chn-bsub/default.nix

@@ -0,0 +1,12 @@
+{
+  stdenv, lib, sbatchConfig ? null, substituteAll, runCommand,
+  cmake, pkg-config, ftxui, biu
+}:
+stdenv.mkDerivation
+{
+  name = "chn-bsub";
+  src = ./.;
+  buildInputs = [ ftxui biu ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  postInstall = "ln -s chn-bsub $out/bin/chn_bsub";
+}

local/pkgs/chn-bsub/src/main.cpp

@@ -0,0 +1,202 @@
+# include <map>
+# include <filesystem>
+# include <ftxui/component/component.hpp>
+# include <ftxui/component/component_options.hpp>
+# include <ftxui/component/screen_interactive.hpp>
+# include <boost/process.hpp>
+# include <boost/algorithm/string.hpp>
+# include <biu.hpp>
+
+using namespace biu::literals;
+
+int main()
+{
+	// 需要绑定到界面上的变量
+	struct
+	{
+		std::array<int, 3> vasp_version_selected = {0, 0, 0};
+		std::vector<std::string> vasp_version_entries_level1 = {"640", "631"};
+		std::map<std::string, std::vector<std::string>> vasp_version_entries_level2 = 
+		{
+			{"640", {"(default)", "fixc", "optcell_vtst_wannier90", "shmem", "vtst"}},
+			{"631", {"shmem"}}
+		};
+		std::vector<std::string> vasp_version_entries_level3 = {"std", "gam", "ncl"};
+
+		int queue_selected = 0;
+		std::vector<std::string> queue_entries =
+		{
+			"normal_1day", "normal_1week", "normal",
+			"normal_1day_new", "ocean_530_1day", "ocean6226R_1day"
+		};
+		std::map<std::string, std::size_t> max_cores =
+		{
+			{"normal_1day", 28}, {"normal_1week", 28}, {"normal", 20},
+			{"normal_1day_new", 24}, {"ocean_530_1day", 24}, {"ocean6226R_1day", 32}
+		};
+		std::string ncores = "";
+		std::string job_name = []
+		{
+			// /data/gpfs01/jykang/linwei/chn/lammps-SiC
+			std::vector<std::string> paths;
+			boost::split(paths, std::filesystem::current_path().string(),
+				boost::is_any_of("/"));
+			if (paths.size() < 7)
+				return "my-great-job"s;
+			else
+				return paths[5] + "_" + paths.back();
+		}();
+		std::string bsub = "";
+		std::string user_command = "";
+	} state;
+
+	// 为组件增加标题栏
+	auto component_with_title = [](std::string title, ftxui::Component component)
+	{
+		return ftxui::Renderer(component, [title, component]
+		{
+			return ftxui::vbox
+			({
+				ftxui::text(title) | ftxui::bgcolor(ftxui::Color::Blue),
+				component->Render(),
+				ftxui::separator()
+			});
+		});
+	};
+
+	// 构建界面, 需要至少 25 行 47 列
+	auto screen = ftxui::ScreenInteractive::Fullscreen();
+	auto request_interface = [&state, &screen, &component_with_title]
+	{
+		auto vasp_version_level1 = ftxui::Menu
+			(&state.vasp_version_entries_level1, &state.vasp_version_selected[0])
+			| ftxui::size(ftxui::WIDTH, ftxui::EQUAL, 8);
+		std::vector<ftxui::Component> vasp_version_level2_children;
+		for (auto& i : state.vasp_version_entries_level1)
+			vasp_version_level2_children.push_back(ftxui::Menu
+			(
+				&state.vasp_version_entries_level2[i],
+				&state.vasp_version_selected[1]
+			));
+		auto vasp_version_level2 = ftxui::Container::Tab
+		(
+			vasp_version_level2_children,
+			&state.vasp_version_selected[0]
+		) | ftxui::size(ftxui::WIDTH, ftxui::EQUAL, 27);
+		auto vasp_version_level3 = ftxui::Menu
+			(&state.vasp_version_entries_level3, &state.vasp_version_selected[2])
+			| ftxui::size(ftxui::WIDTH, ftxui::EQUAL, 8);
+		auto vasp_version = component_with_title("Select vasp version:",
+			ftxui::Container::Horizontal
+				({vasp_version_level1, vasp_version_level2, vasp_version_level3})
+			| ftxui::size(ftxui::HEIGHT, ftxui::EQUAL, 5));
+		auto queue = component_with_title("Select queue:",
+			ftxui::Menu(&state.queue_entries, &state.queue_selected)
+			| ftxui::size(ftxui::HEIGHT, ftxui::EQUAL, 6));
+		auto ncores = component_with_title("Input cores you want to use:",
+			ftxui::Input(&state.ncores, "(leave blank to use all cores)"))
+			| ftxui::size(ftxui::HEIGHT, ftxui::EQUAL, 3);
+		auto job_name = component_with_title("Job name:",
+			ftxui::Input(&state.job_name, ""))
+			| ftxui::size(ftxui::HEIGHT, ftxui::EQUAL, 3);
+		auto continue_button = ftxui::Button("Continue",
+			[&]{state.user_command = "continue"; screen.ExitLoopClosure()();});
+		auto quit_button = ftxui::Button("Quit",
+			[&]{state.user_command = "quit"; screen.ExitLoopClosure()();});
+		return ftxui::Container::Vertical
+		({
+			vasp_version, queue, ncores, job_name,
+			ftxui::Container::Horizontal({continue_button, quit_button})
+		}) | ftxui::borderHeavy
+			| ftxui::size(ftxui::WIDTH, ftxui::EQUAL, 47)
+			| ftxui::size(ftxui::HEIGHT, ftxui::EQUAL, 24);
+	}();
+	auto confirm_interface = [&state, &screen, &component_with_title]
+	{
+		ftxui::InputOption input_option;
+		input_option.multiline = true;
+		return ftxui::Container::Vertical
+		({
+			component_with_title
+			(
+				"Double check & modify submit command:",
+				ftxui::Input(&state.bsub, "", input_option)
+			)
+				| ftxui::size(ftxui::HEIGHT, ftxui::EQUAL, 7),
+			ftxui::Container::Horizontal
+			({
+				ftxui::Button("Submit",
+					[&]{state.user_command = "submit"; screen.ExitLoopClosure()();}),
+				ftxui::Button("Quit",
+					[&]{state.user_command = "quit"; screen.ExitLoopClosure()();}),
+				ftxui::Button("Back",
+					[&]{state.user_command = "back"; screen.ExitLoopClosure()();})
+			}),
+			ftxui::Renderer([]{return ftxui::vbox
+			({
+				ftxui::separator(),
+				ftxui::text("Source code:"),
+				ftxui::text("https://github.com/CHN-beta/chn_bsub.git"),
+				ftxui::text("Star & PR are welcome!"),
+			});})
+		}) | ftxui::borderHeavy
+			| ftxui::size(ftxui::WIDTH, ftxui::EQUAL, 47)
+			| ftxui::size(ftxui::HEIGHT, ftxui::EQUAL, 14);
+	}();
+
+	// 实际投递任务
+	auto submit = [](std::string bsub)
+	{
+		// replace \n with space
+		boost::replace_all(bsub, "\n", " ");
+		auto process = boost::process::child
+		(
+			boost::process::search_path("sh"), "-c", bsub,
+			boost::process::std_in.close(),
+			boost::process::std_out > stdout,
+			boost::process::std_err > stderr
+		);
+		process.wait();
+	};
+
+	// 进入事件循环
+	while (true)
+	{
+		screen.Loop(request_interface);
+		if (state.user_command == "quit")
+			return EXIT_FAILURE;
+		else if (state.user_command != "continue")
+			throw std::runtime_error("user_command is not recognized");
+		state.bsub = fmt::format
+		(
+			"bsub -J '{}'\n-q {}\n-n {}\n-R 'span[hosts=1]'\n-o 'output.txt'\nchn_vasp.sh {}",
+			state.job_name,
+			state.queue_entries[state.queue_selected],
+			state.ncores.empty() ? state.max_cores[state.queue_entries[state.queue_selected]] :
+				std::stoi(state.ncores),
+			[&]
+			{
+				auto version_level1 = state.vasp_version_entries_level1[state.vasp_version_selected[0]];
+				auto version_level2 = state.vasp_version_entries_level2[version_level1]
+					[state.vasp_version_selected[1]];
+				auto version_level3 = state.vasp_version_entries_level3[state.vasp_version_selected[2]];
+				return fmt::format
+				(
+					"{}{}_{}",
+					version_level1,
+					version_level2 == "(default)" ? ""s : "_" + version_level2,
+					version_level3
+				);
+			}()
+		);
+		screen.Loop(confirm_interface);
+		if (state.user_command == "quit")
+			return EXIT_FAILURE;
+		else if (state.user_command == "back")
+			continue;
+		else if (state.user_command != "submit")
+			throw std::runtime_error("user_command is not recognized");
+		submit(state.bsub);
+		break;
+	}
+}

local/pkgs/default.nix

@@ -1,32 +1,24 @@
 inputs: rec
 {
-  typora = inputs.pkgs.callPackage ./typora {};
-  vesta = inputs.pkgs.callPackage ./vesta {};
-  rsshub = inputs.pkgs.callPackage ./rsshub.nix
-  {
-    inherit mkPnpmPackage;
-    src = inputs.topInputs.rsshub;
-    nodejs = nodejs-with-pnpm9.override { nodejs = inputs.pkgs.nodejs_22; };
-  };
-  misskey = inputs.pkgs.callPackage ./misskey.nix
-    { inherit mkPnpmPackage; src = inputs.topInputs.misskey; nodejs = nodejs-with-pnpm9; };
-  mk-meili-mgn = inputs.pkgs.callPackage ./mk-meili-mgn {};
-  vaspkit = inputs.pkgs.callPackage ./vaspkit { inherit (inputs.localLib) attrsToList; };
-  v-sim = inputs.pkgs.callPackage ./v-sim { src = inputs.topInputs.v-sim; };
-  concurrencpp = inputs.pkgs.callPackage ./concurrencpp { src = inputs.topInputs.concurrencpp; };
-  eigengdb = inputs.pkgs.python3Packages.callPackage ./eigengdb {};
-  nodesoup = inputs.pkgs.callPackage ./nodesoup { src = inputs.topInputs.nodesoup; };
-  matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus
+  vesta = inputs.pkgs.callPackage ./vesta.nix {};
+  rsshub = inputs.pkgs.callPackage ./rsshub.nix { inherit mkPnpmPackage; src = inputs.topInputs.rsshub; };
+  misskey = inputs.pkgs.callPackage ./misskey.nix { inherit mkPnpmPackage; src = inputs.topInputs.misskey; };
+  mk-meili-mgn = inputs.pkgs.callPackage ./mk-meili-mgn.nix {};
+  vaspkit = inputs.pkgs.callPackage ./vaspkit.nix { inherit (inputs.localLib) attrsToList; };
+  v-sim = inputs.pkgs.callPackage ./v-sim.nix { src = inputs.topInputs.v-sim; };
+  concurrencpp = inputs.pkgs.callPackage ./concurrencpp.nix { src = inputs.topInputs.concurrencpp; };
+  eigengdb = inputs.pkgs.python3Packages.callPackage ./eigengdb.nix {};
+  nodesoup = inputs.pkgs.callPackage ./nodesoup.nix { src = inputs.topInputs.nodesoup; };
+  matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix
     { inherit nodesoup glad; src = inputs.topInputs.matplotplusplus; };
-  zpp-bits = inputs.pkgs.callPackage ./zpp-bits { src = inputs.topInputs.zpp-bits; };
-  eigen = inputs.pkgs.callPackage ./eigen { src = inputs.topInputs.eigen; };
-  nameof = inputs.pkgs.callPackage ./nameof { src = inputs.topInputs.nameof; };
-  pslist = inputs.pkgs.callPackage ./pslist {};
-  glad = inputs.pkgs.callPackage ./glad {};
-  chromiumos-touch-keyboard = inputs.pkgs.callPackage ./chromiumos-touch-keyboard {};
-  yoga-support = inputs.pkgs.callPackage ./yoga-support {};
-  tgbot-cpp = inputs.pkgs.callPackage ./tgbot-cpp { src = inputs.topInputs.tgbot-cpp; };
-  mirism = inputs.pkgs.callPackage ./mirism
+  zpp-bits = inputs.pkgs.callPackage ./zpp-bits.nix { src = inputs.topInputs.zpp-bits; };
+  eigen = inputs.pkgs.callPackage ./eigen.nix { src = inputs.topInputs.eigen; };
+  nameof = inputs.pkgs.callPackage ./nameof.nix { src = inputs.topInputs.nameof; };
+  pslist = inputs.pkgs.callPackage ./pslist.nix {};
+  glad = inputs.pkgs.callPackage ./glad.nix {};
+  yoga-support = inputs.pkgs.callPackage ./yoga-support.nix {};
+  tgbot-cpp = inputs.pkgs.callPackage ./tgbot-cpp.nix { src = inputs.topInputs.tgbot-cpp; };
+  mirism = inputs.pkgs.callPackage ./mirism.nix
   {
     inherit cppcoro nameof tgbot-cpp date;
     nghttp2 = inputs.pkgs.callPackage "${inputs.topInputs."nixpkgs-23.05"}/pkgs/development/libraries/nghttp2"
@@ -34,53 +26,52 @@ inputs: rec
     stdenv = inputs.pkgs.gcc12Stdenv;
   };
   cppcoro = inputs.pkgs.callPackage ./cppcoro { src = inputs.topInputs.cppcoro; };
-  date = inputs.pkgs.callPackage ./date { src = inputs.topInputs.date; };
-  esbonio = inputs.pkgs.python3Packages.callPackage ./esbonio {};
+  date = inputs.pkgs.callPackage ./date.nix { src = inputs.topInputs.date; };
+  esbonio = inputs.pkgs.python3Packages.callPackage ./esbonio.nix {};
   pix2tex = inputs.pkgs.python3Packages.callPackage ./pix2tex {};
-  pyreadline3 = inputs.pkgs.python3Packages.callPackage ./pyreadline3 {};
-  torchdata = inputs.pkgs.python3Packages.callPackage ./torchdata {};
-  torchtext = inputs.pkgs.python3Packages.callPackage ./torchtext { inherit torchdata; };
-  win11os-kde = inputs.pkgs.callPackage ./win11os-kde { src = inputs.topInputs.win11os-kde; };
-  fluent-kde = inputs.pkgs.callPackage ./fluent-kde { src = inputs.topInputs.fluent-kde; };
+  pyreadline3 = inputs.pkgs.python3Packages.callPackage ./pyreadline3.nix {};
+  torchdata = inputs.pkgs.python3Packages.callPackage ./torchdata.nix {};
+  torchtext = inputs.pkgs.python3Packages.callPackage ./torchtext.nix { inherit torchdata; };
   blurred-wallpaper = inputs.pkgs.callPackage ./blurred-wallpaper.nix { src = inputs.topInputs.blurred-wallpaper; };
-  slate = inputs.pkgs.callPackage ./slate { src = inputs.topInputs.slate; };
-  nvhpc = inputs.pkgs.callPackage ./nvhpc {};
-  lmod = inputs.pkgs.callPackage ./lmod { src = inputs.topInputs.lmod; };
+  slate = inputs.pkgs.callPackage ./slate.nix { src = inputs.topInputs.slate; };
+  nvhpc = inputs.pkgs.callPackage ./nvhpc.nix {};
+  lmod = inputs.pkgs.callPackage ./lmod.nix { src = inputs.topInputs.lmod; };
   vasp = rec
   {
     src = inputs.pkgs.callPackage ./vasp/source.nix {};
     gnu = inputs.pkgs.callPackage ./vasp/gnu
     {
       inherit (inputs.pkgs.llvmPackages) openmp;
-      inherit wannier90 src;
+      inherit src;
       hdf5 = inputs.pkgs.hdf5.override { mpiSupport = true; fortranSupport = true; cppSupport = false; };
     };
     nvidia = inputs.pkgs.callPackage ./vasp/nvidia
-      { inherit lmod nvhpc wannier90 vtst src; hdf5 = hdf5-nvhpc; };
+      { inherit lmod nvhpc vtst src; hdf5 = hdf5-nvhpc; };
     intel = inputs.pkgs.callPackage ./vasp/intel
-      { inherit lmod oneapi wannier90 vtst src; hdf5 = hdf5-oneapi; };
-    wannier90 = inputs.pkgs.callPackage
-      "${inputs.topInputs.nixpkgs-unstable}/pkgs/by-name/wa/wannier90/package.nix" {};
+      { inherit lmod oneapi vtst src; hdf5 = hdf5-oneapi; };
     hdf5-nvhpc = inputs.pkgs.callPackage ./vasp/hdf5-nvhpc { inherit lmod nvhpc; inherit (inputs.pkgs.hdf5) src; };
     hdf5-oneapi = inputs.pkgs.callPackage ./vasp/hdf5-oneapi { inherit lmod oneapi; inherit (inputs.pkgs.hdf5) src; };
     vtst = (inputs.pkgs.callPackage ./vasp/vtst.nix {});
     vtstscripts = inputs.pkgs.callPackage ./vasp/vtstscripts.nix {};
   };
   # TODO: use other people packaged hpc version
-  oneapi = inputs.pkgs.callPackage ./oneapi {};
-  mumax = inputs.pkgs.callPackage ./mumax { src = inputs.topInputs.mumax; };
-  kylin-virtual-keyboard = inputs.pkgs.libsForQt5.callPackage ./kylin-virtual-keyboard
+  oneapi = inputs.pkgs.callPackage ./oneapi.nix {};
+  mumax = inputs.pkgs.callPackage ./mumax.nix { src = inputs.topInputs.mumax; };
+  kylin-virtual-keyboard = inputs.pkgs.libsForQt5.callPackage ./kylin-virtual-keyboard.nix
     { src = inputs.topInputs.kylin-virtual-keyboard; };
   biu = inputs.pkgs.callPackage ./biu { inherit nameof zpp-bits; };
-  zxorm = inputs.pkgs.callPackage ./zxorm { src = inputs.topInputs.zxorm; };
-  hpcstat = inputs.pkgs.callPackage ./hpcstat { inherit nameof sqlite-orm zpp-bits date openxlsx biu; };
-  openxlsx = inputs.pkgs.callPackage ./openxlsx { src = inputs.topInputs.openxlsx; };
-  sqlite-orm = inputs.pkgs.callPackage ./sqlite-orm { src = inputs.topInputs.sqlite-orm; };
+  zxorm = inputs.pkgs.callPackage ./zxorm.nix { src = inputs.topInputs.zxorm; };
+  hpcstat = inputs.pkgs.callPackage ./hpcstat
+    { inherit sqlite-orm date biu openxlsx; stdenv = inputs.pkgs.gcc14Stdenv; };
+  openxlsx = inputs.pkgs.callPackage ./openxlsx.nix { src = inputs.topInputs.openxlsx; };
+  sqlite-orm = inputs.pkgs.callPackage ./sqlite-orm.nix { src = inputs.topInputs.sqlite-orm; };
   mkPnpmPackage = inputs.pkgs.callPackage ./mkPnpmPackage.nix {};
-  nodejs-with-pnpm9 = inputs.pkgs.callPackage ./nodejs-with-pnpm9.nix {};
   sbatch-tui = inputs.pkgs.callPackage ./sbatch-tui { inherit biu; };
   ufo = inputs.pkgs.callPackage ./ufo
     { inherit concurrencpp biu glad matplotplusplus zpp-bits; tbb = inputs.pkgs.tbb_2021_11; };
+  chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; };
+  winjob = inputs.pkgs.callPackage ./winjob { stdenv = inputs.pkgs.gcc14Stdenv; };
+  sockpp = inputs.pkgs.callPackage ./sockpp.nix { src = inputs.topInputs.sockpp; };
 
   fromYaml = content: builtins.fromJSON (builtins.readFile
     (inputs.pkgs.runCommand "toJSON" {}

local/pkgs/fluent-kde/default.nix

@@ -1,22 +0,0 @@
-{ lib, stdenv, src }: stdenv.mkDerivation
-{
-  name = "fluent-kde";
-  inherit src;
-  installPhase =
-  ''
-    mkdir -p $out/share/aurorae/themes
-    cp -r $src/aurorae/* $out/share/aurorae/themes
-    mkdir -p $out/share/color-schemes
-    cp -r $src/color-schemes/*.colors $out/share/color-schemes
-    mkdir -p $out/share/Kvantum
-    cp -r $src/Kvantum/Fluent* $out/share/Kvantum
-    mkdir -p $out/share/plasma/desktoptheme
-    cp -r $src/plasma/desktoptheme/* $out/share/plasma/desktoptheme
-    mkdir -p $out/share/plasma/layout-templates
-    cp -r $src/plasma/layout-templates/* $out/share/plasma/layout-templates
-    mkdir -p $out/share/plasma/look-and-feel
-    cp -r $src/plasma/look-and-feel/com.github.vinceliuice.Fluent* $out/share/plasma/look-and-feel
-    mkdir -p $out/share/wallpapers
-    cp -r $src/wallpaper/* $out/share/wallpapers
-  '';
-}

local/pkgs/hpcstat/.clangd

@@ -1,3 +1,3 @@
 CompileFlags:
-  Add: [ -Wall, -Wextra, -std=c++23 ]
+  Add: [ -Wall, -Wextra, -std=c++26 ]
   Compiler: g++

local/pkgs/hpcstat/CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.14)
+# cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.29)
 project(hpcstat VERSION 0.0.0 LANGUAGES CXX)
 enable_testing()
 include(GNUInstallDirs)
@@ -14,22 +15,21 @@ set(HPCSTAT_VERSION "unknown" CACHE STRING "Version of the hpcstat")
 find_package(Boost REQUIRED COMPONENTS headers filesystem)
 find_package(SqliteOrm REQUIRED)
 find_package(nlohmann_json REQUIRED)
-find_path(ZPP_BITS_INCLUDE_DIR zpp_bits.h REQUIRED)
 find_package(range-v3 REQUIRED)
-find_path(NAMEOF_INCLUDE_DIR nameof.hpp REQUIRED)
 find_package(date REQUIRED)
-find_package(OpenXLSX REQUIRED)
 find_package(httplib REQUIRED)
 find_package(termcolor REQUIRED)
 find_package(biu REQUIRED)
+find_package(OpenXLSX REQUIRED)
 
 add_executable(hpcstat src/main.cpp src/env.cpp src/keys.cpp src/ssh.cpp src/sql.cpp src/lfs.cpp src/common.cpp
   src/push.cpp src/disk.cpp)
-target_compile_features(hpcstat PRIVATE cxx_std_23)
-target_include_directories(hpcstat PRIVATE ${PROJECT_SOURCE_DIR}/include ${ZPP_BITS_INCLUDE_DIR})
+# target_compile_features(hpcstat PRIVATE cxx_std_26)
+target_compile_options(hpcstat PRIVATE "-std=c++26")
+target_include_directories(hpcstat PRIVATE ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(hpcstat PRIVATE Boost::headers Boost::filesystem sqlite_orm::sqlite_orm
-  nlohmann_json::nlohmann_json range-v3::range-v3 date::date date::date-tz OpenXLSX::OpenXLSX httplib::httplib
-  termcolor::termcolor biu::biu)
+  nlohmann_json::nlohmann_json range-v3::range-v3 date::date date::date-tz httplib::httplib
+  termcolor::termcolor biu::biu OpenXLSX::OpenXLSX)
 target_compile_definitions(hpcstat PRIVATE HPCSTAT_VERSION="${HPCSTAT_VERSION}")
 
 install(TARGETS hpcstat RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

local/pkgs/hpcstat/default.nix

@@ -1,13 +1,12 @@
 {
   stdenv, cmake, pkg-config, standalone ? false, version ? null, makeWrapper, lib,
-  boost, fmt, sqlite-orm, nlohmann_json, zpp-bits, range-v3, nameof, openssh, sqlite, date, openxlsx, httplib, openssl,
-  termcolor, duc, biu
+  sqlite-orm, nlohmann_json, range-v3, openssh, sqlite, date, httplib, openssl, openxlsx, termcolor, duc, biu
 }: stdenv.mkDerivation
 {
   name = "hpcstat";
   src = ./.;
   buildInputs =
-    [ boost fmt sqlite-orm nlohmann_json zpp-bits range-v3 nameof sqlite date openxlsx httplib termcolor openssl biu ];
+    [ sqlite-orm nlohmann_json range-v3 sqlite date httplib termcolor openssl biu openxlsx ];
   nativeBuildInputs = [ cmake pkg-config makeWrapper ];
   cmakeFlags = lib.optionals (version != null) [ "-DHPCSTAT_VERSION=${version}" ];
   postInstall =

local/pkgs/hpcstat/include/hpcstat/common.hpp

@@ -15,7 +15,6 @@
 # include <date/date.h>
 # include <date/tz.h>
 # include <boost/interprocess/sync/file_lock.hpp>
-# include <zpp_bits.h>
 # include <biu.hpp>
 
 namespace hpcstat

local/pkgs/hpcstat/include/hpcstat/disk.hpp

@@ -11,6 +11,8 @@ namespace hpcstat::disk
     std::string Time;
     using serialize = zpp::bits::members<4>;
   };
-  // 刷新 duc 数据库，并读取
-  std::optional<Usage> stat();
+  // 刷新 duc 数据库
+  bool stat();
+  // 从 duc 数据库中读取数据
+  std::optional<Usage> get();
 }

local/pkgs/hpcstat/include/hpcstat/sql.hpp

@@ -62,12 +62,10 @@ namespace hpcstat::sql
   // 三个字符串分别是序列化后的数据，签名，指纹
   std::optional<std::vector<std::tuple<std::string, std::string, std::string>>>
     verify(std::string old_db, std::string new_db);
-  // 将某个月份的数据导出到文件
+  // 将某个月份的数据导出
   bool export_data(long start_time, long end_time, std::string filename);
   // 检查任务状态，返回有变化的任务 id、名称、现在的状态、提交时的 key、subaccount
   // 如果没有找到提交时的信息，则忽略这个任务
   std::optional<std::map<unsigned, std::tuple<std::string, std::string, std::string, std::optional<std::string>>>>
     check_job_status();
-  // 获取最新的磁盘使用情况
-  std::optional<std::string> get_disk();
 }

local/pkgs/hpcstat/src/disk.cpp

@@ -20,7 +20,29 @@ namespace hpcstat::disk
     { "zhanhuahan", false }
   };
 
-  std::optional<Usage> stat()
+  bool stat()
+  {
+    if (auto homedir = env::env("HOME"); !homedir)
+      { std::cerr << "HOME not set\n"; return false; }
+    else if (auto ducbindir = env::env("HPCSTAT_DUC_BINDIR"); !ducbindir)
+      { std::cerr << "HPCSTAT_DUC_BINDIR not set\n"; return false; }
+    else if (auto datadir = env::env("HPCSTAT_DATADIR"); !datadir)
+      { std::cerr << "HPCSTAT_DATADIR not set\n"; return false; }
+    else if
+    (
+      auto result = biu::exec<{.DirectStdout = true, .DirectStderr = true}>
+      ({
+        // duc index -d ./duc.db -p ~
+        "{}/duc"_f(*ducbindir),
+        { "index", "-d", "{}/duc.db"_f(*datadir), "-p", *homedir }
+      });
+      !result
+    )
+      { std::cerr << "failed to index\n"; return false; }
+    else return true;
+  }
+
+  std::optional<Usage> get()
   {
     if (auto homedir = env::env("HOME"); !homedir)
       { std::cerr << "HOME not set\n"; return {}; }
@@ -28,17 +50,6 @@ namespace hpcstat::disk
       { std::cerr << "HPCSTAT_DUC_BINDIR not set\n"; return {}; }
     else if (auto datadir = env::env("HPCSTAT_DATADIR"); !datadir)
       { std::cerr << "HPCSTAT_DATADIR not set\n"; return {}; }
-    else if
-    (
-      auto result = biu::exec
-      (
-        // duc index -d ./duc.db -p ~
-        "{}/duc"_f(*ducbindir),
-        { "index", "-d", "{}/duc.db"_f(*datadir), "-p", *homedir }
-      );
-      !result
-    )
-      { std::cerr << "failed to index\n"; return {}; }
     else
     {
       auto get_size  = [&](std::optional<std::string> path) -> std::optional<double>
@@ -46,14 +57,14 @@ namespace hpcstat::disk
         if
         (
           auto result = biu::exec
-          (
+          ({
             // duc ls -d ./duc.db -b -D /data/gpfs01/jykang/linwei/xxx
             "{}/duc"_f(*ducbindir),
             {
               "ls", "-d", "{}/duc.db"_f(*datadir), "-b", "-D",
               "{}{}{}"_f(*homedir, path ? "/" : "", path.value_or(""))
             }
-          );
+          });
           !result
         )
           { std::cerr << "failed to ls {}\n"_f(path); return {}; }
@@ -79,7 +90,7 @@ namespace hpcstat::disk
         (
           // duc info -d ./duc.db
           auto result = biu::exec
-            ("{}/duc"_f(*ducbindir), { "info", "-d", "{}/duc.db"_f(*datadir) });
+            ({"{}/duc"_f(*ducbindir), { "info", "-d", "{}/duc.db"_f(*datadir) }});
           !result
         )
           { std::cerr << "failed to get duc info\n"; return {}; }
@@ -87,7 +98,7 @@ namespace hpcstat::disk
         {
           std::smatch match;
           // search string like 2024-06-08 13:45:19
-          if (!std::regex_search(result.Stdout, match, std::regex(R"((\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}))")))
+          if (!std::regex_search(result.Stdout, match, R"((\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}))"_re))
             { std::cerr << "failed to parse {}\n"_f(result.Stdout); return {}; }
           return match[1];
         }

local/pkgs/hpcstat/src/lfs.cpp

@@ -27,7 +27,7 @@ namespace hpcstat::lfs
         }
         else break;
       }
-      if (auto result = biu::exec(*bsub, args); !result) return std::nullopt;
+      if (auto result = biu::exec({*bsub, args}); !result) return std::nullopt;
       else
       {
         // Job <462270> is submitted to queue <normal_1day>.
@@ -45,10 +45,11 @@ namespace hpcstat::lfs
     if
     (
       auto result = biu::exec<{.SearchPath = true}>
-      (
-        "bjobs", { "-a", "-o", "jobid submit_time stat cpu_used job_name", "-json" },
-        {}, { { "LSB_DISPLAY_YEAR", "Y" } }
-      );
+      ({
+        .Program="bjobs",
+        .Args={ "-a", "-o", "jobid submit_time stat cpu_used job_name", "-json" },
+        .ExtraEnv={ { "LSB_DISPLAY_YEAR", "Y" } }
+      });
       !result
     )
       return std::nullopt;
@@ -79,7 +80,11 @@ namespace hpcstat::lfs
   }
   std::optional<std::string> bjobs_detail(unsigned jobid)
   {
-    if (auto result = biu::exec<{.SearchPath = true}>("bjobs", { "-l", "{}"_f(jobid) }); !result)
+    if
+    (
+      auto result = biu::exec<{.SearchPath = true}>({"bjobs", { "-l", "{}"_f(jobid) }});
+      !result
+    )
       return std::nullopt;
     else return result.Stdout;
   }

local/pkgs/hpcstat/src/main.cpp

@@ -7,7 +7,6 @@
 # include <hpcstat/disk.hpp>
 # include <range/v3/view.hpp>
 # include <boost/exception/diagnostic_information.hpp>
-# include <boost/filesystem.hpp>
 # include <termcolor/termcolor.hpp>
 
 int main(int argc, const char** argv)
@@ -16,10 +15,6 @@ int main(int argc, const char** argv)
   using namespace std::literals;
   try
   {
-    auto lockfile = (boost::filesystem::temp_directory_path() / "hpcstat.lock").string();
-    std::ofstream{lockfile};
-    boost::interprocess::file_lock lock(lockfile.c_str());
-
     std::vector<std::string> args(argv, argv + argc);
 
     if (args.size() == 1)
@@ -27,11 +22,7 @@ int main(int argc, const char** argv)
       std::cout << "Usage: hpcstat initdb|login|logout|submitjob|finishjob|verify|export|version|diskstat\n";
       return 1;
     }
-    else if (args[1] == "initdb")
-    {
-      lock.lock();
-      if (!sql::initdb()) { std::cerr << "Failed to initialize database\n"; return 1; }
-    }
+    else if (args[1] == "initdb") { if (!sql::initdb()) { std::cerr << "Failed to initialize database\n"; return 1; } }
     else if (args[1] == "login")
     {
       if (env::interactive()) std::cout << "Communicating with the agent..." << std::flush;
@@ -50,18 +41,16 @@ int main(int argc, const char** argv)
         auto signature = ssh::sign(biu::serialize<char>(data), *fp);
         if (!signature) return 1;
         data.Signature = *signature;
-        lock.lock();
         sql::writedb(data);
         if (env::interactive())
         {
           std::cout << "\33[2K\rLogged in as {} (Fingerprint: SHA256:{}{}).\n"_f
             (Keys[*fp].Username, *fp, sub_account ? " Subaccount {}"_f(*sub_account) : "");
-          if (auto sql_data = sql::get_disk(); !sql_data)
+          if (auto disk_stat = disk::get(); !disk_stat)
             std::cerr << "Failed to get disk usage statistic.\n";
           else
           {
-            auto disk_stat = biu::deserialize<disk::Usage>(*sql_data);
-            double percent = disk_stat.Total / 800 * 100;
+            double percent = disk_stat->Total / 800 * 100;
             auto color = percent > 95 ? termcolor::red<char> :
               percent > 80 ? termcolor::yellow<char> : termcolor::green<char>;
             auto bgcolor = percent > 95 ? termcolor::on_red<char> :
@@ -69,15 +58,15 @@ int main(int argc, const char** argv)
             std::cout
               << color << "disk usage: " << termcolor::reset
               << bgcolor << termcolor::white
-                << "{:.1f}% ({:.1f}GB / ~800GB)"_f(percent, disk_stat.Total) << termcolor::reset
-              << color << " (estimated, counted at {})\n"_f(disk_stat.Time) << termcolor::reset;
+                << "{:.1f}% ({:.1f}GB / ~800GB)"_f(percent, disk_stat->Total) << termcolor::reset
+              << color << " (estimated, counted at {})\n"_f(disk_stat->Time) << termcolor::reset;
             if (percent > 80)
             {
               std::cout << color << "Top 3 directories owned by teacher:\n";
-              for (auto& [name, size] : disk_stat.Teacher | ranges::views::take(3))
+              for (auto& [name, size] : disk_stat->Teacher | ranges::views::take(3))
                 std::cout << "  {:.1f}GB {}\n"_f(size, name);
               std::cout << color << "Top 3 directories owned by student:\n";
-              for (auto& [name, size] : disk_stat.Student | ranges::views::take(3))
+              for (auto& [name, size] : disk_stat->Student | ranges::views::take(3))
                 std::cout << "  {:.1f}GB {}\n"_f(size, name);
               std::cout << termcolor::reset;
             }
@@ -89,7 +78,7 @@ int main(int argc, const char** argv)
     {
       if (auto session_id = env::env("XDG_SESSION_ID", true); !session_id)
         return 1;
-      else { lock.lock(); sql::writedb(sql::LogoutData{ .Time = now(), .SessionId = *session_id }); }
+      else sql::writedb(sql::LogoutData{ .Time = now(), .SessionId = *session_id });
     }
     else if (args[1] == "submitjob")
     {
@@ -112,14 +101,12 @@ int main(int argc, const char** argv)
         auto signature = ssh::sign(biu::serialize<char>(data), *fp);
         if (!signature) return 1;
         data.Signature = *signature;
-        lock.lock();
         sql::writedb(data);
         std::cout << "Job <{}> was submitted to <{}> by <{}>.\n"_f(bsub->first, bsub->second, Keys[*fp].Username);
       }
     }
     else if (args[1] == "finishjob")
     {
-      lock.lock();
       if (auto fp = ssh::fingerprint(); !fp) return 1;
       else if (auto session = env::env("XDG_SESSION_ID", true); !session)
         return 1;
@@ -167,35 +154,16 @@ int main(int argc, const char** argv)
       auto begin = sys_seconds(sys_days(month(month_n) / 1 / year_n)).time_since_epoch().count();
       auto end = sys_seconds(sys_days(month(month_n) / 1 / year_n + months(1)))
         .time_since_epoch().count();
-      lock.lock();
-      if (!sql::export_data(begin, end, "hpcstat-{}-{}.xlsx"_f(year_n, month_n)))
-        return 1;
+      if (!sql::export_data(begin, end, "{}{}.xlsx"_f(year_n, month_n))) return 1;
     }
     else if (args[1] == "push")
     {
-      lock.lock();
       if (auto jobs = sql::check_job_status(); !jobs) return 1;
       else if (!push::push(*jobs)) return 1;
     }
     else if (args[1] == "version") { std::cout << HPCSTAT_VERSION << std::endl; }
     else if (args[1] == "diskstat")
-    {
-      auto stat_thread = std::async(std::launch::async, []{ return disk::stat(); });
-      std::cout << "Waiting for disk usage statistic to be collected... 0s" << std::flush;
-      for (unsigned i = 1; stat_thread.wait_for(1s) != std::future_status::ready; i++)
-        std::cout << "\rWaiting for disk usage statistic to be collected... {}s"_f(i) << std::flush;
-      if (!stat_thread.get()) { std::cerr << "Failed to collect disk usage statistic.\n"; return 1; }
-      else
-      {
-        lock.lock();
-        if
-        (
-          auto write_result = sql::writedb(sql::DiskData{.Data = biu::serialize<char>(*stat_thread.get())});
-          !write_result
-        )
-          { std::cerr << "Failed to write disk usage statistic to database.\n"; return 1; }
-      }
-    }
+      { if (!disk::stat()) { std::cerr << "Failed to collect disk usage statistic.\n"; return 1; } }
     else { std::cerr << "Unknown command.\n"; return 1; }
   }
   catch (...) { std::cerr << boost::current_exception_diagnostic_information() << std::endl; return 1; }

local/pkgs/hpcstat/src/sql.cpp

@@ -8,14 +8,16 @@
 # define SQLITE_ORM_OPTIONAL_SUPPORTED
 # include <sqlite_orm/sqlite_orm.h>
 # include <OpenXLSX.hpp>
+# include <boost/filesystem.hpp>
 
 namespace hpcstat::sql
 {
-  auto connect(std::optional<std::string> dbfile = std::nullopt)
+  auto connect(std::optional<std::string> dbfile = std::nullopt, bool need_lock = true)
   {
-    auto conn = [&]() { return std::make_optional(sqlite_orm::make_storage
+    // a function to actually connecto to db
+    auto conn = [](std::string dbfile) { return std::make_optional(sqlite_orm::make_storage
     (
-      *dbfile,
+      dbfile,
       sqlite_orm::make_table
       (
         "login",
@@ -68,40 +70,54 @@ namespace hpcstat::sql
         sqlite_orm::make_column("id", &CheckJobData::Id, sqlite_orm::primary_key().autoincrement()),
         sqlite_orm::make_column("job_id", &CheckJobData::JobId),
         sqlite_orm::make_column("status", &CheckJobData::Status)
-      ),
-      sqlite_orm::make_table
-      (
-        "disk",
-        sqlite_orm::make_column("id", &DiskData::Id, sqlite_orm::primary_key().autoincrement()),
-        sqlite_orm::make_column("data", &DiskData::Data)
       )
     ));};
+
+    // a class to take care of lock
+    struct conn_with_lock
+    {
+      // lock should be declared before conn, so that it will be destructed after conn
+      boost::interprocess::file_lock lock;
+      decltype(conn(std::declval<std::string>())) connection;
+    };
+
+    // set default db path
     if (!dbfile)
     {
       if (auto datadir = env::env("HPCSTAT_DATADIR", true); !datadir)
-        return decltype(conn())();
+        return conn_with_lock{};
       else dbfile = std::filesystem::path(*datadir) / "hpcstat.db";
     }
-    auto result = conn();
-    if (!result) std::cerr << "Failed to connect to database.\n";
-    else result->busy_timeout(10000);
-    return result;
+
+    // set file lock
+    auto lockfile = (boost::filesystem::temp_directory_path() / "hpcstat.lock").string();
+    std::ofstream{lockfile};  // create file
+    boost::interprocess::file_lock lock(lockfile.c_str());
+    if (need_lock) lock.lock();
+
+    // try to connect
+    if (auto result = conn(*dbfile); !result)
+      { std::cerr << "Failed to connect to database.\n"; return conn_with_lock{}; }
+    else
+    {
+      result->busy_timeout(10000);
+      return conn_with_lock{std::move(lock), std::move(result)};
+    }
   }
   bool initdb()
   {
-    if (auto conn = connect(); !conn) return false;
+    if (auto [lock, conn] = connect(); !conn) return false;
     else { conn->sync_schema(); return true; }
   }
   bool writedb(auto value)
-    { if (auto conn = connect(); !conn) return false; else { conn->insert(value); return true; } }
+    { if (auto [lock, conn] = connect(); !conn) return false; else { conn->insert(value); return true; } }
   template bool writedb(LoginData);
   template bool writedb(LogoutData);
   template bool writedb(SubmitJobData);
   template bool writedb(FinishJobData);
-  template bool writedb(DiskData);
   std::optional<std::set<unsigned>> finishjob_remove_existed(std::map<unsigned, std::string> jobid_submit_time)
   {
-    if (auto conn = connect(); !conn) return std::nullopt;
+    if (auto [lock, conn] = connect(); !conn) return std::nullopt;
     else
     {
       auto all_job = jobid_submit_time | ranges::views::keys | ranges::to<std::vector<unsigned>>;
@@ -117,7 +133,8 @@ namespace hpcstat::sql
   std::optional<std::vector<std::tuple<std::string, std::string, std::string>>>
     verify(std::string old_db, std::string new_db)
   {
-    auto old_conn = connect(old_db), new_conn = connect(new_db);
+    auto [_, old_conn] = connect(old_db);
+    auto [_, new_conn] = connect(new_db);
     if (!old_conn || !new_conn) { std::cerr << "Failed to connect to database.\n"; return std::nullopt; }
     else
     {
@@ -160,7 +177,8 @@ namespace hpcstat::sql
     }
   }
   // search corresponding job in submit table
-  std::optional<SubmitJobData> search_job_in_submit(auto connection, unsigned job_id, std::string submit_time)
+  std::optional<SubmitJobData> search_job_in_submit
+    (auto connection, unsigned job_id, std::string submit_time)
   {
     std::optional<SubmitJobData> result;
     long submit_date = [&]
@@ -192,27 +210,28 @@ namespace hpcstat::sql
   }
   bool export_data(long start_time, long end_time, std::string filename)
   {
-    if (auto conn = connect(); !conn) return false;
+    if (auto [lock, conn] = connect(); !conn) return false;
     else
     {
-      struct StatResult
+      // 对于一个账户的总计
+      struct StatAccount
       {
         double CpuTime = 0;
-        unsigned LoginInteractive = 0, LoginNonInteractive = 0, SubmitJob = 0, FinishJobSuccess = 0,
-          FinishJobFailed = 0;
-        StatResult& operator+=(const StatResult& rhs)
-        {
-          CpuTime += rhs.CpuTime;
-          LoginInteractive += rhs.LoginInteractive;
-          LoginNonInteractive += rhs.LoginNonInteractive;
-          SubmitJob += rhs.SubmitJob;
-          FinishJobSuccess += rhs.FinishJobSuccess;
-          FinishJobFailed += rhs.FinishJobFailed;
-          return *this;
-        }
+        unsigned LoginInteractive = 0, LoginNonInteractive = 0, FinishJobSuccess = 0, FinishJobFailed = 0;
       };
-      // Key SubAccount -> StatResult
-      std::map<std::pair<std::string, std::optional<std::string>>, StatResult> stat;
+      // Key SubAccount -> StatAccount
+      std::map<std::pair<std::string, std::string>, StatAccount> stat_subaccount;
+      // Key -> StatAccount
+      std::map<std::optional<std::string>, StatAccount> stat_account;
+      // 每一个任务
+      struct StatJob
+      {
+        unsigned JobId;
+        std::optional<std::string> Key, SubmitDir, JobCommand;
+        std::string JobResult, SubmitTime, JobDetail;
+        double CpuTime;
+      };
+      std::vector<StatJob> stat_job;
       // CpuTime & FinishJobSuccess & FinishJobFailed
       for
       (
@@ -220,14 +239,37 @@ namespace hpcstat::sql
           (sqlite_orm::between(&FinishJobData::Time, start_time, end_time)))
       )
       {
-        auto job_in_submit = search_job_in_submit
-          (conn, it.JobId, it.SubmitTime);
-        std::pair<std::string, std::optional<std::string>> key;
-        if (!job_in_submit) key = { "", {} };
-        else key = std::make_pair(job_in_submit->Key, job_in_submit->Subaccount);
-        stat[key].CpuTime += it.CpuTime / 3600;
-        if (it.JobResult == "DONE") stat[key].FinishJobSuccess++;
-        else stat[key].FinishJobFailed++;
+        stat_job.push_back
+        ({
+          .JobId = it.JobId, .JobResult = it.JobResult, .SubmitTime = it.SubmitTime, .JobDetail = it.JobDetail,
+          .CpuTime = it.CpuTime / 3600
+        });
+        if (auto job_in_submit = search_job_in_submit
+          (conn, it.JobId, it.SubmitTime))
+        {
+          {
+            auto& _ = stat_job.back();
+            _.Key = job_in_submit->Key;
+            _.SubmitDir = job_in_submit->SubmitDir;
+            _.JobCommand = job_in_submit->JobCommand;
+          }
+          stat_account[job_in_submit->Key].CpuTime += it.CpuTime / 3600;
+          if (it.JobResult == "DONE") stat_account[job_in_submit->Key].FinishJobSuccess++;
+          else stat_account[job_in_submit->Key].FinishJobFailed++;
+          if (job_in_submit->Subaccount)
+          {
+            stat_subaccount[{job_in_submit->Key, *job_in_submit->Subaccount}].CpuTime += it.CpuTime / 3600;
+            if (it.JobResult == "DONE")
+              stat_subaccount[{job_in_submit->Key, *job_in_submit->Subaccount}].FinishJobSuccess++;
+            else stat_subaccount[{job_in_submit->Key, *job_in_submit->Subaccount}].FinishJobFailed++;
+          }
+        }
+        else
+        {
+          stat_account[std::nullopt].CpuTime += it.CpuTime / 3600;
+          if (it.JobResult == "DONE") stat_account[std::nullopt].FinishJobSuccess++;
+          else stat_account[std::nullopt].FinishJobFailed++;
+        }
       }
       // LoginInteractive & LoginNonInteractive
       for
@@ -236,61 +278,58 @@ namespace hpcstat::sql
           (sqlite_orm::between(&LoginData::Time, start_time, end_time)))
       )
       {
-        auto key = std::make_pair(it.Key, it.Subaccount);
-        if (it.Interactive) stat[key].LoginInteractive++; else stat[key].LoginNonInteractive++;
+        if (Keys[it.Key].Username == "hpcstat") continue;
+        if (it.Interactive) stat_account[it.Key].LoginInteractive++; else stat_account[it.Key].LoginNonInteractive++;
+        if (it.Subaccount)
+        {
+          if (it.Interactive) stat_subaccount[{it.Key, *it.Subaccount}].LoginInteractive++;
+          else stat_subaccount[{it.Key, *it.Subaccount}].LoginNonInteractive++;
+        }
       }
-      // SubmitJob
-      for
-      (
-        auto& it : conn->get_all<SubmitJobData>(sqlite_orm::where
-          (sqlite_orm::between(&SubmitJobData::Time, start_time, end_time)))
-      )
-        stat[{it.Key,it.Subaccount }].SubmitJob++;
-      // add all result with subaccount into result without subaccount
-      std::map<std::string, StatResult> stat_without_subaccount;
-      for (auto& [key, value] : stat) stat_without_subaccount[key.first] += value;
-      // remove all result without subaccount
-      std::erase_if(stat, [](auto& it) { return !it.first.second; });
-      // write to excel
+      // export to markdown
+      std::cout << "| 账号 | 使用核时 | 登陆次数(总计/交互式/非交互式) | 完成任务(总计/成功/失败) | SSH密钥编号::指纹 |\n";
+      std::cout << "| :--: | :--: | :--: | :--: | :--: |\n";
+      std::vector<std::pair<std::optional<std::string>, StatAccount>> stat_account_vector
+        (stat_account.begin(), stat_account.end());
+      auto compare = [](auto& a, auto& b)
+      {
+        if (a.first)
+          { if (b.first) return Keys[*a.first].PubkeyFilename < Keys[*b.first].PubkeyFilename; else return true; }
+        else return false;
+      };
+      std::sort(stat_account_vector.begin(), stat_account_vector.end(), compare);
+      for (auto& [key, stat] : stat_account_vector)
+        std::cout << "| {} | {:.2f} | {}/{}/{} | {}/{}/{} | `{}` |\n"_f
+        (
+          key ? Keys[*key].Username : "(unknown)", stat.CpuTime,
+          stat.LoginInteractive + stat.LoginNonInteractive, stat.LoginInteractive, stat.LoginNonInteractive,
+          stat.FinishJobSuccess + stat.FinishJobFailed, stat.FinishJobSuccess, stat.FinishJobFailed,
+          key ? "{}::SHA256:{}"_f(Keys[*key].PubkeyFilename, *key) : "(unknown)"
+        );
+      for (auto& [key_subaccount, stat] : stat_subaccount)
+        std::cout << "| {}::{} | {:.2f} | {} | {} | {} | {} | `{}::{}` |\n"_f
+        (
+          Keys[key_subaccount.first].Username, key_subaccount.second, stat.CpuTime,
+          stat.LoginInteractive, stat.LoginNonInteractive, stat.FinishJobSuccess, stat.FinishJobFailed,
+          Keys[key_subaccount.first].PubkeyFilename, key_subaccount.first
+        );
+      // export to excel
       OpenXLSX::XLDocument doc;
       doc.create(filename);
-      doc.workbook().addWorksheet("Statistics");
-      auto wks1 = doc.workbook().worksheet("Statistics");
+      auto wks1 = doc.workbook().worksheet("Sheet1");
       wks1.row(1).values() = std::vector<std::string>
       {
-        "Username", "FingerPrint", "CpuTime", "LoginInteractive", "LoginNonInteractive",
-        "SubmitJob", "FinishJobSuccess", "FinishJobFailed"
+        "用户", "任务ID", "结果", "核时", "提交时间", "提交时当前目录", "提交命令",
+        "详情"
       };
-      for
-      (
-        auto [row, it] = std::tuple(2, stat_without_subaccount.begin());
-        it != stat_without_subaccount.end();
-        it++, row++
-      )
+      for (auto [row, it] = std::tuple(2, stat_job.begin()); it != stat_job.end(); it++, row++)
         wks1.row(row).values() = std::vector<std::string>
         {
-          Keys.contains(it->first) ? Keys[it->first].Username : "(unknown)", it->first,
-          "{:.2f}"_f(it->second.CpuTime), "{}"_f(it->second.LoginInteractive),
-          "{}"_f(it->second.LoginNonInteractive), "{}"_f(it->second.SubmitJob),
-          "{}"_f(it->second.FinishJobSuccess), "{}"_f(it->second.FinishJobFailed)
+          Keys.contains(*it->Key) ? Keys[*it->Key].Username : "(unknown)",
+          "{}"_f(it->JobId), it->JobResult, "{:.2f}"_f(it->CpuTime), it->SubmitTime,
+          it->SubmitDir.value_or("(unknown)"), it->JobCommand.value_or("(unknown)"),
+          it->JobDetail
         };
-      doc.workbook().addWorksheet("StatisticsWithSubAccount");
-      auto wks2 = doc.workbook().worksheet("StatisticsWithSubAccount");
-      wks2.row(1).values() = std::vector<std::string>
-      {
-        "Username::SubAccount", "CpuTime", "LoginInteractive", "LoginNonInteractive",
-        "SubmitJob", "FinishJobSuccess", "FinishJobFailed"
-      };
-      for (auto [row, it] = std::tuple(2, stat.begin()); it != stat.end(); it++, row++)
-        wks2.row(row).values() = std::vector<std::string>
-        {
-          (Keys.contains(it->first.first) ? Keys[it->first.first].Username : "(unknown)")
-            + "::" + *it->first.second,
-          "{:.2f}"_f(it->second.CpuTime), "{}"_f(it->second.LoginInteractive),
-          "{}"_f(it->second.LoginNonInteractive), "{}"_f(it->second.SubmitJob),
-          "{}"_f(it->second.FinishJobSuccess), "{}"_f(it->second.FinishJobFailed)
-        };
-      doc.workbook().deleteSheet("Sheet1");
       doc.save();
       return true;
     }
@@ -298,7 +337,7 @@ namespace hpcstat::sql
   std::optional<std::map<unsigned, std::tuple<std::string, std::string, std::string, std::optional<std::string>>>>
     check_job_status()
   {
-    if (auto conn = connect(); !conn) return std::nullopt;
+    if (auto [lock, conn] = connect(); !conn) return std::nullopt;
     else if (auto jobs_current = lfs::bjobs_list(); !jobs_current) return std::nullopt;
     else
     {
@@ -326,16 +365,4 @@ namespace hpcstat::sql
       return result;
     }
   }
-  std::optional<std::string> get_disk()
-  {
-    if (auto conn = connect(); !conn) return {};
-    else if
-    (
-      auto result = 
-        conn->get_all<DiskData>(sqlite_orm::order_by(&DiskData::Id).desc(), sqlite_orm::limit(1));
-      result.size() != 1
-    )
-      return {};
-    else return result[0].Data;
-  }
 }

local/pkgs/hpcstat/src/ssh.cpp

@@ -12,7 +12,8 @@ namespace hpcstat::ssh
       return std::nullopt;
     else if
     (
-      auto output = biu::exec(std::filesystem::path(*sshbindir) / "ssh-add", { "-l" });
+      auto output = biu::exec
+        ({.Program=std::filesystem::path(*sshbindir) / "ssh-add", .Args{ "-l" }, .Timeout=10s});
       !output
     )
       { std::cerr << "Failed to get ssh fingerprints\n"; return std::nullopt; }
@@ -41,14 +42,15 @@ namespace hpcstat::ssh
     else if
     (
       auto output = biu::exec
-      (
-        std::filesystem::path(*sshbindir) / "ssh-keygen",
-        {
+      ({
+        .Program=std::filesystem::path(*sshbindir) / "ssh-keygen",
+        .Args={
           "-Y", "sign", "-q", "-f", "{}/keys/{}"_f(*sharedir, Keys[fingerprint].PubkeyFilename),
           "-n", "hpcstat@chn.moe", "-"
         },
-        message
-      );
+        .Stdin=message,
+        .Timeout=10s
+      });
       !output
     )
       { std::cerr << "Failed to sign message: {}\n"_f(message); return {}; }
@@ -68,15 +70,16 @@ namespace hpcstat::ssh
       auto signaturefile = tempdir / "signature";
       std::ofstream(signaturefile) << signature;
       auto result = biu::exec
-      (
-        std::filesystem::path(*sshbindir) / "ssh-keygen",
-        {
+      ({
+        .Program=std::filesystem::path(*sshbindir) / "ssh-keygen",
+        .Args={
           "-Y", "verify",
           "-f", "{}/keys/{}"_f(*sharedir, Keys[fingerprint].PubkeyFilename),
           "-n", "hpcstat@chn.moe", "-s", signaturefile.string()
         },
-        message
-      );
+        .Stdin=message,
+        .Timeout=10s
+      });
       std::filesystem::remove_all(tempdir.string());
       return result;
     }

local/pkgs/misskey.nix

@@ -1,11 +1,11 @@
 {
-  lib, mkPnpmPackage, nodejs, writeShellScript,
-  bash, cypress, vips, src
+  lib, mkPnpmPackage, nodejs, writeShellScript, src,
+  bash, cypress, vips, python3
 }: (mkPnpmPackage.override { inherit nodejs; })
   {
     inherit src;
     extraIntegritySha256."https://github.com/aiscript-dev/aiscript-languageserver/releases/download/0.1.6/aiscript-dev-aiscript-languageserver-0.1.6.tgz" = "0092d5r67bhf4xkvrdn4a2rm1drjzy7b5sw8mi7hp4pqvpc20ylr";
-    extraNativeBuildInputs = [ bash nodejs.pkgs.typescript nodejs.pkgs.gulp ];
+    extraNativeBuildInputs = [ bash nodejs.pkgs.typescript nodejs.pkgs.gulp python3 ];
     extraAttrs =
     {
       CYPRESS_INSTALL_BINARY = "0";

local/pkgs/nodejs-with-pnpm9.nix

@@ -1,15 +0,0 @@
-{ nodejs, fetchurl }: nodejs.overrideAttrs (prev:
-{
-  passthru.pkgs = prev.passthru.pkgs.extend (final: prev:
-  {
-    pnpm = prev.pnpm.override
-    {
-      version = "9.1.0";
-      src = fetchurl
-      {
-        url = "https://registry.npmjs.org/pnpm/-/pnpm-9.1.0.tgz";
-        sha512 = "Z/WHmRapKT5c8FnCOFPVcb6vT3U8cH9AyyK+1fsVeMaq07bEEHzLO6CzW+AD62IaFkcayDbIe+tT+dVLtGEnJA==";
-      };
-    };
-  });
-})

local/pkgs/sbatch-tui/src/main.cpp

@@ -16,16 +16,15 @@ int main()
   {
     int vasp_version_selected = 0;
     std::vector<std::string> vasp_version_entries = { "std", "gam", "ncl" };
-    int device_selected = 0;
-    std::vector<std::string> device_entries = []
-    {
-      std::vector<std::string> devices(Device.GpuIds.size() + 2);
-      for (std::size_t i = 0; i < Device.GpuIds.size(); ++i)
-        devices[i + 1] = Device.GpuIds[i];
-      devices[0] = "any single GPU";
-      devices.back() = "CPU";
-      return devices;
-    }();
+    int device_type_selected = 0;
+    std::vector<std::string> device_type_entries = { "any single GPU", "manually select GPU", "CPU" };
+    std::deque<bool> device_selected = std::deque<bool>(Device.GpuIds.size(), false);
+    std::vector<std::string> device_entries = Device.GpuIds;
+    std::string job_name = std::filesystem::current_path().filename().string();
+    std::string output_file = "output.txt";
+    std::string mpi_threads = std::to_string(Device.CpuMpiThreads);
+    std::string openmp_threads = std::to_string(Device.CpuOpenmpThreads);
+
     std::string user_command;
     std::string submit_command;
   } state;
@@ -45,6 +44,12 @@ int main()
     auto empty = ftxui::emptyElement() | ftxui::flex_grow;
     return ftxui::vbox(empty, ftxui::hbox(empty, element | ftxui::center, empty), empty);
   };
+  // 在组件左边增加分割线
+  auto with_separator = [](ftxui::Element element)
+    { return ftxui::hbox(ftxui::separatorLight(), element); };
+  // 在组件左边增加小标题
+  auto with_subtitle = [](std::string title)
+    { return [title](ftxui::Element element) { return ftxui::hbox(ftxui::text(title), element); }; };
 
   // 构建界面
   auto screen = ftxui::ScreenInteractive::Fullscreen();
@@ -52,8 +57,36 @@ int main()
   ({
     ftxui::Menu(&state.vasp_version_entries, &state.vasp_version_selected)
       | with_title("Select VASP version:"),
-    ftxui::Menu(&state.device_entries, &state.device_selected)
-      | with_title("Select device:"),
+    ftxui::Container::Horizontal
+    ({
+      ftxui::Menu(&state.device_type_entries, &state.device_type_selected),
+      ftxui::Container::Vertical([&]
+      {
+        std::vector<std::shared_ptr<ftxui::ComponentBase>> devices;
+        auto checkbox_option = ftxui::CheckboxOption::Simple();
+        checkbox_option.transform = [](const ftxui::EntryState& s)
+        {
+          auto prefix = ftxui::text(s.state ? "[X] " : "[ ] ");
+          auto t = ftxui::text(s.label);
+          if (s.active) t |= ftxui::bold;
+          if (s.focused) t |= ftxui::inverted;
+          return ftxui::hbox({prefix, t});
+        };
+        for (int i = 0; i < state.device_selected.size(); i++)
+          devices.push_back(ftxui::Checkbox
+            (state.device_entries[i], &state.device_selected[i], checkbox_option));
+        return devices;
+      }()) | with_separator | ftxui::Maybe([&]{ return state.device_type_selected == 1; }),
+      ftxui::Container::Vertical
+      ({
+        ftxui::Input(&state.mpi_threads) | ftxui::size(ftxui::WIDTH, ftxui::GREATER_THAN, 3)
+          | with_subtitle("MPI threads: "),
+        ftxui::Input(&state.openmp_threads) | ftxui::size(ftxui::WIDTH, ftxui::GREATER_THAN, 3)
+          | with_subtitle("OpenMP threads: ")
+      }) | with_separator | ftxui::Maybe([&]{ return state.device_type_selected == 2; }),
+    }) | with_title("Select device:"),
+    ftxui::Input(&state.job_name) | with_title("Job name:"),
+    ftxui::Input(&state.output_file) | with_title("Output file:"),
     ftxui::Container::Horizontal
     ({
       ftxui::Button("Continue",
@@ -82,43 +115,44 @@ int main()
   {
     // replace \n with space
     boost::replace_all(submit_command, "\n", " ");
-    biu::exec<{.DirectStdout = true, .DirectStderr = true, .SearchPath = true}>
-      ("sh", { "-c", submit_command });
+    biu::exec<{.DirectStdout = true, .DirectStderr = true, .SearchPath = true}>({"sh", { "-c", submit_command }});
   };
 
   // 进入事件循环
   while (true)
   {
     screen.Loop(request_interface);
-    if (state.user_command == "quit")
-      return EXIT_FAILURE;
-    else if (state.user_command != "continue")
-      throw std::runtime_error("user_command is not recognized");
-    else if (state.device_selected < 0 || state.device_selected >= state.device_entries.size())
-      throw std::runtime_error("device_selected is out of range");
-    else if (state.device_selected == 0) state.submit_command =
-      "sbatch --ntasks=1\n--gpus=1\n--job-name='{}'\n--output=output.txt\nvasp-nvidia-{}"_f
-        (std::filesystem::current_path().filename().string(), state.vasp_version_entries[state.vasp_version_selected]);
-    else if (state.device_selected == state.device_entries.size() - 1) state.submit_command =
-      "sbatch --ntasks={}\n--cpus-per-task={}\n--hint=nomultithread\n--job-name='{}'\n--output=output.txt"
+    if (state.user_command == "quit") return EXIT_FAILURE;
+    else if (state.device_type_selected == 0)
+      state.submit_command =
+        "sbatch --ntasks=1\n--gpus=1\n--job-name='{}'\n--output='{}'\nvasp-nvidia-{}"_f
+        (state.job_name, state.output_file, state.vasp_version_entries[state.vasp_version_selected]);
+    else if (state.device_type_selected == 2)
+      state.submit_command =
+        "sbatch --ntasks={}\n--cpus-per-task={}\n--hint=nomultithread\n--job-name='{}'\n--output='{}'"
         "\nvasp-intel-{}"_f
-      (
-        Device.CpuMpiThreads, Device.CpuOpenmpThreads, std::filesystem::current_path().filename().string(),
-        state.vasp_version_entries[state.vasp_version_selected]
-      );
-    else state.submit_command =
-      "sbatch --ntasks=1\n--gpus={}:1\n--job-name='{}'\n--output=output.txt\nvasp-nvidia-{}"_f
-      (
-        state.device_entries[state.device_selected], std::filesystem::current_path().filename().string(),
-        state.vasp_version_entries[state.vasp_version_selected]
-      );
+        (
+          state.mpi_threads, state.openmp_threads, state.job_name, state.output_file,
+          state.vasp_version_entries[state.vasp_version_selected]
+        );
+    else
+    {
+      std::vector<std::string> selected_gpus;
+      for (int i = 0; i < state.device_selected.size(); i++)
+        if (state.device_selected[i]) selected_gpus.push_back(state.device_entries[i]);
+      state.submit_command =
+        "sbatch --ntasks={}\n--gres={}\n--job-name='{}'\n--output='{}'\nvasp-nvidia-{}"_f
+        (
+          selected_gpus.size(),
+          selected_gpus
+            | ranges::views::transform([](auto& entry) { return "gpu:{}:1"_f(entry); })
+            | ranges::views::join(',') | ranges::to<std::string>,
+          state.job_name, state.output_file, state.vasp_version_entries[state.vasp_version_selected]
+        );
+    }
     screen.Loop(confirm_interface);
-    if (state.user_command == "quit")
-      return EXIT_FAILURE;
-    else if (state.user_command == "back")
-      continue;
-    else if (state.user_command != "submit")
-      throw std::runtime_error("user_command is not recognized");
+    if (state.user_command == "quit") return EXIT_FAILURE;
+    else if (state.user_command == "back") continue;
     submit(state.submit_command);
     break;
   }

local/pkgs/sockpp.nix

@@ -0,0 +1,7 @@
+{ stdenv, src, cmake, pkg-config }: stdenv.mkDerivation
+{
+  name = "sockpp";
+  inherit src;
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [];
+}

local/pkgs/win11os-kde/default.nix

@@ -1,20 +0,0 @@
-{ lib, stdenv, src }: stdenv.mkDerivation
-{
-  name = "win11os-kde";
-  inherit src;
-  installPhase =
-  ''
-    mkdir -p $out/share/aurorae/themes
-    cp -r $src/aurorae/* $out/share/aurorae/themes
-    mkdir -p $out/share/color-schemes
-    cp -r $src/color-schemes/*.colors $out/share/color-schemes
-    mkdir -p $out/share/Kvantum
-    cp -r $src/Kvantum/* $out/share/Kvantum
-    mkdir -p $out/share/plasma/desktoptheme
-    cp -r $src/plasma/desktoptheme/* $out/share/plasma/desktoptheme
-    mkdir -p $out/share/plasma/look-and-feel
-    cp -r $src/plasma/look-and-feel/* $out/share/plasma/look-and-feel
-    mkdir -p $out/share/wallpapers
-    cp -r $src/wallpaper/* $out/share/wallpapers
-  '';
-}

local/pkgs/winjob/.clangd

@@ -0,0 +1,3 @@
+CompileFlags:
+  Add: [ -Wall, -Wextra, -std=c++26 ]
+  Compiler: g++

local/pkgs/winjob/.envrc

@@ -0,0 +1 @@
+use flake .#winjob

local/pkgs/winjob/CMakeLists.txt

@@ -0,0 +1,39 @@
+# cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.29)
+project(winjob VERSION 0.0.0 LANGUAGES CXX)
+enable_testing()
+include(GNUInstallDirs)
+
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message("Setting build type to 'Release' as none was specified.")
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+endif()
+
+set(WINJOB_VERSION "unknown" CACHE STRING "Version of the winjob")
+
+find_package(Boost REQUIRED COMPONENTS headers filesystem)
+find_package(nlohmann_json REQUIRED)
+find_package(range-v3 REQUIRED)
+
+add_executable(winjob src/winjob.cpp)
+# target_compile_features(winjob PRIVATE cxx_std_26)
+target_compile_options(winjob PRIVATE "-std=c++26")
+target_include_directories(winjob PRIVATE ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(winjob PRIVATE Boost::headers Boost::filesystem
+  nlohmann_json::nlohmann_json range-v3::range-v3)
+target_compile_definitions(winjob PRIVATE winjob_VERSION="${winjob_VERSION}")
+
+add_executable(winjobd src/winjobd.cpp)
+# target_compile_features(winjob PRIVATE cxx_std_26)
+target_compile_options(winjobd PRIVATE "-std=c++26")
+target_include_directories(winjobd PRIVATE ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(winjobd PRIVATE Boost::headers Boost::filesystem
+  nlohmann_json::nlohmann_json range-v3::range-v3)
+target_compile_definitions(winjobd PRIVATE winjob_VERSION="${winjob_VERSION}")
+
+install(TARGETS winjob RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+get_property(ImportedTargets DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS)
+message("Imported targets: ${ImportedTargets}")
+message("List of compile features: ${CMAKE_CXX_COMPILE_FEATURES}")

local/pkgs/winjob/default.nix

@@ -0,0 +1,11 @@
+{
+  stdenv, cmake, pkg-config, version ? null, lib,
+  nlohmann_json, range-v3, boost
+}: stdenv.mkDerivation
+{
+  name = "winjob";
+  src = ./.;
+  buildInputs = [ nlohmann_json range-v3 boost ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  cmakeFlags = lib.optionals (version != null) [ "-DWINJOB_VERSION=${version}" ];
+}

local/pkgs/winjob/src/winjob.cpp

@@ -0,0 +1,21 @@
+# include <boost/asio.hpp>
+# include <iostream>
+
+int main()
+{
+  boost::asio::io_context io_context;
+  boost::asio::local::stream_protocol::endpoint ep("/tmp/winjobd.sock");
+  // send a message to the server
+  boost::asio::local::stream_protocol::socket socket(io_context);
+  socket.connect(ep);
+  std::string message = "Hello, world!\n";
+  boost::asio::write(socket, boost::asio::buffer(message));
+  // receive a message from the server
+  boost::asio::streambuf buf;
+  boost::asio::read_until(socket, buf, '\n');
+  std::istream is(&buf);
+  std::string line;
+  std::getline(is, line);
+  std::cout << "Received: " << line << '\n';
+  return 0;
+}

local/pkgs/winjob/src/winjobd.cpp

@@ -0,0 +1,43 @@
+# include <boost/asio.hpp>
+# include <iostream>
+
+int main()
+{
+  boost::asio::io_context io_context;
+  boost::asio::local::stream_protocol::endpoint ep("/tmp/winjobd.sock");
+  boost::asio::local::stream_protocol::acceptor acceptor(io_context, ep);
+  auto getuid = [](boost::asio::local::stream_protocol::socket& socket)
+  {
+    struct ucred ucred;
+    socklen_t len = sizeof(ucred);
+    if (getsockopt(socket.native_handle(), SOL_SOCKET, SO_PEERCRED, &ucred, &len) == -1)
+    {
+      std::cerr << "Failed to get SO_PEERCRED\n";
+      return 0u;
+    }
+    return ucred.uid;
+  };
+  std::function<void(const boost::system::error_code&, boost::asio::local::stream_protocol::socket)> func =
+    [&](const boost::system::error_code& ec, boost::asio::local::stream_protocol::socket socket)
+  {
+    if (ec)
+    {
+      std::cerr << "Failed to accept connection\n";
+      return;
+    }
+    std::cout << "Accepted connection\n";
+    boost::asio::streambuf buf;
+    boost::asio::read_until(socket, buf, '\n');
+    std::istream is(&buf);
+    std::string line;
+    std::getline(is, line);
+    std::cout << "Received: " << line << '\n';
+    std::cout << "Peer UID: " << getuid(socket) << '\n';
+    // write a message to the client
+    std::string message = "thanks for the message\n";
+    boost::asio::write(socket, boost::asio::buffer(message));
+    acceptor.async_accept(func);
+  };
+  acceptor.async_accept(func);
+  io_context.run();
+}

modules/default.nix

@@ -14,6 +14,7 @@ inputs:
       topInputs.impermanence.nixosModules.impermanence
       topInputs.nix-flatpak.nixosModules.nix-flatpak
       topInputs.chaotic.nixosModules.default
+      { config.chaotic.nyx.overlay.onTopOf = "user-pkgs"; }
       topInputs.catppuccin.nixosModules.catppuccin
       (inputs:
       {
@@ -29,8 +30,6 @@ inputs:
               nix-vscode-extensions = topInputs.nix-vscode-extensions.extensions."${prev.system}";
               nur-xddxdd = topInputs.nur-xddxdd.overlays.default final prev;
               nur-linyinfeng = (topInputs.nur-linyinfeng.overlays.default final prev).linyinfeng;
-              deploy-rs =
-                { inherit (prev) deploy-rs; inherit ((topInputs.deploy-rs.overlay final prev).deploy-rs) lib; };
               firefox-addons = (import "${topInputs.rycee}" { inherit (prev) pkgs; }).firefox-addons;
               inherit (import topInputs.gricad { pkgs = final; }) intel-oneapi intel-oneapi-2022;
             })
@@ -38,7 +37,6 @@ inputs:
           home-manager.sharedModules =
           [
             topInputs.plasma-manager.homeManagerModules.plasma-manager
-            topInputs.nix-doom-emacs.hmModule
             topInputs.catppuccin.homeManagerModules.catppuccin
           ];
         };

modules/hardware/cpus.nix

@@ -0,0 +1,29 @@
+inputs:
+{
+  options.nixos.hardware.cpus = let inherit (inputs.lib) mkOption types; in mkOption
+    { type = types.listOf (types.enum [ "intel" "amd" ]); default = []; };
+  config = let inherit (inputs.config.nixos.hardware) cpus; in inputs.lib.mkIf (cpus != [])
+  {
+    hardware.cpu = builtins.listToAttrs
+      (builtins.map (name: { inherit name; value = { updateMicrocode = true; }; }) cpus);
+    boot =
+    {
+      initrd.availableKernelModules =
+        let modules =
+        {
+          intel =
+          [
+            "intel_cstate" "aesni_intel" "intel_cstate" "intel_uncore" "intel_uncore_frequency" "intel_powerclamp"
+          ];
+          amd = [];
+        };
+        in builtins.concatLists (builtins.map (cpu: modules.${cpu}) cpus);
+      kernelParams =
+        let params = { intel = [ "intel_iommu=off" ]; amd = [ "amd_iommu=fullflush" ]; };
+        in builtins.concatLists (builtins.map (cpu: params.${cpu}) cpus);
+    };
+    environment.systemPackages =
+      let packages = with inputs.pkgs; { intel = []; amd = [ zenmonitor ]; };
+      in builtins.concatLists (builtins.map (cpu: packages.${cpu}) cpus);
+  };
+}

modules/hardware/default.nix

@@ -11,7 +11,6 @@ inputs:
       joystick = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
       printer = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
       sound = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
-      cpus = mkOption { type = types.listOf (types.enum [ "intel" "amd" ]); default = []; };
     };
   config = let inherit (inputs.config.nixos) hardware; in inputs.lib.mkMerge
   [
@@ -44,29 +43,5 @@ inputs:
         security.rtkit.enable = true;
       }
     )
-    # cpus
-    (
-      inputs.lib.mkIf (hardware.cpus != [])
-      {
-        hardware.cpu = builtins.listToAttrs
-          (map (name: { inherit name; value = { updateMicrocode = true; }; }) hardware.cpus);
-        boot =
-        {
-          initrd.availableKernelModules =
-            let modules =
-            {
-              intel =
-              [
-                "intel_cstate" "aesni_intel" "intel_cstate" "intel_uncore" "intel_uncore_frequency" "intel_powerclamp"
-              ];
-              amd = [];
-            };
-            in builtins.concatLists (map (cpu: modules.${cpu}) hardware.cpus);
-          kernelParams =
-            let params = { intel = [ "intel_iommu=off" ]; amd = [ "amd_iommu=fullflush" ]; };
-            in builtins.concatLists (map (cpu: params.${cpu}) hardware.cpus);
-        };
-      }
-    )
   ];
 }

modules/hardware/gpu.nix

@@ -35,27 +35,22 @@ inputs:
           {
             intel = [ "i915" ];
             nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" ]; # nvidia-uvm should not be loaded
-            amd = [ "amdgpu" ];
+            amd = [];
           };
           in builtins.concatLists (builtins.map (gpu: modules.${gpu}) gpus);
         hardware =
         {
-          opengl =
+          graphics =
           {
             enable = true;
-            driSupport = true;
-            driSupport32Bit = true;
             extraPackages =
               let packages = with inputs.pkgs;
               {
                 intel = [ intel-vaapi-driver libvdpau-va-gl intel-media-driver ];
                 nvidia = [ vaapiVdpau ];
-                amd = [ amdvlk rocmPackages.clr rocmPackages.clr.icd ];
+                amd = [];
               };
               in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
-            extraPackages32 =
-              let packages = { intel = []; nvidia = []; amd = [ inputs.pkgs.driversi686Linux.amdvlk ]; };
-              in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
           };
           nvidia = inputs.lib.mkIf (builtins.elem "nvidia" gpus)
           {
@@ -64,16 +59,15 @@ inputs:
             dynamicBoost.enable = inputs.lib.mkIf gpu.nvidia.dynamicBoost true;
             nvidiaSettings = true;
             forceFullCompositionPipeline = true;
-            package = inputs.config.boot.kernelPackages.nvidiaPackages.${gpu.nvidia.driver};
+            package =
+              let actualDriver = { production = "legacy_535"; }.${gpu.nvidia.driver} or gpu.nvidia.driver;
+              in inputs.config.boot.kernelPackages.nvidiaPackages.${actualDriver};
             prime.allowExternalGpu = true;
+            # nvidia 555 package have some bug, should use open
+            open = inputs.lib.mkIf (gpu.nvidia.driver == "beta") true;
           };
         };
-        boot =
-        {
-          kernelParams = inputs.lib.mkIf (builtins.elem "amd" gpus)
-            [ "radeon.cik_support=0" "amdgpu.cik_support=1" "radeon.si_support=0" "amdgpu.si_support=1" ];
-          blacklistedKernelModules = [ "nouveau" ];
-        };
+        boot.blacklistedKernelModules = [ "nouveau" ];
         environment.variables.VDPAU_DRIVER = inputs.lib.mkIf (builtins.elem "intel" gpus) "va_gl";
         services.xserver.videoDrivers =
           let driver = { intel = "modesetting"; amd = "amdgpu"; nvidia = "nvidia"; };
@@ -95,5 +89,15 @@ inputs:
         powerManagement.finegrained = inputs.lib.mkIf (gpu.nvidia.prime.mode == "offload") true;
       };}
     )
+    # amdgpu
+    (
+      inputs.lib.mkIf (inputs.lib.strings.hasPrefix "amd" gpu.type) { hardware.amdgpu =
+      {
+        opencl.enable = true;
+        legacySupport.enable = true;
+        initrd.enable = true;
+        amdvlk = { enable = true; support32Bit.enable = true; supportExperimental.enable = true; };
+      };}
+    )
   ]);
 }

modules/packages/desktop-extra.nix

@@ -9,7 +9,8 @@ inputs:
         _packages =
         [
           # system management
-          btrfs-assistant snapper-gui kdePackages.qtstyleplugin-kvantum ventoy-full cpu-x # etcher
+          btrfs-assistant snapper-gui kdePackages.qtstyleplugin-kvantum ventoy-full cpu-x
+          inputs.pkgs."pkgs-23.11".etcher
           # password and key management
           yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden
           # download
@@ -18,13 +19,13 @@ inputs:
           scrcpy weston cage openbox krita
           # media
           spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio
-          waifu2x-converter-cpp inkscape blender
+          waifu2x-converter-cpp inkscape blender whalebird
           # editor
           typora
           # news
           fluent-reader
           # nix tools
-          deploy-rs.deploy-rs nixpkgs-fmt appimage-run nixd nix-serve node2nix nix-prefetch-github prefetch-npm-deps
+          nixpkgs-fmt appimage-run nixd nix-serve node2nix nix-prefetch-github prefetch-npm-deps
           nix-prefetch-docker
           # instant messager
           element-desktop telegram-desktop discord fluffychat zoom-us signal-desktop slack nur-linyinfeng.wemeet

modules/packages/desktop/default.nix

@@ -26,11 +26,9 @@ inputs:
         # media
         mpv nomacs
         # themes
-        tela-circle-icon-theme localPackages.win11os-kde localPackages.fluent-kde localPackages.blurred-wallpaper
-        localPackages.slate utterly-nord-plasma utterly-round-plasma-style catppuccin catppuccin-sddm
-        catppuccin-cursors catppuccinifier-gui catppuccinifier-cli catppuccin-plymouth
-        (catppuccin-kde.override { flavour = [ "latte" ]; })
-        (catppuccin-gtk.override { variant = "latte"; })
+        catppuccin catppuccin-sddm catppuccin-cursors catppuccinifier-gui catppuccinifier-cli catppuccin-plymouth
+        (catppuccin-kde.override { flavour = [ "latte" ]; }) (catppuccin-kvantum.override { variant = "latte"; })
+        localPackages.slate localPackages.blurred-wallpaper tela-circle-icon-theme
         # terminal
         warp-terminal
         # development
@@ -51,20 +49,6 @@ inputs:
       {
         patches = (if (attrs ? patches) then attrs.patches else []) ++ [ ./telegram.patch ];
       });
-      kdePackages = prev.kdePackages.overrideScope (final: prev:
-      {
-        kwin = prev.kwin.overrideAttrs (prev: { patches = prev.patches ++
-        [
-          {
-            "6.0.5" = inputs.pkgs.fetchurl
-            {
-              url = "https://aur.archlinux.org/cgit/aur.git/plain/explicit-sync.patch?h=kwin-explicit-sync"
-                + "&id=b6fb7e1b8651365af426cfc7be0d03b9615fdd3a";
-              sha256 = "1zcksalmkf0mifmv0zl5awy1ch3fvfkkknxqk4mqg0vk1bbpjh2b";
-            };
-          }.${prev.version}
-        ]; });
-      });
     })];
     services.pcscd.enable = true;
   };

modules/packages/server-extra.nix

@@ -26,11 +26,7 @@ inputs:
         ])];
       };
     };
-    programs =
-    {
-      yazi.enable = true;
-      mosh.enable = true;
-    };
+    programs.yazi.enable = true;
     services.fwupd.enable = true;
   };
 }

modules/packages/server.nix

@@ -6,7 +6,7 @@ inputs:
     [
       # basic tools
       beep dos2unix gnugrep pv tmux screen parallel tldr cowsay jq zellij ipfetch localPackages.pslist
-      fastfetch reptyr nushellFull duc
+      fastfetch reptyr nushell duc ncdu progress
       # lsxx
       pciutils usbutils lshw util-linux lsof dmidecode lm_sensors
       # top
@@ -43,6 +43,7 @@ inputs:
       command-not-found.enable = false;
       autojump.enable = true;
       direnv = { enable = true; nix-direnv.enable = true; };
+      mosh.enable = true;
     };
     services.udev.packages = with inputs.pkgs; [ yubikey-personalization libfido2 ];
     home-manager = { useGlobalPkgs = true; useUserPackages = true; };

modules/packages/ssh.nix

@@ -0,0 +1,148 @@
+inputs:
+{
+  config = inputs.lib.mkIf (builtins.elem "server" inputs.config.nixos.packages._packageSets)
+  {
+    services.openssh.knownHosts =
+      let servers =
+      {
+        vps4 =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIF7Y0tjt1XLPjqJ8HEB26W9jVfJafRQ3pv5AbPaxEc/Z";
+          hostnames = [ "vps4.chn.moe" "104.234.37.61" ];
+        };
+        "initrd.vps4" =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIJkOPTFvX9f+Fn/KHOIvUgoRiJfq02T42lVGQhpMUGJq";
+          hostnames = [ "initrd.vps4.chn.moe" "104.234.37.61" ];
+        };
+        vps6 =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIO5ZcvyRyOnUCuRtqrM/Qf+AdUe3a5bhbnfyhw2FSLDZ";
+          hostnames = [ "vps6.chn.moe" "wireguard.vps6.chn.moe" "74.211.99.69" "192.168.83.1" ];
+        };
+        "initrd.vps6" =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIB4DKB/zzUYco5ap6k9+UxeO04LL12eGvkmQstnYxgnS";
+          hostnames = [ "initrd.vps6.chn.moe" "74.211.99.69" ];
+        };
+        vps7 =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIF5XkdilejDAlg5hZZD0oq69k8fQpe9hIJylTo/aLRgY";
+          hostnames = [ "vps7.chn.moe" "wireguard.vps7.chn.moe" "ssh.git.chn.moe" "95.111.228.40" "192.168.83.2" ];
+        };
+        "initrd.vps7" =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIGZyQpdQmEZw3nLERFmk2tS1gpSvXwW0Eish9UfhrRxC";
+          hostnames = [ "initrd.vps7.chn.moe" "95.111.228.40" ];
+        };
+        nas =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIIktNbEcDMKlibXg54u7QOLt0755qB/P4vfjwca8xY6V";
+          hostnames = [ "wireguard.nas.chn.moe" "[office.chn.moe]:5440" "192.168.1.185" "192.168.83.4" ];
+        };
+        "initrd.nas" =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIAoMu0HEaFQsnlJL0L6isnkNZdRq0OiDXyaX3+fl3NjT";
+          hostnames = [ "initrd.nas.chn.moe" "[office.chn.moe]:5440" "192.168.1.185" ];
+        };
+        surface =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIFdm3DcfHdcLP0oSpVrWwIZ/b9lZuakBSPwCFz2BdTJ7";
+          hostnames = [ "192.168.1.166" "wireguard.surface.chn.moe" "192.168.83.5" ];
+        };
+        pc =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIMSfREi19OSwQnhdsE8wiNwGSFFJwNGN0M5gN+sdrrLJ";
+          hostnames = [ "wireguard.pc.chn.moe" "[office.chn.moe]:3673" "192.168.1.105" "192.168.83.3" ];
+        };
+        hpc =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIDVpsQW3kZt5alHC6mZhay3ZEe2fRGziG4YJWCv2nn/O";
+          hostnames = [ "hpc.xmu.edu.cn" ];
+        };
+        github =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
+          hostnames = [ "github.com" ];
+        };
+        xmupc1 =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAINTvfywkKRwMrVp73HfHTfjhac2Tn9qX/lRjLr09ycHp";
+          hostnames = [ "[office.chn.moe]:6007" "[xmupc1.chn.moe]:6007" "wireguard.xmupc1.chn.moe" "192.168.83.6" ];
+        };
+        xmupc2 =
+        {
+          ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIJZ/+divGnDr0x+UlknA84Tfu6TPD+zBGmxWZY4Z38P6";
+          hostnames = [ "[xmupc2.chn.moe]:6394" "wireguard.xmupc2.chn.moe" "192.168.83.7" ];
+        };
+      };
+      in builtins.listToAttrs (builtins.map
+        (server:
+        {
+          inherit (server) name;
+          value =
+          {
+            publicKey = "ssh-ed25519 ${server.value.ed25519}";
+            hostNames = server.value.hostnames;
+          };
+        })
+        (inputs.localLib.attrsToList servers));
+    programs.ssh =
+    {
+      startAgent = true;
+      enableAskPassword = true;
+      askPassword = "${inputs.pkgs.systemd}/bin/systemd-ask-password";
+      extraConfig = "AddKeysToAgent yes";
+    };
+    environment.sessionVariables.SSH_ASKPASS_REQUIRE = "prefer";
+    nixos.user.sharedModules =
+    [(hmInputs: {
+      config.programs.ssh =
+      {
+        enable = true;
+        controlMaster = "auto";
+        controlPersist = "1m";
+        compression = true;
+        matchBlocks = builtins.listToAttrs
+        (
+          (builtins.map
+            (host: { name = host; value = { inherit host; hostname = "${host}.chn.moe"; }; })
+            [ "vps4" "vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.nas" ])
+          ++ (builtins.map
+            (host: { name = host; value = { inherit host; hostname = "${host}.chn.moe"; forwardX11 = true; }; })
+            [ "wireguard.pc" "wireguard.surface" "wireguard.xmupc1" "wireguard.xmupc2" ])
+          ++ (builtins.map
+            (host:
+            {
+              name = host;
+              value =
+              {
+                host = host;
+                hostname = "hpc.xmu.edu.cn";
+                user = host;
+                setEnv.TERM = "chn_unset_ls_colors:xterm-256color";
+              };
+            })
+            [ "wlin" "hwang" ])
+        )
+        // rec {
+          xmupc1 = { host = "xmupc1"; hostname = "xmupc1.chn.moe"; port = 6007; forwardX11 = true; };
+          xmupc2 = { host = "xmupc2"; hostname = "xmupc2.chn.moe"; port = 6394; forwardX11 = true; };
+          nas = { host = "nas"; hostname = "office.chn.moe"; port = 5440; };
+          pc = { host = "pc"; hostname = "office.chn.moe"; port = 3673; forwardX11 = true; };
+          surface = { host = "surface"; hostname = "192.168.1.166"; forwardX11 = true; };
+          gitea = { host = "gitea"; hostname = "ssh.git.chn.moe"; };
+          jykang =
+          {
+            host = "jykang";
+            hostname = "hpc.xmu.edu.cn";
+            user = "jykang";
+            forwardAgent = true;
+            extraOptions.AddKeysToAgent = "yes";
+          };
+          "internal.jykang" = jykang // { host = "internal.jykang"; proxyJump = "wireguard.nas"; };
+        };
+      };
+    })];
+  };
+}

modules/packages/ssh/default.nix

@@ -1,166 +0,0 @@
-inputs:
-{
-  config = inputs.lib.mkIf (builtins.elem "server" inputs.config.nixos.packages._packageSets)
-  {
-    services.openssh.knownHosts =
-      let
-        servers =
-        {
-          vps6 =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO5ZcvyRyOnUCuRtqrM/Qf+AdUe3a5bhbnfyhw2FSLDZ";
-            hostnames = [ "vps6.chn.moe" "wireguard.vps6.chn.moe" "74.211.99.69" "192.168.83.1" ];
-          };
-          "initrd.vps6" =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB4DKB/zzUYco5ap6k9+UxeO04LL12eGvkmQstnYxgnS";
-            hostnames = [ "initrd.vps6.chn.moe" "74.211.99.69" ];
-          };
-          vps7 =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5XkdilejDAlg5hZZD0oq69k8fQpe9hIJylTo/aLRgY";
-            hostnames = [ "vps7.chn.moe" "wireguard.vps7.chn.moe" "ssh.git.chn.moe" "95.111.228.40" "192.168.83.2" ];
-          };
-          "initrd.vps7" =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGZyQpdQmEZw3nLERFmk2tS1gpSvXwW0Eish9UfhrRxC";
-            hostnames = [ "initrd.vps7.chn.moe" "95.111.228.40" ];
-          };
-          nas =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIktNbEcDMKlibXg54u7QOLt0755qB/P4vfjwca8xY6V";
-            hostnames = [ "wireguard.nas.chn.moe" "[office.chn.moe]:5440" "192.168.1.185" "192.168.83.4" ];
-          };
-          "initrd.nas" =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAoMu0HEaFQsnlJL0L6isnkNZdRq0OiDXyaX3+fl3NjT";
-            hostnames = [ "initrd.nas.chn.moe" "[office.chn.moe]:5440" "192.168.1.185" ];
-          };
-          surface =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFdm3DcfHdcLP0oSpVrWwIZ/b9lZuakBSPwCFz2BdTJ7";
-            hostnames = [ "192.168.1.166" "wireguard.surface.chn.moe" "192.168.83.5" ];
-          };
-          pc =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSfREi19OSwQnhdsE8wiNwGSFFJwNGN0M5gN+sdrrLJ";
-            hostnames = [ "wireguard.pc.chn.moe" "[office.chn.moe]:3673" "192.168.1.105" "192.168.83.3" ];
-          };
-          hpc =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDVpsQW3kZt5alHC6mZhay3ZEe2fRGziG4YJWCv2nn/O";
-            hostnames = [ "hpc.xmu.edu.cn" ];
-          };
-          github =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
-            hostnames = [ "github.com" ];
-          };
-          xmupc1 =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINTvfywkKRwMrVp73HfHTfjhac2Tn9qX/lRjLr09ycHp";
-            hostnames = [ "[office.chn.moe]:6007" "[xmupc1.chn.moe]:6007" "wireguard.xmupc1.chn.moe" "192.168.83.6" ];
-          };
-          xmupc2 =
-          {
-            ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZ/+divGnDr0x+UlknA84Tfu6TPD+zBGmxWZY4Z38P6";
-            hostnames = [ "[xmupc2.chn.moe]:6394" "wireguard.xmupc2.chn.moe" "192.168.83.7" ];
-          };
-        };
-      in builtins.listToAttrs (builtins.concatLists (builtins.map
-        (server:
-        (
-          if builtins.pathExists ./ssh/${server.name}_rsa.pub then
-          [{
-            name = "${server.name}-rsa";
-            value =
-            {
-              publicKey = builtins.readFile ./ssh/${server.name}_rsa.pub;
-              hostNames = server.value.hostnames;
-            };
-          }]
-          else []
-        )
-        ++ (
-          if builtins.pathExists ./ssh/${server.name}_ecdsa.pub then
-          [{
-            name = "${server.name}-ecdsa";
-            value =
-            {
-              publicKey = builtins.readFile ./ssh/${server.name}_ecdsa.pub;
-              hostNames = server.value.hostnames;
-            };
-          }]
-          else []
-        )
-        ++ (
-          if server.value ? ed25519 then
-          [{
-            name = "${server.name}-ed25519";
-            value =
-            {
-              publicKey = server.value.ed25519;
-              hostNames = server.value.hostnames;
-            };
-          }]
-          else []
-        ))
-        (inputs.localLib.attrsToList servers)));
-    programs.ssh =
-    {
-      startAgent = true;
-      enableAskPassword = true;
-      askPassword = "${inputs.pkgs.systemd}/bin/systemd-ask-password";
-      extraConfig = "AddKeysToAgent yes";
-    };
-    environment.sessionVariables.SSH_ASKPASS_REQUIRE = "prefer";
-    nixos.user.sharedModules =
-    [(hmInputs: {
-      config.programs.ssh =
-      {
-        enable = true;
-        controlMaster = "auto";
-        controlPersist = "1m";
-        compression = true;
-        matchBlocks = builtins.listToAttrs
-        (
-          (builtins.map
-            (host: { name = host; value = { inherit host; hostname = "${host}.chn.moe"; }; })
-            [
-              "vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.pc" "wireguard.nas" "wireguard.surface"
-              "wireguard.xmupc1" "wireguard.xmupc2"
-            ])
-          ++ (builtins.map
-            (host:
-            {
-              name = host;
-              value =
-              {
-                host = host;
-                hostname = "hpc.xmu.edu.cn";
-                user = host;
-                setEnv.TERM = "chn_unset_ls_colors:xterm-256color";
-              };
-            })
-            [ "wlin" "hwang" ])
-        )
-        // {
-          xmupc1 = { host = "xmupc1"; hostname = "xmupc1.chn.moe"; port = 6007; };
-          xmupc2 = { host = "xmupc2"; hostname = "xmupc2.chn.moe"; port = 6394; };
-          nas = { host = "nas"; hostname = "office.chn.moe"; port = 5440; };
-          pc = { host = "pc"; hostname = "office.chn.moe"; port = 3673; };
-          surface = { host = "surface"; hostname = "192.168.1.166"; };
-          gitea = { host = "gitea"; hostname = "ssh.git.chn.moe"; };
-          jykang =
-          {
-            host = "jykang";
-            hostname = "hpc.xmu.edu.cn";
-            user = "jykang";
-            forwardAgent = true;
-            extraOptions.AddKeysToAgent = "yes";
-          };
-        };
-      };
-    })];
-  };
-}

modules/packages/ssh/github_ecdsa.pub

@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=

modules/packages/ssh/github_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=

modules/packages/ssh/hpc_ecdsa.pub

@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDkkl7A9kWWBoi4b5g6Vus70ja1KhPfcZZjeU1/QbYdN8PRRw/hsGklrhefslKRbym/TMFS0ko0g5WUi9G5vbGw=

modules/packages/ssh/hpc_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgs8MvV2nczjGMZ548tuAhgvCEd4uHu0VhLDSwQG7Nh/UR4Pgc5T9Nf7Vfwg96Lah/pwD5my4RaWis6bLMmlkYyDBKFBOsGYQUe5J5XfZdxk8pz+7L0Hq6gPfAZAdNlUiuFVKsvkE+NF42NgJyXSYQicPbu5LQiFwZGXlW20+LO8uBQ1y1xabKVpg8XGwordduL99VepwEzeLK/st+UVfW+mKgxkf9TuxvD2fuYIDZM7y2rXqcjf4/6OXA5kACsYK1MgZSFxgO/m6+1uCC1qBDseMTA3D+Tsjf9VtcqUE9dMd/dJ/uuILHJ0+oIqkykTCecPLgJY3Vh8rAtln/lbId

modules/packages/ssh/nas_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0+xafJMnOGCHv6OLljaq8iJ3ZBaIezv7AJ9rVWJXFg/QJRYBwct35c4zaVom7If8F+Ss+BTLMp33HZ8gLpoat6LkjARjy65Ycog3NOnEposX2JjZEYXDbovxEmcJkDXAIVmnaBUi3r22z4UI8OqsHPeRXj017O0yQrQQYEAw/IO/tSNQZt2k8JHxAX50UTqGFdgkriO1fYHBocq48m0nn3sXrMuM3yBe5zy3NngOHxMn7UxjECmAElsuu/nu1x083pRnv5NSa+JxDGJ+S6Zhj3nGGNwZesa51I4cJjsYLxgmO/NxL1J86bDp6HhK9C9799ruG60pGTw6HcvbKTgx7klUgn4936wsy7qukWqp53MvqrLSJkRb/HHU9zZqvzcjbwet+Iv1OAAok5QC88j7Jgenk3nbZw4BNFd2r/8rOZuXheDnMKOa61dXxnvoAO3Euk0RPdZqW1slT/DDyD/kB6TPY7yOywNURNnrwzfSsmravKi6bGA5t2Ehhpf2LETM=

modules/packages/ssh/pc_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOyU7VvusseL2tDp7JkIXKGxRGQNHpYWVAPraUj17Xls7Z9e7HO6+GBiGP+bB9tZbzsoTNGHdXg8VaJmf98QAhhg0FcUb6IvWmfmPWzQ0MC8L+USqdDpaH7s9SOZF/yveNYCR5GOMmFdSW4OPVYIOrjPltDIe5S1SN2nOXvjxbLmuoMjg+5U4F0ii0ZaCRuMVDskeift+Amxe7iRnSzeDbECd0rJhaUb8gf3shz0Hp9lRUMej7cJH8LLP3m0s3Vk+kasKntz18MpJ6/3n+fR2aK75qkcq9FZaFA4tSIabh9eKoxlRCy7g8Qj6nNStW+ys/a1UYBFgAoTyE7e47o3dpcxR5oMLbeDwhOstWL0YOjEH1K5Wyj3eEOT71C6kuQBPcCJQ9q9hknRpW0mWe9Q6qaAzTgE9LLssijr/yTfYQk7zKEyo0i4f6buOfmyYZfnzfnCB3LiJKa98TVEEzrKYHIO44LwIkNf/YHOMDknzjYpav6HfDy+AebRHZFYhGax1YP/tP0Ve/FSq5rh6Vwuqa/zyfFUPZmZVf+EYXK7DdyuBhEZhBEu6QrjY60NRMTMLpnUZMcZXRAz9byMpAGcCYQv6gjU99ps8AkRjZNkn+FpAtDGT+oJxixQwyZMSxZ+ZuzkZGyBMeMplZXMMLICGZ2LRAgT0bxXLZUxHJBLwwnw==

modules/packages/ssh/surface_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJAyDl52UVGFPTV/rXFERrXAMY5qZ3g+tpg9HOGdw86G4Nr8Xp/cTxZjF4kSfIkSrGblAV9Lm4US0fW3pGOQu5qQrSAENxqHxdlEyzt7izyF2CklDUeTjs3KHOIZMvSli4z014NPcswBbjwB9Lyrw0fCQ9P1vYkrUHEzL2SMxdack1EQPcMF4MxblDqc+eQhdMCkKE8T1Cb1ZqxeLVMPn9CwjG18JoxL+/xs+MjcsSXYWcoqYTfgfhguMbh0D4Eo32MHS/IzRSxnOHJxhG5xYePcyBlb/CxQuYA+RTqKNE85j7GcL2oEmeZ1b++/9qFT9grwVh+UOBRO2xiMzKDF24nXPJ+eLyd6Z/3swGT4rTVDnrXV5eZUkWLHN093IdLJCTtPVrKV9OxEKr5sU2W0edpirNrlGq7/MYkJX9EbQctDFA69XfQkZlGK9xGutqSgEaVlY54fS0Due+NDrNBPfMKJ9MTmFDOY+NYn05El2rMD39OKbGbCR5ASwSSBlcQeE=

modules/packages/ssh/vps6_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDYiP+ELuG5KTmafVjBkY0ZSggJg+mDkvZpF8d7NljMst0YwKWV3IgHnkAGXdTd7jlRgm9HH6oc8rP2R6Q8EJmfr+xcL1IQIWKuYAoddHlpe2Ds4EE74xbgm5Elf7FpdYNHUH9XyVmMmIhVSpLw2N10jUhvYqw+h+xC2nObEKZuBOt/lqrTGbC/EMv3+sDv0ApBh8lKt2yfjt88pnAj1LKPANDgIYSyQOllHQWeUY/eD/5Qc9XWR3uWclslVaxriRmEA0sNZlOFCeRIyDbYpSzQBdcnojkwt7Z5kjhaqGlT9g00fdiqO0OMaeY/G8ki3QxqjONqTEDqK+DpEZFO6jyZARcY6ki0ANc0AO4qosEC3gEbAvVwyPwDFtyDggMTHlTzaw8iakMGSDEk10zKaUOgZYLzC2yCWYYQS5mae9wC1gkXIGD51/laeq2E7NpM+nha6kp9weLVyvwf0DLfwsiP+0qlCLrxBLTSRa0HQ+BnQMi4r16Ss7YJwLf/oXrbOVk=

modules/packages/ssh/vps7_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFwb7qi9/DvhpMvu43LRlTEC+3kPAA0KNeyk4FT4HlpRE/yxMxN6tgrP9vcx2c6TMfkRwIJKDcBuVVtKOVx+SDZo+nQBxpSz73v1qSmqlsy8D4gCk0a7cLgStb3Cvh0UZjJ5nVnxjzqY2CFnpnKYGmxL+a3qTj1KYPuA2wSsxkYVcHUfDj/uTtEDdRPaNTACsUxe1a57T/Tsjp+321+zKldYreozaABEBsexf9Z34+3vZvyQcfDB3QuxlBRPJBLik80QllpNpE1bqol8swoGEPbl/Ac7tNy+GtlwTG9SH1povmoT9K+8tjJaG2pD+z+vvgZQtJQh+aczYmEBJRZp3ksw1JH4eGqTWG/SDat9Isnx2NDhJe12b9izniDciuBScNySAazIDPidsCMUYjc9kgWdSOiODOtodj5IB+KazFVJgfpmzPv97LHVdjvR74usrgbFw2mYCw2YEiL3xjDYpQGmXSNklsQLwJiBe59oyS4QNpNYQzYD9StjgRIdvtmiM=