packages.plasma: patch krfb dialog

This reverts commit d45e033314.

.clangd

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

.envrc

@@ -0,0 +1 @@
+use flake

.gitattributes

@@ -1,2 +1,4 @@
 *.png filter=lfs diff=lfs merge=lfs -text
 *.icm filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,3 +1,7 @@
 result
 result-man
 outputs
+.direnv
+build
+.vscode
+.cache

.sops.yaml

@@ -7,39 +7,45 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
   - &nas age19lhcwk37jmvn6z0v4dpdfh0k4u23f76twdjknc0p7atktf37rd7s4t4wj3
   - &xmupc1 age1hnarptkze0ujpp05dqr8uma04cxg9zqcx68qgpks5uf5l6rpk5gqhh8wxg
   - &xmupc2 age1l4stuz0vr7gs7pqwjrmezam44702jp2vmqaqyxw0l0r42kf9updq4dfhrw
+  - &pi3b age1yjgswvexp0x0de0sw4u6hamruzeluxccmx2enxazl6pwhhsr2s9qlxdemq
 creation_rules:
-  - path_regex: devices/pc/secrets/.*$
+  - path_regex: devices/pc/.*$
     key_groups:
     - age:
       - *chn
       - *pc
-  - path_regex: devices/vps6/secrets/.*$
+  - path_regex: devices/vps6/.*$
     key_groups:
     - age:
       - *chn
       - *vps6
-  - path_regex: devices/vps7/secrets/.*$
+  - path_regex: devices/vps7/.*$
     key_groups:
     - age:
       - *chn
       - *vps7
-  - path_regex: devices/nas/secrets/.*$
+  - path_regex: devices/nas/.*$
     key_groups:
     - age:
       - *chn
       - *nas
-  - path_regex: devices/surface/secrets/.*$
+  - path_regex: devices/surface/.*$
     key_groups:
     - age:
       - *chn
       - *surface
-  - path_regex: devices/xmupc1/secrets/.*$
+  - path_regex: devices/xmupc1/.*$
     key_groups:
     - age:
       - *chn
       - *xmupc1
-  - path_regex: devices/xmupc2/secrets/.*$
+  - path_regex: devices/xmupc2/.*$
     key_groups:
     - age:
       - *chn
       - *xmupc2
+  - path_regex: devices/pi3b/.*$
+    key_groups:
+    - age:
+      - *chn
+      - *pi3b

devices/nas/default.nix

@@ -37,48 +37,32 @@ inputs:
             delayedMount = [ "/" "/nix" ];
           };
           swap = [ "/nix/swap/swap" ];
-          rollingRootfs.device = "/dev/mapper/root1";
+          rollingRootfs.waitDevices = [ "/dev/mapper/root2" ];
         };
         initrd.sshd.enable = true;
         grub.installDevice = "efi";
         nixpkgs.march = "silvermont";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        kernel.patches = [ "cjktty" "lantian" ];
-        networking.hostname = "nas";
-        gui.preferred = false;
+        networking = { hostname = "nas"; networkd = {}; };
       };
       hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };
-      packages.packageSet = "desktop-fat";
       services =
       {
         snapper.enable = true;
-        fontconfig.enable = true;
         samba =
         {
           enable = true;
           hostsAllowed = "192.168. 127.";
           shares = { home.path = "/home"; root.path = "/"; };
         };
-        sshd.enable = true;
-        xray.client.enable = true;
-        xrdp = { enable = true; hostname = [ "nas.chn.moe" "office.chn.moe" ]; };
-        groupshare.enable = true;
+        sshd = {};
+        xray.client.dae.wanInterface = [ "enp3s0" ];
+        groupshare = {};
         smartd.enable = true;
-        beesd =
+        beesd.instances =
         {
-          enable = true;
-          instances =
-          {
-            root = { device = "/"; hashTableSizeMB = 4096; threads = 4; };
-            nix = { device = "/nix"; hashTableSizeMB = 128; };
-          };
-        };
-        frpClient =
-        {
-          enable = true;
-          serverName = "frp.chn.moe";
-          user = "nas";
-          stcp.hpc = { localIp = "hpc.xmu.edu.cn"; localPort = 22; };
+          root = { device = "/"; hashTableSizeMB = 4096; threads = 4; };
+          nix = { device = "/nix"; hashTableSizeMB = 128; };
         };
         nginx = { enable = true; applications.webdav.instances."local.webdav.chn.moe" = {}; };
         wireguard =
@@ -89,7 +73,7 @@ inputs:
           wireguardIp = "192.168.83.4";
         };
       };
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
   };
 }

devices/nas/secrets.yaml

@@ -7,10 +7,6 @@ users:
     zem: ENC[AES256_GCM,data:VCVLfGO9a06XhAOBciFf1u7A5jaQikAt2wZf+dCAi1BglXpM6Hof1yAunadYOwLOBFgGlP19kX53CBBlZtaqZFL2GRDzXP0woQ==,iv:AFYtHCCkzNrllN/fjQ8GKYs2TyV3uj3BsU5n1tBQAmM=,tag:5dP7c5N4yG2NS4T+Vg0Zpg==,type:str]
     yjq: ENC[AES256_GCM,data:yn6eGrySCxlRsFioaE2p1qlTHkIGC9l64+edjuDvt232xc+iFeD03EYfuulyr0GxYFwnlAwtaJnyMi5eOrSd1W6HeV3Canzdbw==,iv:qTc6vA8uQza8CB+BvffEN9GqHkiwNM4h9RkqQR14ylk=,tag:UZ2GYCJLjcWLuVXlscLviw==,type:str]
     gb: ENC[AES256_GCM,data:jIR3EVdATYUgWmW4J8RdURJRmDBC84t0S/c2EzWwtFMtjgKlqg52fIfQ66i7RnIYRAoF+s4Ex0aLSejWgzQ69NA/AF0AIS7Y/Q==,iv:mvTCTP0E74QlvM8TcY4o49G5kNGs5HFx3YUrj6mCrwM=,tag:LXfIOyAB10XuHA6Cg7LBeQ==,type:str]
-frp:
-    token: ENC[AES256_GCM,data:zYRZoWa3Llv0NiPXtSfhWUn+wt4uIcw8Wa+QBTzn7gLk6UVIA4FD7FLABBKoFbwg62Fo79Nn,iv:YZdOYkJf6BN76Z68nCtetKElJkqKiYmcx6UmLoIXSdo=,tag:5sC2vt3Z21KhgOU9mrfXhg==,type:str]
-    stcp:
-        hpc: ENC[AES256_GCM,data:lkpM4nzt8ymQ+5eV,iv:LvSShCSN8w0VsJYjICG9NWCMiw7NSPpoSZ+I2t7uILs=,tag:LLry5z4KpPdnN75x8dANqg==,type:str]
 nginx:
     detectAuth:
         chn: ENC[AES256_GCM,data:44vsExbVhO3gnD4Gme92eQ==,iv:LyDvZebs1sDL1/hZQiZdHoPBm4hXtBy56jR73zSH6Aw=,tag:w5xPHnK9XOSS0+97q8b5gQ==,type:str]
@@ -41,8 +37,8 @@ sops:
             by9Rd0U0bzNiK21BQTNxN1RuQ09DQVkKJmSlzV5ppEkZFljsS17ZWmoI++fz4tJh
             kTdoAStG1zsKASHyZTsmdm3RBDO3qV1KhQC2gC7d4EiwNZngxOOZJg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-07T12:35:21Z"
-    mac: ENC[AES256_GCM,data:bR4PPHaGX6VCRP+Ze96sccnwYxnZkfpmJp6iMBzr+W3JRd0VjTEwTH8aNn1WIsNFXco+BCmwroJR07oKYnbusBYgiEeHnkhXvyAELETs7BitH8JrUtSsGs2wJDfkU9fWf6BNT7oHGpP69Tyrl+8v+Q8jyLV8kW8+c7uJPyT2ACQ=,iv:Hl2eX7TV6lgWjUim0m4r44Ji0c9QDH+qzpDyBOTeVp4=,tag:6xkFMQMwEP7IhpXEB4o+hQ==,type:str]
+    lastmodified: "2024-04-18T13:51:13Z"
+    mac: ENC[AES256_GCM,data:mRJEowQNw1aczxkxcBt9Y0LCfv7Q10Of5Bo7nuTYES5/DVRHK8ZRILm9w2/5+jpcRdpFnkvfOZ6yMu0YPipEfa/LeLJIDMHPbp2qgafZ1XSaanT9EC+vr6Lc5tqKoPnDD00+HtX9LqpDOhWvBkuS874O2Hg9HUZd/PrfCj3oFes=,iv:wqbIVCXWtslBfkzyJ5ZLFlyT1GUuu76yk9zlw05is8E=,tag:bkyyWqIrLlfOPlhxsS+a8g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/pc/default.nix

@@ -10,16 +10,16 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/3F57-0EBE" = "/boot/efi";
+            vfat."/dev/disk/by-uuid/E58F-416A" = "/boot/efi";
             btrfs =
             {
-              "/dev/disk/by-uuid/02e426ec-cfa2-4a18-b3a5-57ef04d66614"."/" = "/boot";
+              "/dev/disk/by-uuid/066be4fd-8617-4fe1-9654-c133c2996d33"."/" = "/boot";
               "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
             };
           };
           decrypt.auto =
           {
-            "/dev/disk/by-uuid/55fdd19f-0f1d-4c37-bd4e-6df44fc31f26" = { mapper = "root"; ssd = true; };
+            "/dev/disk/by-uuid/4c73288c-bcd8-4a7e-b683-693f9eed2d81" = { mapper = "root"; ssd = true; };
             "/dev/disk/by-uuid/4be45329-a054-4c20-8965-8c5b7ee6b35d" =
               { mapper = "swap"; ssd = true; before = [ "root" ]; };
           };
@@ -50,22 +50,20 @@ inputs:
             # SERIALIZE SGX WAITPKG WIDEKL XSAVE XSAVEOPT
             "alderlake"
           ];
+          remote.master = { enable = true; hosts = [ "xmupc1" "xmupc2" ]; };
         };
         nixpkgs =
           { march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
-        kernel.patches = [ "cjktty" "lantian" "hibernate-progress" ];
+        kernel.patches = [ "cjktty" "hibernate-progress" ];
         networking.hostname = "pc";
         sysctl.laptop-mode = 5;
+        gui.enable = true;
       };
       hardware =
       {
         cpus = [ "amd" ];
         gpu = { type = "amd+nvidia"; prime.busId = { amd = "8:0:0"; nvidia = "1:0:0"; }; dynamicBoost = true; };
-        bluetooth.enable = true;
-        joystick.enable = true;
-        printer.enable = true;
-        sound.enable = true;
-        legion.enable = true;
+        legion = {};
       };
       packages.packageSet = "workstation";
       virtualization =
@@ -92,10 +90,16 @@ inputs:
             share.path = "/home/chn/share";
           };
         };
-        sshd.enable = true;
-        xray.client.enable = true;
+        sshd = {};
+        xray.client =
+        {
+          dnsmasq.hosts = builtins.listToAttrs (builtins.map
+            (name: { inherit name; value = "74.211.99.69"; })
+            [ "mirism.one" "beta.mirism.one" "ng01.mirism.one" "initrd.vps6.chn.moe" ]);
+          dae.wanInterface = [ "wlp4s0" "enp5s0" ];
+        };
         firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
-        acme = { enable = true; cert."debug.mirism.one" = {}; };
+        acme.cert."debug.mirism.one" = {};
         frpClient =
         {
           enable = true;
@@ -106,7 +110,7 @@ inputs:
         nix-serve = { enable = true; hostname = "nix-store.chn.moe"; };
         smartd.enable = true;
         misskey.instances.misskey.hostname = "xn--qbtm095lrg0bfka60z.chn.moe";
-        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 4096; threads = 4; }; };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 4096; threads = 4; };
         wireguard =
         {
           enable = true;
@@ -115,11 +119,16 @@ inputs:
           wireguardIp = "192.168.83.3";
         };
         gamemode = { enable = true; drmDevice = 1; };
-        slurm = { enable = true; cpu = { cores = 16; threads = 2; }; memoryMB = 94208; gpus."4060" = 1; };
-        xrdp = { enable = true; hostname = [ "pc.chn.moe" ]; };
+        slurm = { enable = true; cpu = { cores = 16; threads = 2; }; memoryMB = 90112; gpus."4060" = 1; };
+        xrdp =
+        {
+          enable = true;
+          hostname = [ "pc.chn.moe" ];
+        };
       };
-      bugs = [ "xmunet" "backlight" "amdpstate" ];
+      bugs = [ "xmunet" "backlight" "amdpstate" "suspend-hibernate-no-platform" ];
     };
+    networking.extraHosts = "74.211.99.69 mirism.one beta.mirism.one ng01.mirism.one";
     services.colord.enable = true;
     virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; };
     specialisation =

devices/pc/secrets/default.yaml

@@ -14,12 +14,12 @@ postgresql:
     misskey_misskey: ENC[AES256_GCM,data:MSDbQffk/WjZ6EYiwVuUMdhdv9VE59ZM7t4XldOKRO0=,iv:J/x9t4Pk5zi7Av9fbzxgAbbtbEUZttSx/JGRmmgmvE4=,tag:CwFR9K++T7YqYR932z3IAg==,type:str]
 redis:
     misskey-misskey: ENC[AES256_GCM,data:vcvQ/hs/F3BZd1sfvWwfEeB8vVoqdnprxobcmL6xsmg=,iv:S32yrjrjj56HbxTlfFGjOb+sO2M9KKEDEazCrpQWj6Q=,tag:iwnvqwQEdd6jicx9jJBdbg==,type:str]
-meilisearch:
-    misskey-misskey: ENC[AES256_GCM,data:/wYR3Bz4LRk/Ks0vizlZS3Ebf5qVfnlBBqZEm/ZIBFdDuhddgu71cqCjTHIKQ6CYh3CoUyguKIIFWku/kOCHKA==,iv:dllKvZwxvZC4pVyEMOB9WNiVBsVxzo5kwbdYKCzzyrY=,tag:MvzqalVvBkyJoLbirN0V8Q==,type:str]
 wireguard:
     privateKey: ENC[AES256_GCM,data:oIpiXJvEoyryS4eEutoe85Af0L5a5iNuOsCWCat9KEhr2ecY/vRimk/1fbA=,iv:dm2hTSNX7Q38yASon5o1jxEJZbWPXUWYydXYMBHF/sE=,tag:yrANhwIF/wHQGHGA1bfPgw==,type:str]
 mariadb:
     slurm: ENC[AES256_GCM,data:fGvNMmqk7Cee28VJ1QoBVrBbgIUbj/F1W0SRjdP8N4K/M8Wx4AVm1kAr0IAhPWyDLXlIjM1NUvuEV5BpYDBdjg==,iv:rFTMJ4x2kgENQUA8ftSaLjdOc25i5mWR3UYbdq54vjs=,tag:6feD0eCSv7bcHWBveLNJwg==,type:str]
+nix:
+    remote: ENC[AES256_GCM,data:uosYkxTCB0wiY+Uufk//OcBZFN3EzbZoQGZ95M9eZMjQ5AobAZqosi4laE+EMcZL1CqYqlWXaSoEUOB8biUaZPseo+1AX1TlmUgZ7QpkfOX0VKZu01C6C+lVyqVqMFq6z1BFyX/oeITMIfnd4a/2KwJCHLAZ4hMkJ5p+aJwByKGa3N/2m41HH/1S3z7pYQWj7YJxunTPPG6WNSiRncQki11rvmddwnXmsBF89+jW1Phge8U295haC57T5oIGPxR645IeTK4ZUlL8eVuZ+BhsnwbkYcaxvjSwe+DOIVPupR8GW+gis7KxwE89kqvnQhinamexcPUz4lGHlqO/Xn6jrJx6T/wXF+19epAzeHapYte3dTWNsdPwPLPJihT16YT5fwrLnH3zq8kexWz1crmnCGUoaBs4S2tHWHLgv2lTv0IHLx5F6ijpDBj/Avg9YILIURzdeea+rBxdycHasUDTVlJtYKRH5J+WbAKWI+oJ5qmXjIRUYL+O9xIUfOGO+1b3xs8MYxRWuvDV2P88N8vN,iv:yQQp5wjbSVn1oia5yL7d6GF9Vo704G0iOQRGMbzQHzg=,tag:bpBag5y5n+7ojOa8QOcDvA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -44,8 +44,8 @@ sops:
             OUlxNjdQaXdXMkZ6bnV1ek4yZ2dpbkEKpKGOAxo5Eef2jtGrg4iSzmGCeg+vTgvu
             +K8b+O19MIkGMDBm6UbYUPtc/7eqoEZRiTUzNMTmfkLVS4ul5zou9A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-07T12:35:41Z"
-    mac: ENC[AES256_GCM,data:Krgtb791wR+S0PQyV2h0Uyh7MKx9fOTHbetmgLoiGOHL8FMSvmWt3LCMQy+RyjnOIj9XRwb8l+kyTqkgeN4zEfKd1uuOh95Z/hLWhCkWs4dPaBu6Uw4aekH9ZUmQJZIr1lt2AIayRsVjaU0dIl4FOcLW+93ls95aluhvPPloJX0=,iv:MmJFdVpF4ZfxMRwbxPV/TC1Qt957vl0QvU0MZzUWdm8=,tag:6+VVFDdPSTycxnKO7Td6VA==,type:str]
+    lastmodified: "2024-04-18T13:48:02Z"
+    mac: ENC[AES256_GCM,data:upQaP/oOym+Wucwb+9o/nZSMfVrzWZvQigiGyZrWjZ4TehMxJt/v69z6bu/h63HzjHA9T5NbthQaJaPo7XmTI97AZS7Dm7kr0gS7P2K7fzdMZ0NAibZmFPIfBBjHykBh77MobVI4RkGuXfLv7yQxIK9ChxQNpLOHlGpOa59bz3w=,iv:0NN0y+7njKL3X8qHEfdCXqTDti+eXSau8FYi9JLutHw=,tag:4t1SiXjxqEUo04L9HXLVzw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/pcarm/default.nix

@@ -0,0 +1,27 @@
+inputs:
+{
+  config =
+  {
+    nixos =
+    {
+      system =
+      {
+        fileSystems =
+        {
+          mount =
+          {
+            vfat."/dev/disk/by-uuid/CE84-E0D8" = "/boot/efi";
+            btrfs."/dev/disk/by-uuid/61f51d93-d3e5-4028-a903-332fafbfd365" =
+              { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; "/nix/boot" = "/boot"; };
+          };
+          rollingRootfs = {};
+        };
+        grub.installDevice = "efi";
+        networking = { hostname = "pcarm"; networkd = {}; };
+        nixpkgs.arch = "aarch64";
+        kernel.variant = "nixos";
+      };
+      services.sshd = {};
+    };
+  };
+}

devices/pi3b/default.nix

@@ -0,0 +1,42 @@
+inputs:
+{
+  config =
+  {
+    nixos =
+    {
+      system =
+      {
+        fileSystems =
+        {
+          mount =
+          {
+            vfat."/dev/disk/by-uuid/ABC6-6B3E" = "/boot/efi";
+            btrfs."/dev/disk/by-uuid/c459c6c0-23a6-4ef2-945a-0bfafa9a45b6" =
+              { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; "/nix/boot" = "/boot"; };
+          };
+          swap = [ "/nix/swap/swap" ];
+          rollingRootfs = {};
+        };
+        grub.installDevice = "efi";
+        networking = { hostname = "pi3b"; networkd = {}; };
+        nixpkgs.arch = "aarch64";
+        kernel.variant = "nixos";
+      };
+      services =
+      {
+        # snapper.enable = true;
+        sshd = {};
+        xray.client.dae.wanInterface = [ "enu1u1" ];
+        fail2ban = {};
+        wireguard =
+        {
+          enable = true;
+          peers = [ "vps6" ];
+          publicKey = "X5SwWQk3JDT8BDxd04PYXTJi5E20mZKP6PplQ+GDnhI=";
+          wireguardIp = "192.168.83.8";
+        };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 32; };
+      };
+    };
+  };
+}

devices/pi3b/secrets.yaml

@@ -0,0 +1,33 @@
+xray-client:
+    uuid: ENC[AES256_GCM,data:82Xg9VkmkLrKKcZfojA7dHqqMZh45n+eL4T5qZ1z/xy9k0q5,iv:/2j9flBDwjY6JW2mHYo1S2VE+ruu6gxrw8BzSyoiPcc=,tag:iq8wzfIRyq1T18k3vStVGw==,type:str]
+wireguard:
+    privateKey: ENC[AES256_GCM,data:8whySpY/4WPWx2+t7IOgn+qjKCsv+BgRtaAFLrP8L0fV3TJdLob5vwDplHk=,iv:kXTDwOyJNzbjPtlzQqNsXtuk3EXFdF9CAsYkvImbyDE=,tag:tsK9nCMmwEb0c08rJ3Iwyg==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6TzU0U2Facm5yWkYrREgw
+            a1Fxc1MxaHYwRWUzUHpsbDBHYVoxb1NKVDAwCjNuUFlabzJ0aWtGMFBQb05nSlRP
+            akwrWDI0QnZBYkFmSUpWZFFnYmQ2aDQKLS0tIGlIQ3lTREN4WXgxV3pNdjdaakF6
+            ZnppV1ZRZzZ5Smt2NGsyRndjTFdnV00KaWVPGLWPnqINH6AHKS/84kuYy/v1v4Tb
+            QdehcMiq5ZF5XLqOX5sMDLu8h96FIklqOSTZNFkzr+s9VYv/UO58rg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1yjgswvexp0x0de0sw4u6hamruzeluxccmx2enxazl6pwhhsr2s9qlxdemq
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyTEZERkRSZUdSN2dySnlI
+            aDFjdXFCWnlJZlpYQmR1WEE2RzdCaVp1WFEwCjd1N1ZpMUExZ0ZBWmFwSHg3RUs4
+            RkRYTjRMWmE5cTA4Z2JJUGgyN05HSmMKLS0tIFpKZmd2Q2k2bnNYK1V2ZnNQNUxH
+            aDU3Vm95ZkpvSTJDMjJEOFY1ZjhrQlUKLdMYiOj6tlzwLpwZsTQVSQ8hHart0ba3
+            NS7+SprzJRb0hQXrvyU6s9zho8dPOw8wiGbscmMXSVS/Kar3eQigmg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-03-28T13:31:33Z"
+    mac: ENC[AES256_GCM,data:fuppF9gFh3O6ZqJRTcVxNqVlz2y5f4xR39JIeInKblh4hNhrdnQg7oh8repoZeXHVRewGeGyxSqzUg+Twy8J+q+d6TSmiDVViD/SHse5rPns2Egt671geF7JmGEB/yKSCbECjGCp0QFgYYEg/vUOaV3v1a0s7LLTE/t2haPIaYc=,iv:f4T7JGxKB3WmEtETuSH7ApKRJ8ptPwZPfspyqc8+vmM=,tag:GF5br+e/p6qHsNCTjfIBCA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1

devices/surface/default.nix

@@ -31,26 +31,19 @@ inputs:
         nixpkgs.march = "skylake";
         grub.installDevice = "efi";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        kernel.patches = [ "cjktty" "lantian" "surface" ];
+        kernel = { variant = "xanmod-lts"; patches = [ "cjktty" "lantian" "surface" ]; };
         networking.hostname = "surface";
+        gui.enable = true;
       };
-      hardware =
-      {
-        cpus = [ "intel" ];
-        gpu.type = "intel";
-        bluetooth.enable = true;
-        joystick.enable = true;
-        printer.enable = true;
-        sound.enable = true;
-      };
-      packages.packageSet = "desktop-fat";
+      hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };
+      packages.packageSet = "desktop-extra";
       virtualization = { docker.enable = true; waydroid.enable = true; };
       services =
       {
         snapper.enable = true;
         fontconfig.enable = true;
-        sshd.enable = true;
-        xray.client.enable = true;
+        sshd = {};
+        xray.client.dae.wanInterface = [ "wlp2s0" ];
         firewall.trustedInterfaces = [ "virbr0" ];
         wireguard =
         {
@@ -59,9 +52,9 @@ inputs:
           publicKey = "j7qEeODVMH31afKUQAmKRGLuqg8Bxd0dIPbo17LHqAo=";
           wireguardIp = "192.168.83.5";
         };
-        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 512; }; };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 512; };
       };
-      bugs = [ "xmunet" ];
+      bugs = [ "xmunet" "suspend-hibernate-no-platform" ];
     };
     boot.kernelParams = [ "intel_iommu=off" ];
     environment.systemPackages = with inputs.pkgs; [ maliit-keyboard maliit-framework ];

devices/vps4/default.nix

@@ -0,0 +1,37 @@
+inputs:
+{
+  config =
+  {
+    nixos =
+    {
+      system =
+      {
+        fileSystems =
+        {
+          mount =
+          {
+            btrfs =
+            {
+              "/dev/disk/by-uuid/24577c0e-d56b-45ba-8b36-95a848228600"."/boot" = "/boot";
+              "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+            };
+          };
+          swap = [ "/nix/swap/swap" ];
+          rollingRootfs = {};
+        };
+        grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
+        nixpkgs.march = "znver2";
+        nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
+        initrd.sshd.enable = true;
+        networking = { hostname = "vps4"; networkd = {}; };
+      };
+      services =
+      {
+        snapper.enable = true;
+        sshd = {};
+        fail2ban = {};
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 64; };
+      };
+    };
+  };
+}

devices/vps4/secrets.yaml

@@ -14,49 +14,26 @@ xray-server:
         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:bnnxo/I=,iv:8jOo0P+8gk05O1vnxOiyGhaeD4wyuaaA3CCr8/DbzII=,tag:J6VSJZoko3EiWyn0ATcmqA==,type:comment]
+        #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:zsCT,iv:iTPnIsLoQKbmJuyFrf/aCKsiOy/TOrnbpJLu6dWFT4o=,tag:lFybPTAA7EedSsJ5dEfCLg==,type:comment]
-        user6: ENC[AES256_GCM,data:WLAKPPIHGvZrTaGMLFRQIgEYWFHYy0mD6sLJEYjCD+g93wek,iv:fCOxekJSBczJz/ODYwWgk1CqERc5q/87C+G/9ETuaSI=,tag:rkpBLQoEOPnWuE+U+BnzIQ==,type:str]
         #ENC[AES256_GCM,data:D5xiJW0Oyg==,iv:9a/6myiT9Crf/fff6ZkXj/obW2k95cABUNqQdPmcwcc=,tag:chs8BA8YtVkM9m3Ey9ETlA==,type:comment]
-        user7: ENC[AES256_GCM,data:7rxvmKbtYrDKBlo8kZIfd86KLd9EcSWB0ikasIRqfCZ24W0h,iv:Uplz4fnFymmBVZ9YTniHFFY3EVSrTYsg1+CTFqBu1WY=,tag:l3EPeYRHSeRsCyRhqFRrEg==,type:str]
+        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]
-        user8: ENC[AES256_GCM,data:FNT3hHMwPJu3iI1LuOP1KvsoOonh+J/ecrNrRQO5TpunDPUq,iv:tTEB0MSUmQ39tNq9v1BTfaEcJY7Y59CPHRASMC1a4U8=,tag:klDm6Isk52hG8ubcFu6yHA==,type:str]
+        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]
-        user9: ENC[AES256_GCM,data:4BD/4MXAVLhDm3EXdgTiEgPketf0WgflVPGb3/JMWXfycEKY,iv:jwE5sFVxZjORwoqCBdufP2EhetVtFGHyCP58AzJwle0=,tag:OCteA20hDBLI9zt1ET0tUQ==,type:str]
-        #ENC[AES256_GCM,data:U48hPlrJn2dF9g==,iv:W+6QEgemNa41VCT2OfBvEhuLAucLxfR+YZiDgdkkSnk=,tag:IhVstGnQ4EviT5ctMgyKiA==,type:comment]
-        user10: ENC[AES256_GCM,data:d9qxJQH9Jo8gJKUi5jjSdVwqzuHG+dj08Tk+TxhczJmlSaFT,iv:DS+9isZX2B9AYAyV4Yle4fpHzA/SHcR56B/GW8QdALw=,tag:9nUQ0OuMCuXGSZs2kjfnIQ==,type:str]
-        #ENC[AES256_GCM,data:DxZrs2B0LyPdLg==,iv:yZzEjyiY2s6gIPTsALl5xOsI0ByDvSBG4SI2+K6TLzI=,tag:hAniFFNS0SueybUKnRd2YQ==,type:comment]
-        user11: ENC[AES256_GCM,data:RPIH0DudfPJwPsa0yFLNqUy2EMwQh1bIqkmhCfteVTkUQGWP,iv:NH0aGTZ6nVqz2nn+o1HQS0PKpqHTBMkAhy0oFeyX/8k=,tag:kgd5zkHXW+oxRFC9x2VTUg==,type:str]
+        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]
-        user12: ENC[AES256_GCM,data:Q+XcMYPWWeHqXZZt3lf9OurlWwVQGBJWTnRwDUvg7np19g3+,iv:ybREjo5/SFRN5LMSyYdm0ygkYoq/G1uBv9K0iGPqrh4=,tag:g2y8IJeXtHW1XjelOvT+/A==,type:str]
-        #ENC[AES256_GCM,data:D5xiJW0Oyg==,iv:9a/6myiT9Crf/fff6ZkXj/obW2k95cABUNqQdPmcwcc=,tag:chs8BA8YtVkM9m3Ey9ETlA==,type:comment]
-        user13: ENC[AES256_GCM,data:IKKk8joJQ5rcSXV84jbYd4uox548czpcgXwTtyK4rFimQIoO,iv:ycVDDSb0qAtZE8WzEdKkaBYKY13JpKj+4xrgkLogikw=,tag:z9ty67NWIgGlh1psbE5qVQ==,type:str]
-        #ENC[AES256_GCM,data:ujz8CAgN2g==,iv:2KP2DwIfIPPnsyZRSptG6x80n0cQGoiYCFoLRbFeEos=,tag:oITBAiHs1odW3heSEOQAJA==,type:comment]
-        user14: ENC[AES256_GCM,data:WFhrirjRUEZlOaCLGvHzvRPyp5O+035k0bNFqCvs0UTdT0+y,iv:C2vvOexQwFFkQyvFd8tf7lca2ZZIF3hbSiOHa2RFfGU=,tag:zowYrIut44mRiq6/h0r4fQ==,type:str]
-        #ENC[AES256_GCM,data:t9mAcEcdBg==,iv:hzqb80+FtfsNP8ofYMyT0PwT8T8B3HYSGZUOrnk3SjM=,tag:0mbDe6S0bqbC/SffMr0AAg==,type:comment]
-        user15: ENC[AES256_GCM,data:Sfc4BWiQ5dz7K0kwlp/1e8x/ahPTnbTvSvFjz9R5KQL52uaO,iv:kzap3jQgm9P22teMkYJHlySh2azLBBuy/kpm+ylxIhM=,tag:2fOBw+McYdT3r+qoF/Wkzw==,type:str]
-        #ENC[AES256_GCM,data:S7Iodket2fLLhcDDuWgv6fVAbcg=,iv:2XlrHA0A36xrmEv7kqtL8i8EYnNpq7cjRMmsF+mPu4s=,tag:M6JvHYU6jqqinPoHcgnEZA==,type:comment]
-        user16: ENC[AES256_GCM,data:ijz4n66TY2tGpKLvGr7I6n+cOP6BfgpJdHmcPy2oTPGCvhR0,iv:RK8wi3Cj9XFVTqqt00DLru12Hiu/WJU8lV/v9MF5deI=,tag:6SHR8Yb2dO1rRY/xV5u9yw==,type:str]
-        #ENC[AES256_GCM,data:inAhj6SP8p4KahuZ+aSjPfnEcOY=,iv:eB6OvUkQvfdAkNuf95K7jAjZZ8i+nbsnsH3WEdRWFhw=,tag:dgw+RFY2cm6jF+R5z3Z+XA==,type:comment]
-        user17: ENC[AES256_GCM,data:Wz7tWzASeIKE9TzicUIwyOnjZDDICYvDAUu/scHrQoFjoOlE,iv:A2gPFSiIXaf1dQkFlXjw5yesKtv3qOVcIXzM2QspvDk=,tag:JWCVx2FJS84v2iMdzBxhlQ==,type:str]
+        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]
-        user18: ENC[AES256_GCM,data:xQMRt+YC1Kn0Qxtis9QVIypq4uHNLq2sWKxxQe515Kfg+zzw,iv:28nQibxqzx5Q17UkEwK0zYhu6mFJ8LUk78xxlQrIqFY=,tag:B7N/fC81v8VBTsDdIZDvDw==,type:str]
-        #ENC[AES256_GCM,data:fZFxSd9QDRBg/X5yFQia96I=,iv:cd9vJ+f+TJr4mmXPNwcsce0p7i36Nkt1OnUzqDhK4hE=,tag:FsOHS+zhr5wZNmJpMfG97w==,type:comment]
-        user19: ENC[AES256_GCM,data:Qjajmu6cfACT4eho6BK56zRd7BSXxo4fUeJ2RRawopVFZESJ,iv:QZN81pQxspe76V90NQxzsKmMwtvaC1qwuvd5a6WbrdU=,tag:/+LYeQLqvwM60DgIPtZzKA==,type:str]
+        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]
-        user20: ENC[AES256_GCM,data:uRSG6jOks7utk2bRdd5sndvqVnSGRhjkts2f3+V7JdEwQf4k,iv:xZdVv/H5RuliwSEWmgLViLquWZ5znGOpP9YwwLJfsyo=,tag:JR3BsCKkHpkE7woTaMHXwQ==,type:str]
-        #ENC[AES256_GCM,data:37f8REUu8PU0lfg=,iv:WOhsotX/O7Gg+YgkK5Fuw/njKz+1OgKSx0vXl1A32XY=,tag:IyjPLut59RuK/PpCyK4ZAQ==,type:comment]
-        user21: ENC[AES256_GCM,data:9cd7IY3zzoziXznclguxbmmZ5hfc2H1DPa+KW1geuybRlpB9,iv:NKwdt7ppRuNpn44f1ypNOoPS27Yqk3Z31ABQbflS9Gg=,tag:S2B1vR0PVd3FYu24XwTfpQ==,type:str]
+        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]
-        user22: ENC[AES256_GCM,data:sCOmhXaJjzDIiuwP3Nh+yXQRYCppATzVWIdjOoMOlu+OFT+U,iv:HKRsCLJ/2jr7rGkM04uv4V1GKQheo2oxeFu4zqxcIAc=,tag:1swUo08hSzJ1PmQr/dBcgQ==,type:str]
-        user23: ENC[AES256_GCM,data:rgS6IdC4DBLvWWBkf5Db54yaNvagfISm5tHUD1KgeqrCR5x/,iv:ANQYEXssMfbU0bvk25dVYq+yQlMiVEyQCwrGPw1AGxc=,tag:d9sOvvxheWwsE/SeOgcWUQ==,type:str]
-        user24: ENC[AES256_GCM,data:3bn/ZG0En/OgY4PA4Ir8MaVWpJbX+ywpkoXQn7HChT+xhKFZ,iv:Jw8AG7vTc6j4VznekF6x2LXkoSFz960yqsSjPm1ORvw=,tag:EszCODBuLULKHJHh4Itq7A==,type:str]
-        user25: ENC[AES256_GCM,data:17bfY/7nClQ3c4OL/aNrUIuafPa1RLc9aLZUCyJMhsKp/1ob,iv:s6OD1AipescKuwdTw8x4hQkfHsl01FCh5c20SnpQk0g=,tag:+vlKdXWI6y7fU0AJIHVRJQ==,type:str]
-        user26: ENC[AES256_GCM,data:ubecAnPqdUhyEWU3vn3cbSFl0Ql/XfUbqWO9553jLqd2DP8R,iv:6GeibZBoBfJHWUjlW/eHbYwj6z9AFXDyom62BCpJp90=,tag:N3Al0SLPbC8lteky+aXNvA==,type:str]
-        user27: ENC[AES256_GCM,data:KM7HUEUHzXd+g/Vxy13uv+zOXLJ1BtSRPUnFIl2/u+ISu6MW,iv:fAxQRVjPsA3cFV1VLyIYMpG60sxi1pWW7153Cc8zjFM=,tag:HtiU8F5shQrFwonQEgQDiA==,type:str]
-        user28: ENC[AES256_GCM,data:FWuW6SmdA9l+yhTE7KEec72KZ7Ab0A9jYEWoHcLm1+DPydHk,iv:WipmZE/tZ5yCU+cDfeJCNpKv8o7T/zrcMzYRIVXI7FM=,tag:IDTNiPBGY9lER8fdIfL/6w==,type:str]
-        user29: ENC[AES256_GCM,data:SSP4igGqVthHTDOxOUodm1KEqPSOikWP/7jFKpYhXGe1wqrF,iv:ri82voK2BEArMlyV9F+NMTXQfV1pakGMoUyKh/LoYN4=,tag:VHZ/3DThAD7NmP3oOGyfcw==,type:str]
+        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]
@@ -100,8 +77,8 @@ sops:
             ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
             ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-09T07:57:44Z"
-    mac: ENC[AES256_GCM,data:urofF4HNdRtVIZYifB0++/vsMWnaPkGxVRG9w2LEdfiELnCuhvEDHdpmVTIVZLPqYWPtqlHMncawD2+Hl3s6sH5K9uJ+/4R46XFS2Y2qr78lIAKc5OAHNiywPoXJ/4mbVWsTAR0MZUO/HpO3IujBXAp9NWqIBh2aGGr9MIQNTc4=,iv:k80R2cB31GCQ+eaevYsRyUYISU4wmJiXPel4YqppzAA=,tag:ZeG5N7KnJTIS4IQ+c9xDPA==,type:str]
+    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]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/vps6/default.nix

@@ -29,14 +29,13 @@ inputs:
         nixpkgs.march = "sandybridge";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
-        networking.hostname = "vps6";
+        networking = { hostname = "vps6"; networkd = {}; };
       };
-      packages.packageSet = "server";
       services =
       {
-        snapper.enable = false;
-        sshd.enable = true;
-        xray.server = { enable = true; serverName = "vps6.xserver.chn.moe"; };
+        snapper.enable = true;
+        sshd = {};
+        xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 14; };
         frpServer = { enable = true; serverName = "frp.chn.moe"; };
         nginx =
         {
@@ -64,20 +63,20 @@ inputs:
             main.enable = true;
           };
         };
-        coturn.enable = true;
-        httpua.enable = true;
+        coturn = {};
+        httpua = {};
         mirism.enable = true;
-        fail2ban.enable = true;
+        fail2ban = {};
         wireguard =
         {
           enable = true;
-          peers = [ "pc" "nas" "vps7" "surface" "xmupc1" "xmupc2" ];
+          peers = [ "pc" "nas" "vps7" "surface" "xmupc1" "xmupc2" "pi3b" ];
           publicKey = "AVOsYUKQQCvo3ctst3vNi8XSVWo1Wh15066aHh+KpF4=";
           wireguardIp = "192.168.83.1";
           listenIp = "74.211.99.69";
           lighthouse = true;
         };
-        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 64; }; };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 64; };
       };
     };
   };

devices/vps6/secrets.yaml

@@ -0,0 +1,84 @@
+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]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1QXc4NzREZHlhMDV2WXlM
+            a2I4d1pjWm9Xd2gzUDUwZ1ZSTkFGR1ZQNDJzCmJwcWFxRWNNVGxTNno2b1NxNktO
+            aHhINXBjdmE3alFGYk9kUHZ1UzdJUk0KLS0tIFdKMDlvb1Z2Qi8xRjl0MXpKMDMz
+            cVVNdDRDNmtHZlJEcVRXR1FLVkZrMWcKn2iTHH7/52fJNXcbDFbzOxNAaiQRA0nO
+            we74EeNzcaaQwuEmBQPKxd/g7/kjhnHzTkoX3OneXMd/gBZMn2knXw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age164tyqklwhdm57tfm5u863mdt2xrzrrzac4py8a0j9y6kzqcjy9zsp073t6
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBycEw1bXA4QUZkUzJ0Z3pM
+            Z0xHam5SLzRGV21XYUtxTFh1VnhQUk1NbzAwCkU1Z3VTR1FtZ05GOWNDOENlZTgz
+            SitzYXo2Q2VEaGtLTGE2UGRoUDkxN28KLS0tIHhRS2Y1cnQreC9Fc2FLdGR1ZXdJ
+            ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
+            ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
+            -----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]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1

devices/vps7/default.nix

@@ -29,41 +29,34 @@ inputs:
         nixpkgs.march = "broadwell";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
-        networking.hostname = "vps7";
-        gui.preferred = false;
+        networking = { hostname = "vps7"; networkd = {}; };
       };
-      packages.packageSet = "desktop";
       services =
       {
         snapper.enable = true;
-        fontconfig.enable = true;
-        sshd.enable = true;
+        sshd = {};
         rsshub.enable = true;
         wallabag.enable = true;
         misskey.instances =
-        {
-          misskey.hostname = "xn--s8w913fdga.chn.moe";
-          misskey-old = { port = 9727; redis.port = 3546; meilisearch.enable = false; };
-        };
+          { misskey.hostname = "xn--s8w913fdga.chn.moe"; misskey-old = { port = 9727; redis.port = 3546; }; };
         synapse.instances =
         {
           synapse.matrixHostname = "synapse.chn.moe";
           matrix = { port = 8009; redisPort = 6380; slidingSyncPort = 9001; };
         };
-        xrdp = { enable = true; hostname = [ "vps7.chn.moe" ]; };
         vaultwarden.enable = true;
-        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 1024; }; };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 1024; };
         photoprism.enable = true;
         nextcloud.enable = true;
         freshrss.enable = true;
         send.enable = true;
         huginn.enable = true;
-        fz-new-order.enable = true;
+        fz-new-order = {};
         nginx.applications = { kkmeeting.enable = true; webdav.instances."webdav.chn.moe" = {}; };
         httpapi.enable = true;
         gitea.enable = true;
         grafana.enable = true;
-        fail2ban.enable = true;
+        fail2ban = {};
         wireguard =
         {
           enable = true;
@@ -73,6 +66,7 @@ inputs:
           listenIp = "95.111.228.40";
         };
         vikunja.enable = true;
+        chatgpt = {};
       };
     };
   };

devices/vps7/secrets.yaml

@@ -4,6 +4,7 @@ nginx:
     detectAuth:
         chn: ENC[AES256_GCM,data:Gk0TTbnFcsvIgoDcen6B8w==,iv:kvyvygw9zDwaiTQ2vPFTHQex0EWDFg8M8U22AConQFM=,tag:ewAZ/nXxmTOhDAjW/A2OnA==,type:str]
         led: ENC[AES256_GCM,data:Owax7cyp,iv:NCEKyicVCYZNgxJzlO90heUmwPjfXbZEcyXX09XQKI4=,tag:WMTCVMVCD9sJgAhRUsqvYg==,type:str]
+        chat: ENC[AES256_GCM,data:1HJiO1zU5SX4G56oWxv5zqGyUqnBWByrtSnQ01wvmZ7PmRkrV+DV6StMg5DtJR9HhkWYnbXlbnBHzP+poPUMag==,iv:sfwI62nwGSnsdj1RyADWgXvp5AY+9RQdtSooxbKFWTs=,tag:pN/LF0mo7RXWoIPPzzs8qw==,type:str]
     maxmind-license: ENC[AES256_GCM,data:9aW4QR3K6S+eTqzIjVlNEwkG0wZ4u5jgRfe7CMwRlJlK4AmcS6c45Q==,iv:cPTN1K4Aag5sohGbCQUZHYTvcwAL7AhF+rrY3OvXGPs=,tag:d9GGUMHnfzRz9Cf2U+dBfw==,type:str]
 redis:
     rsshub: ENC[AES256_GCM,data:uPnZIjbnRRoWIHlWkZNZkMpIb3Ujnnpb+AisVSVGFv4sfDAuDlAjt39pRdnWkCXJPqtXjJzQ+FeT34cqxTf8Bg==,iv:/jcyAHkxByFnbkmCAYQwda2QRmhW7L/ICoLuCgsVLCI=,tag:M5Q+dh/Bn7FiNpqQGYus4Q==,type:str]
@@ -28,8 +29,6 @@ postgresql:
     akkoma: ENC[AES256_GCM,data:6piRt7BbMBLVGdot+VyoJN3/S8DoPNTYHFh/1coHSLNmiA6kU/6sca4Bts1Up/Vu164oTsFAr1JsKx6tzNzAPg==,iv:qplA1GXHwzVrmjm7eagCk3PFa7DRdwaf+p7N1HLb6mw=,tag:W6WedSK3R1IgZVo/0Hr9vA==,type:str]
     synapse_matrix: ENC[AES256_GCM,data:5j+TYJ3vYUqu6CdRDYAT558DsTWbX4Rh+HuukPog5HGXlhneL3RnxVeGBR9CV1rlCP1NY99Nm8roBG+BcyPYHQ==,iv:CboB6lzqxAE/8ZlzaTU3bxw94N6OAhrq8pZ0AfxQiUc=,tag:z6cM3ufgbMn5n5PzgqdRjw==,type:str]
     vikunja: ENC[AES256_GCM,data:syb4NYBxL3DdmZmcC+em0klmm6bkkIL/DH/gnzShYRiaezRFskT+yay9govn++SpbuvkoCJq/GYAFxNL+hcVtw==,iv:TQUgdzYQ0gqsAmux9v3BAQFNzHnCTZ+X/OC0b9Bfya8=,tag:b1AsiAW5XzA3DzGdf8J03g==,type:str]
-meilisearch:
-    misskey-misskey: ENC[AES256_GCM,data:4s+qqd6mmstioC0XmG/vA6ED9mzu1vRJVPFFalRiqnnsFy0dYEU87H+y12eOp/KDSLdTNvpp6Z6jCNvxnpDXzQ==,iv:x6L9OPu/dwVsD9pYb4dqavw9NesMbo7LB+rwz6veAR4=,tag:/BBqV2sHIgPas7XsZydh2g==,type:str]
 rsshub:
     pixiv-refreshtoken: ENC[AES256_GCM,data:EeSOTSAAh+1Dc8+a/AaPJ0aBK5DTa3pdS6DrIMQmRw/n0SRu2QoynIF76w==,iv:dnZxi8jM1I4w3C2duYielpP/8wOAdHDjcqDIrowM0dM=,tag:8irGvLEbRJHV9TB8Jibs9g==,type:str]
     youtube-key: ENC[AES256_GCM,data:OEm/ynOUPUq7ZEVzL2jgs9d+utkLTIdNq0MHE0JDujb9ndAwyJJI,iv:RRae6Cg6GdDnXAQOdtBYmcA7ZNuu70VpIg2MEezBn5k=,tag:gX4ZG345cT3Jh3ovUxtLGw==,type:str]
@@ -106,6 +105,8 @@ wireguard:
     privateKey: ENC[AES256_GCM,data:TS+toaJRgAvC78XVwTciXe2IG8++vaqXVCi/u/8Aej6qq1B9Cb6f20cp5K0=,iv:T/NkLvcYiWzIDG3jWtuhe/sH2GT4z5f0xdUGbSL901I=,tag:qN7YokFBj3Kbbx4ijHTRnw==,type:str]
 vikunja:
     jwtsecret: ENC[AES256_GCM,data:p6e22qPJzTGB21oWhSr8AA4bfrele9ZOHVtZ8BHgX21IhoKdm58coGtSX1CGXR7J6+1/74RdLY9K88nGrM1F1w==,iv:DGUO8rhf7Lg9dTqSmzlR/Jd2K4oUjO8w9E5bihwsykI=,tag:SpX6UI0QIju/tC1fIL9CCg==,type:str]
+chatgpt:
+    key: ENC[AES256_GCM,data:bkLxKUqkjwpUeqeAZCaAgKiOse8QtZ0zOn9TQNA84+B3rxNiTFPisI8=,iv:Zd5dO5Sdt4HCvNZgS2K0FjJAzti6oE22vahYQl99TrI=,tag:E3o+X84tRsIEGU9Jfb85JQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -130,8 +131,8 @@ sops:
             SnFHS1Z0SXUzTFdEd29KTy9DU3Y3R0UKfhh+rUmWDrf+UGjclP57dHipPLFoXSqy
             HdelmfV6q4/c7ppx2E+oZw3VNgoZCsrxxzYZfwxHJiZb+5vkE0D8iA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-07T12:36:38Z"
-    mac: ENC[AES256_GCM,data:Pe1wXpemyIGckkldnOy7sWYTp/SlHT7ffNzJbeNwK9hSRGbpU9as7BQ8IenrHbO9U5QT7oij3PdzLk88ImVCbu0rZ8P6k6JbbrSEUSeN+9IRPnMDbIcpd+HQ+Ite4UjLwX7UxPuy0yRCYHiu2Fu2JpdWf+uL5bc/ZFnJ887+3lA=,iv:JmII0faZo+upukOJeCS7AbpCr2wKR5YjPX/W+kJnFUE=,tag:w5woNqrhJbZM38/RPWYmnw==,type:str]
+    lastmodified: "2024-04-18T13:48:22Z"
+    mac: ENC[AES256_GCM,data:LjUMKJBWlNb/7s2VfFQATmRNPpmP0w7wZ+/7R2rpeH/1rTUH7ee3f3tutHijF1MnFjx1Z22iGC0jW/P9VBedKSETJBhQQ9lHZDqr7dzr+InbnYQ1sCt2LnLBu1m7bACgOxh9xr9v8pGIj9UdW+9gMhpSIB5r8h6/cIuBiO/7eqs=,iv:d0qj6vZSHoeuZNsLCzAJ6Ono4Mqf01SWkygItkP5Vco=,tag:CAQ2O6/86Smc77qrfcU7Xg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/xmupc1/README.md

@@ -1,49 +1,53 @@
-# slurm
+# 硬件
+
+* CPU：16 核 32 线程。
+* 内存：96 G。
+* 显卡：
+  * 4090：24 G 显存。
+  * 3090：24 G 显存。
+  * 2080Ti: 12 G 显存。
+* 硬盘：2 T。
+
+# 队列系统（SLURM）
 
 ## 基本概念
 
-队列系统换成了 slurm。这是个正经的队列系统（不像之前那样是临时手搓的），可靠性应该会好很多。
-学校的 hpc 上用的是 PBS，和这个不一样，但很多概念是相通的，例如队列、节点等（当然这里只有一个队列和一个节点）。
-这里简单记录一下如何使用。更多内容，网上随便搜一下 slurm 的教程就可以找到很多介绍，也可以看官网文档。
-
-先说明一下机器的硬件配置：CPU 有 16 个核，每个核 2 线程，也就是总共 32 个线程。
-slurm 限制 CPU 按照核（而不是线程）分配，
-  提交任务时， `sbatch` 命令中的 `cpu` 或者 `core` （它俩是同义词）都是指核的数量而不是线程数
-  （也就是说，实际运行的线程数要再乘以 2）。
-
-VASP 支持两个层面的并行，一个叫 MPI，一个叫 OpenMP，实际运行的线程数是两者的乘积。
-MPI 并行的数量就是提交任务时指定的 task 的数量，
-  OpenMP 并行的数量等于提交任务时指定的分配给每个 task 的 CPU 的数量再乘以 2，
-  也就是最终的线程数等于指定的 CPU 数量乘以 2。
-此外还有一个限制：当使用 GPU 时，MPI 并行的数量必须等于 GPU 的数量，否则 VASP 会在开头报个警告然后只用 CPU 计算（但不会报错）。
+SLURM 是一个用来对任务排队的系统，轮到某个任务时，再调用其它程序来执行这个任务。
 
 ## 常用命令
 
 提交一个 VASP GPU 任务的例子：
 
 ```bash
-sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia-6.4.0 mpirun vasp-std
+sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia-640
 ```
 
-* `--gpus=1` 指定使用一个 GPU（排到这个任务时哪个空闲就使用哪个）。
-  可以指定具体使用哪个GPU，例如 `--gpus=4090:1`。
-  可以简写为 `-G`。
-  这个选项实际上是 `--gres` 选项的一种简便写法，当需求更复杂时（例如，指定使用一个 3090 和一个 4090）时，就需要用 `--gres`。
-  例如：`--gres=gpu:3090:1,gpu:4090:1`。
-  “gre” 是 “generic resource” 的缩写。
-* `--ntasks-per-gpu=1` 是一定要写的。
-* `--job-name=` 指定任务的名字。可以简写为 `-J`。也可以不指定。
-* 默认情况下，一个 task 会搭配分配一个 CPU 核（两个线程），一般不用修改。如果一定要修改，用 `--cpus-per-task`。
+* `--gpus` 指定使用GPU 的情况：
+  * 要占用任意一个 GPU（排到这个任务时哪个空闲就使用哪个），写 `--gpus=1`。要占用任意两个就写 `--gpus=2`，以此类推。
+    但一般来说，**单个任务不要占用超过一个 GPU**，多个显卡的速度会比单个更慢。
+  * 要指定具体使用哪个 GPU 时，写 `--gpus=4090:1`。2080 Ti 需要写为 `2080_ti`，P5000 需要写为 `p5000`。
+  * 当需要使用多个不同类型的显卡（例如，指定使用一个 3090 和一个 4090）时，写 `--gres=gpu:3090:1,gpu:4090:1`。
+* `--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 CPU 任务的例子：
 
 ```bash
-sbatch --ntasks=2 --cpus-per-task=2 --job-name="my great job" vasp-gnu-6.4.0 mpirun vasp-std
+sbatch --ntasks=4 --cpus-per-task=4 --hint=nomultithread --job-name="my great job" vasp-intel-640
 ```
 
-* `--ntasks=2` 指定在 MPI 层面上并行的数量。
-  可以简写为 `-n`。
-* `--cpus-per-task=2` 指定每个 task 使用的 CPU 核的数量，OpenMP 并行的数量等于这个数再乘以 2。
+* `--ntasks=4 --cpus-per-task=4` 指定使用占用多少核。
+  * CPU 的调度是个非常复杂的问题，而且 slurm 和 Intel MPI 之间的兼容性也不算好，因此**推荐照抄下面的设置**。
+    也可以自己测试一下怎样分配更好，但不要随意地设置。不同的设置会成倍地影响性能。
+    * 对于 xmupc1：`--ntasks=3 --cpus-per-task=4`。
+    * 对于 xmupc2：`--ntasks=4 --cpus-per-task=10`。
+* `--hint=nomultithread` 记得写。
+* `--job-name=xxx` 指定任务的名字。可以简写为 `-J`。也可以不指定。
+* `vasp-intel-640` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-intel-640-gam`。
+
+要把其它程序提交到队列里，也是类似的写法。请自行举一反三。
 
 要列出已经提交（包括已经完成、取消、失败）的任务：
 
@@ -62,13 +66,25 @@ scancel -n my_great_job
 scancel -u chn
 ```
 
-要将自己已经提交的一个任务优先级提到最高（只是自己已经提交任务的最高，不影响别人的任务）：
+要将自己已经提交的一个任务优先级提到最高（相应降低其它任务的优先级，使得总体来说不影响别人的任务）：
 
 ```bash
-scontrol top job_id
+scontrol top 114514
 ```
 
-## sbatch 的更多参数
+要显示一个任务的详细信息（不包括服务器重启之前算过的任务）：
+
+```bash
+scontrol show job 114514
+```
+
+要显示一个任务的详细信息（包括服务器重启之前算过的任务）：
+
+```bash
+sacct --units M --format=ALL -j 114514 | bat -S
+```
+
+## `sbatch` 的更多参数
 
 ```bash
 # 提交一个新任务，但是礼让后面的任务（推迟到指定时间再开始排队）
@@ -101,25 +117,167 @@ scontrol top job_id
 --wrap=
 ```
 
-# ssh
+# 支持的连接协议
+
+## SSH
 
 ssh 就是 putty winscp 之类的工具使用的那个协议。
 
-* 地址：office.chn.moe（如果在校外，需要厦大 VPN）
+* 地址：xmupc1.chn.moe
 * 端口：6007
 * 用户名：自己名字的拼音首字母
 * 可以用密码登陆，也可以用证书登陆。
 
-要从本机登陆到学校 hpc 的 jykang 账户，使用下面的命令：
+从一台服务器登陆到其它服务器，只需要使用 `ssh`` 命令：
 
 ```bash
 ssh jykang
+ssh xmupc1
+ssh xmupc2
+ssh user@host
 ```
 
-# rdp
+直接从另外一台服务器下载文件，可以使用 `rsync` 命令：
+
+```bash
+rsync -avzP jykang:/path/to/remote/directory_or_file /path/to/local/directory
+```
+
+将另外一个服务器的某个目录挂载到这个服务器，可以使用 `sshfs` 命令：
+
+```bash
+sshfs jykang:/path/to/remote/directory /path/to/local/directory
+```
+
+用完之后记得卸载（不卸载也不会有什么后果，只是怕之后忘记了以为这是本地的目录，以及如果网络不稳定的话，运行在这里的软件可能会卡住）：
+
+```bash
+umount /path/to/local/directory
+```
+
+如果不喜欢敲命令来挂载/卸载远程目录，也可以 RDP 登陆后用 dolphin。
+
+## RDP
 
 就是 windows 那个远程桌面。
 
-* 地址：xmupc1.chn.moe（如果在校外，需要厦大 VPN）
+* 地址：xmupc1.chn.moe
 * 用户名：自己名字的拼音首字母
-* 密码和 ssh 一样。
+* 密码和 ssh 一样（使用同样的验证机制）。
+
+RDP 暂时没有硬件加速（主要是毛玻璃之类的特效会有点卡）。
+
+记得在连接时，点击“显示选项”，将“体验”中的连接速度改为“LAN（10 Mbps 或更高）”，不然会很卡。
+
+## samba
+
+samba 就是 windows 共享文件夹的那个协议。
+
+* 地址：xmupc1.chn.moe
+* 用户名：自己名字的拼音首字母
+* 初始密码和 ssh 一样，你可以自己修改密码（使用 `smbpasswd` 命令）。samba 的密码和 ssh/rdp 的密码是分开的，它们使用不同的验证机制。
+
+在 windows 上，可以直接在资源管理器中输入 `\\xmupc1.chn.moe` 访问。
+也可以将它作为一个网络驱动器添加（地址同样是 `\\xmupc1.chn.moe`）。
+
+# 计算软件
+
+## VASP
+
+VASP 有很多很多个版本，具体来说：
+
+* VASP 多个版本可以共存，但为了简单只安装了 6.4.0 版本。
+* VASP 可以用不同的编译器编译。目前安装的有：nvidia、intel。nvidia 使用 GPU 计算，intel 能用 CPU 计算。其它版本性能不佳，没有安装。
+* VASP 的 std/gam/ncl 版本有一点区别，一般用 std，只有一个 gamma 点的时候用 gam 会快一点，系统中存在方向不平行的磁矩时必须用 ncl。
+* 无论哪个版本，都集成了下面这些补丁：
+  * HDF5：用于生成 hdf5 格式的输出文件。
+  * wannier90：我也不知道干啥的，随手加上的。
+  * OPTCELL：如果存在一个 `OPTCELL` 文件，VASP 会据此决定弛豫时仅优化哪几个晶胞参数。
+  * MPI shared memory：用来减小内存占用。
+  * VTST tools：用来计算 neb。
+
+如何提交 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
+```
+
+其中 `CUDA_VISIBLE_DEVICES` 用于指定用哪几个显卡计算（多个显卡用逗号分隔）。
+要查看显卡的编号，可以用 `CUDA_DEVICE_ORDER=PCI_BUS_ID vasp-nvidia-640-env nvaccelinfo` 命令。
+
+这里 `vasp-xxx-6.4.0` 命令的作用是，进入一个安装了对应版本的 VASP 的环境，实际上和 VASP 关系不大；
+  后面的 `mpirun xxx` 才是真的调用 VASP。
+所以实际上你也可以在这个环境里做别的事情，例如执行上面的 `nvaccelinfo` 命令。
+
+要使用 VTST tools 里带的脚本，需要在命令前加上 `vtstscripts` 。例如：
+
+```bash
+vtstscripts dist.pl POSCAR.init POSCAR.final
+```
+
+## mumax
+
+问龚斌，我没用过。
+
+## lammps
+
+除了我应该没人用，就不写了。
+
+## quantum espresso
+
+我也只用过一次。大规模用到了再说吧。
+
+# 其它软件
+
+我自己电脑上有的软件，服务器都有装，用于科研的比如 VESTA 什么的。可以自己去菜单里翻一翻。
+
+## 操作系统
+
+操作系统是 NixOS，是一个相对来说比较小众的系统。
+它是一个所谓“函数式”的系统。
+也就说，理想情况下，系统的状态（包括装了什么软件、每个软件和服务的设置等等）是由一组配置文件唯一决定的（这组配置文件放在 `/etc/nixos` 中）。
+要修改系统的状态（新增软件、修改设置等等），只需要修改这组配置文件，然后要求系统应用这组配置文件就可以了，
+  系统会自动计算出应该怎么做（增加、删除、修改哪些文件，重启哪些服务等等）。
+这样设计有许多好处，例如可以方便地回滚到之前任意一个时刻的状态（方便在调试时试错）；
+  一份配置文件可以描述多台机器的系统，在一台上调试好后在其它机器上直接部署；
+  以及适合抄或者引用别人写好的配置文件。
+
+以上都是对于管理员来说的好处。对于用户来说的好处不是太多，但是也有一些。
+举个例子，如果用户需要使用一个没有安装的软件（例如 `phonopy`，当然实际上这个已经装了），只需要在要执行的命令前加一个逗号：
+
+```bash
+, phonopy --dim 2 2 2
+```
+
+系统就会帮你下载所有的依赖，并在一个隔离的环境中运行这个命令（不会影响这之后系统的状态）。
+
+还有一个命令可能也有用，叫 `try`。
+它会在当前的文件系统上添加一个 overlay，之后执行的命令对文件的修改只会发生在这个 overlay 上；
+  命令执行完成后，它会告诉你哪些文件发生了改变，然后可以选择实际应用这些改变还是丢弃这些改变。
+例如：
+
+```bash
+try phonopy --dim 2 2 2
+```
+
+这个命令和 NixOS 无关，只是突然想起来了。
+
+## 文件系统
+
+文件系统是 BtrFS。它的好处有：
+
+* 同样的内容只占用一份空间；以及内容会被压缩存储（在读取时自动解压）。这样大致可以节省一半左右的空间。
+  例如现在 xll 目录里放了 213 G 文件，但只占用了 137 G 空间。
+* 每小时自动备份，放置在 `/nix/persistent/.snapshots` 中，大致上会保留最近一周的备份。如果你误删了什么文件，可以去里面找回。
+
+## ZSH
+
+所谓 “shell” 就是将敲击的一行行命令转换成操作系统能理解的系统调用（C 语言的函数）的那个东西，也就是负责解释敲进去的命令的意思的那个程序。
+
+大多情况下默认的 shell 是 bash，但我装的服务器上用 zsh。
+zsh 几乎完全兼容 bash 的语法，除此以外有一些顺手的功能：
+* 如果忘记了曾经输入过的一个命令，输入其中的几个连续的字母或者单词（不一定是开头的几个字母），然后按 `↑` 键，就会自动在历史命令中依次搜索。
+  例如我输入 `install` 按几下 `↑` 键，就可以找到 `sudo nixos-rebuild boot --flake . --install-bootloader --option substituters https://nix-store.chn.moe` 这个东西。
+* 如果从头开始输入一个曾经输入过的命令，会用浅灰色提示这个命令。要直接补全全部命令，按 `→` 键。要补全一个单词，按 `Ctrl` + `→` 键。
+* 常用的命令，以及常用命令的常用选项，按几下 `tab` 键，会自动补全或者弹出提示。

devices/xmupc1/default.nix

@@ -24,11 +24,7 @@ inputs:
             };
           };
           swap = [ "/nix/swap/swap" ];
-          rollingRootfs =
-          {
-            device = "/dev/disk/by-uuid/a04a1fb0-e4ed-4c91-9846-2f9e716f6e12";
-            waitDevices = [ "/dev/disk/by-partuuid/cdbfc7d4-965e-42f2-89a3-eb2202849429" ];
-          };
+          rollingRootfs = {};
         };
         grub.installDevice = "efi";
         nixpkgs =
@@ -39,6 +35,8 @@ inputs:
             enable = true;
             capabilities =
             [
+              # p5000 p400
+              "6.1"
               # 2080 Ti
               "7.5"
               # 3090
@@ -49,37 +47,25 @@ inputs:
             forwardCompat = false;
           };
         };
-        gui = { preferred = false; autoStart = true; };
-        kernel.patches = [ "cjktty" "lantian" ];
+        gui = { enable = true; preferred = false; autoStart = true; };
         networking.hostname = "xmupc1";
+        nix.remote.slave.enable = true;
       };
-      hardware =
-      {
-        cpus = [ "amd" ];
-        gpu.type = "nvidia";
-        bluetooth.enable = true;
-        joystick.enable = true;
-        printer.enable = true;
-        sound.enable = true;
-      };
+      hardware = { cpus = [ "amd" ]; gpu.type = "nvidia"; };
       packages.packageSet = "workstation";
       virtualization = { waydroid.enable = true; docker.enable = true; kvmHost = { enable = true; gui = true; }; };
       services =
       {
         snapper.enable = true;
         fontconfig.enable = true;
-        sshd = { enable = true; passwordAuthentication = true; };
-        xray.client.enable = true;
+        sshd = { passwordAuthentication = true; groupBanner = true; };
+        xray.client.dae.wanInterface = [ "wlp57s0" ];
         firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
         smartd.enable = true;
-        beesd =
+        beesd.instances =
         {
-          enable = true;
-          instances =
-          {
-            root = { device = "/"; hashTableSizeMB = 16384; threads = 4; };
-            nix = { device = "/nix"; hashTableSizeMB = 512; };
-          };
+          root = { device = "/"; hashTableSizeMB = 16384; threads = 4; };
+          nix = { device = "/nix"; hashTableSizeMB = 512; };
         };
         wireguard =
         {
@@ -93,18 +79,19 @@ inputs:
           enable = true;
           cpu = { cores = 16; threads = 2; };
           memoryMB = 94208;
-          gpus = { "3090" = 1; "4090" = 1; };
+          gpus = { "2080_ti" = 1; "3090" = 1; "4090" = 1; };
         };
         xrdp = { enable = true; hostname = [ "xmupc1.chn.moe" ]; };
         samba =
         {
           enable = true;
-          hostsAllowed = "192.168. 127.";
+          hostsAllowed = "";
           shares = { home.path = "/home"; root.path = "/"; };
         };
+        groupshare = {};
       };
       bugs = [ "xmunet" "amdpstate" ];
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
     services.hardware.bolt.enable = true;
   };

devices/xmupc1/secrets/default.yaml

@@ -7,10 +7,14 @@ xray-client:
 wireguard:
     privateKey: ENC[AES256_GCM,data:Azaqung7llErB7/IdnOnEkwjQ39yQHKcO7VgvMDCDTExM7nS0zx+yMYX4ls=,iv:FX8oLHMBVEnKkYOg8q2A9vFmtRZDws5T87+lEl7+2G8=,tag:DdOQUbNKB6JK7Tp6McQ0Og==,type:str]
 users:
-    xll: ENC[AES256_GCM,data:tGzKVg4prhg9oXOSX0FJIAWdF79CWsFuiU8U12dSnkBIgRXPZlJkz9mLLTENm6SjftItt/ku4MDj94KnM+nPYkIorTYtEuergg==,iv:oavvRf7/21LuDksUiXLfR2/qQNz5O6JyroxX1DwC6gc=,tag:qYbW1ZQtXo+2qGrl5wuZkA==,type:str]
-    zem: ENC[AES256_GCM,data:r2BDtAfMohsnoqw51/flvkiXe/EtJtDhakEyOTPX2E7cikfPtPD9iJPd2RnNkS3QPBKg08ex5ce2e3ywzGgNX5RKrxIacpxSSA==,iv:VfhEqTvS9qVFGif+SkBdz8VR6BXEnncMYcPQW4qqNk8=,tag:t4JBEhX+6iqnrd0JoLKpmA==,type:str]
-    yjq: ENC[AES256_GCM,data:Yb9gVDrWhpmBYI8JlGee30J+PVFVGLo4btFVGToUVj3Sr2bPetY96mEJoxYQha7SPKBoZ7+ePzWYiYOi43MZ6sYndj3C6sYmYg==,iv:2H2+ZmIIDJAKds1XSMqVcUpsix3rbxLkVlBIIAK3ifg=,tag:7redx03BsscRrk+e7dqXdg==,type:str]
-    gb: ENC[AES256_GCM,data:ZoprrHc2l0nkqy4ujYQfxNENMEnfpRhCIxX7jMPoWeTrJt2sE1AloWeVFsArJKTx8krpW96X3AXpUIauMH9kc/CviPop2QMgDw==,iv:fOIVPEHDvyZ45G9uRbx2gBE0KuZy+aEWALlXusDJ1YU=,tag:G6hZLn9/99Kj+wZAeNyxkQ==,type:str]
+    #ENC[AES256_GCM,data:1RG/IM/UrLCk,iv:LY2QCBN0gYwuhVwS/WIrjt4MEHhjPPQG+cjTZJhU6Zc=,tag:AEL+smmitSqW+D70K74LbQ==,type:comment]
+    xll: ENC[AES256_GCM,data:YauaeGHDVAnMXp9hSz4r4jNsioF79Q+WplfsYGpl4g5FxoakhfjRlnfzrLmMO3mWEIBOmDqeShbDEulyV5O47CIBGaMUUHe+Gg==,iv:RNwRfghJBb0PO4A/T5d5J1U0NsXdygXlWq/FfF8MO4U=,tag:BOh666TYGbCCHcgB/uBhTw==,type:str]
+    #ENC[AES256_GCM,data:zxOQcoOzJNBK,iv:YJQB8lV+nhwm5XYMpDIyt0IDHBlHTiHO8cpgXkXe/dQ=,tag:re5ekGkYRewPdxv83mtLUQ==,type:comment]
+    zem: ENC[AES256_GCM,data:bIxVN4T3Gh3aSa1gylkPmW3/uT5xQAlruC+L3zk0Tc3KvwBCQA5DpxXU8ZxjeK0P0xGi02U7gFWgm+yxp6otdCsUEmWed4EHHw==,iv:vpKpY0nRUwuI5mCcYTOD3zN/E21wHl4ZbRDUPoFmdhQ=,tag:m5WTzCgOTC7oqU4yfV9gkQ==,type:str]
+    #ENC[AES256_GCM,data:ZnMFN0WzjKDd,iv:t1YHrNoHOohYsdBOqoV6OtfS5ig6CTS8jW5mKy0oSQA=,tag:WkgrH1ZXcbHruxJY/hVsmg==,type:comment]
+    yjq: ENC[AES256_GCM,data:ua0DINHutjt2Pk+SfHRQRV99mT3Cnw6rRKO8VRIAlP0dY6QhK9wkNdyRYWYRBKVrWgyFQMGNFYAxIpymjF/X7mBOVI2sOHLgkw==,iv:PUZ6S0KICuqoSA2sDLxdL4gtAOQnQXOUY+5f3qDZgpc=,tag:f39P34vAUOrV23BsKkRarA==,type:str]
+    #ENC[AES256_GCM,data:6qNjSdjck4Vz,iv:c/GNqCNgRgwgL+2f6Vumtjb/ub9WCBSy8R02NRCDqk8=,tag:b/tucJsHTjSfcK0vgHtE8A==,type:comment]
+    gb: ENC[AES256_GCM,data:3eAKBiJoC1owCHTFd3Xq8vI8VK980evePc92xCXJJ21M9D1MdbwN8ySZ3Ovjk7VfQmEo8oRv1Ll1sftyrXYoeTHmJsNDxCpR6A==,iv:Ju/ERNuGrgO5kYlbvmkbLJkgiW3Elou34AsJTFITCUg=,tag:POVlxYh9kZ1BMSbt97IVOQ==,type:str]
 mariadb:
     slurm: ENC[AES256_GCM,data:qQMD8SKNmxb3PdScXNqppF9zkX7dV5i7rvljvZuhiI5zLnu77qYCHBW6ymh0mrY14N9NjxmQZhZWX/H8TvBlcg==,iv:J5N3LjCYW3QmuEkMBpl7qvPFW1Z9ZoPLkj45jKcIW9U=,tag:Tl+ld07+lVkmzt7f/f2MqQ==,type:str]
 sops:
@@ -37,8 +41,8 @@ sops:
             ZDNHUjE2QVlCV3p0NHdKYW5IMHVBZzQKkZtfyvfroOntg3yRjMw4jQHiQj8eaB2h
             IeIHfW4y01mmVT2ofbtB0xYpjcl4gtUlQ8X3tn5iJ9P8gcVo0G598A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-26T06:04:25Z"
-    mac: ENC[AES256_GCM,data:2d3i3rcRYrB58vJuyhP4AIB11Ns+zQq0Pli1LF4sAKb75OmJ/qlRcwJKlOCASdY95FfzOQDGjfZheg58fVSd9EbYxX+npMXGUiODa8JRTHgQye3/qjFv14v49zKFJ0dNs13XnOEA4QAry/7gDlb0+M44bNRGPSZSoFX2yJ53smw=,iv:I1YDN6+26BmaWR84kq9zXNXjQ4cRvtzrS2Q13PlUjp0=,tag:sgxcTpOr7T2oXjb5qLRrqw==,type:str]
+    lastmodified: "2024-03-10T13:47:17Z"
+    mac: ENC[AES256_GCM,data:19w2Q1SRhKIyxibGgKa+CkEhiizFJ27FePOlMll+8tJVJRzfIl8KrutlRi0hMhEYFlML0bWunbINUEIg7yJbIwFCSjxFDnqKsCT3iClT3kaktxr5+0R+ECoQTGGV67VkT5WY/LT3V1zdLYI38MVaBQObGKCpBs23nIK2QXrg39Q=,iv:q1ezSmo14vsmEE8owxnsonWMq2uj6mrVjKNh+RuK+cE=,tag:QBc99UEaEPiEgZH+Z3Z8tA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/xmupc2/README.md

@@ -0,0 +1,31 @@
+# 硬件
+
+* CPU：44 核 88 线程。
+* 内存：256 G。
+* 显卡：
+  * 4090：24 G 显存。
+  * P5000：16 G 显存。
+* 硬盘：18 T。
+
+# 支持的连接协议
+
+## SSH
+
+* 地址：xmupc2.chn.moe
+* 端口：6394
+* 用户名：自己名字的拼音首字母
+* 可以用密码登陆，也可以用证书登陆。
+
+## RDP
+
+* 地址：xmupc2.chn.moe
+* 用户名：自己名字的拼音首字母
+* 密码和 ssh 一样（使用同样的验证机制）。
+
+## samba
+
+* 地址：xmupc2.chn.moe
+* 用户名：自己名字的拼音首字母
+* 初始密码和 ssh 一样。
+
+其它内容请阅读 [xmupc1](../xmupc1) 的说明，两台机器的软件大致是一样的。

devices/xmupc2/default.nix

@@ -18,7 +18,7 @@ inputs:
             };
           };
           swap = [ "/nix/swap/swap" ];
-          rollingRootfs.device = "/dev/disk/by-uuid/d187e03c-a2b6-455b-931a-8d35b529edac";
+          rollingRootfs = {};
         };
         grub.installDevice = "efi";
         nixpkgs =
@@ -41,34 +41,22 @@ inputs:
             forwardCompat = false;
           };
         };
-        gui = { preferred = false; autoStart = true; };
-        kernel.patches = [ "cjktty" "lantian" ];
+        gui = { enable = true; preferred = false; autoStart = true; };
         networking.hostname = "xmupc2";
+        nix.remote.slave.enable = true;
       };
-      hardware =
-      {
-        cpus = [ "intel" ];
-        gpu.type = "nvidia";
-        bluetooth.enable = true;
-        joystick.enable = true;
-        printer.enable = true;
-        sound.enable = true;
-      };
+      hardware = { cpus = [ "intel" ]; gpu.type = "nvidia"; };
       packages.packageSet = "workstation";
       virtualization = { waydroid.enable = true; docker.enable = true; kvmHost = { enable = true; gui = true; }; };
       services =
       {
-        snapper.enable = false;
+        snapper.enable = true;
         fontconfig.enable = true;
-        sshd = { enable = true; passwordAuthentication = true; };
-        xray.client.enable = true;
+        sshd = { passwordAuthentication = true; groupBanner = true; };
+        xray.client.dae.wanInterface = [ "wlp4s0" ];
         firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
         smartd.enable = true;
-        beesd =
-        {
-          enable = false;
-          instances.root = { device = "/"; hashTableSizeMB = 16384; threads = 4; };
-        };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 16384; threads = 4; };
         wireguard =
         {
           enable = true;
@@ -81,18 +69,14 @@ inputs:
           enable = true;
           cpu = { sockets = 2; cores = 22; threads = 2; };
           memoryMB = 253952;
-          gpus = { "p400" = 1; };
-        };
-        xrdp = { enable = false; hostname = [ "xmupc2.chn.moe" ]; };
-        samba =
-        {
-          enable = true;
-          hostsAllowed = "192.168. 127.";
-          shares = { home.path = "/home"; root.path = "/"; };
+          gpus = { "4090" = 1; "p5000" = 1; };
         };
+        xrdp = { enable = true; hostname = [ "xmupc2.chn.moe" ]; };
+        samba = { enable = true; hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; };
+        groupshare = {};
       };
       bugs = [ "xmunet" ];
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
   };
 }

devices/xmupc2/secrets/default.yaml

@@ -7,10 +7,14 @@ xray-client:
 wireguard:
     privateKey: ENC[AES256_GCM,data:0Vw9NVs/Kxc52zUlmeAPFeOG8msdL0YopjhzFKRWhv6+kfb+SFObOP8EJ2M=,iv:KgIZIawbnN+1sIcMjNECkdtujPbg7yQktKVc25SXavI=,tag:b79oZP+GZKmM3OVFshvFhg==,type:str]
 users:
-    xll: ENC[AES256_GCM,data:8g3/l09TNw7PYDtVkdQvQDgpOrsdrH2u07mtDxcvBY+hij3kQ9Ma3AMrspo0yRO82zInEOUlB100l/ja79nTtB1hqriQb1SEZg==,iv:G7zuzsUAPj6UHCgR6bDFpy9Wa3PVW+FSag3juYXizg0=,tag:Qdk3fN280ZAzutRkRYK2/A==,type:str]
-    zem: ENC[AES256_GCM,data:lBIXyIPWdE0AIpVzjRdB8vreCC0KW40tVDkYbv8E6D81spNBDsPLntuvliHWq9xs0qAH5fhY/ov03lCThGKwzW0r2GdoeLe+1Q==,iv:orRqqLFJ/P0MhT/i7sVQFLel94qY8YL34Uw4kM6D+10=,tag:fvA12mgRxLQzczz/F4Fmew==,type:str]
-    yjq: ENC[AES256_GCM,data:gnfFvRUjSygRGvQPgxOea4ecgDrTA+YCGjXlcRGyj6l0ZEIOfbdf5XuIX2KeDKZ0ku/2nbEYfQIRAiljIpczJwtKuXcMndhn8w==,iv:U487J2mBOxPeVq8Viyr/NQY5/d63bm03LUUJ1FHQqMM=,tag:H/kUYAWDPlAY52H6AOwgsA==,type:str]
-    gb: ENC[AES256_GCM,data:5Vb+7peQfFFHEjPPYcjWYIQ4EJYFASWKQIfR1A36LUJXWtvr6tIhd2VWIIGOrrAz3JqGEx5+5ZBq49N/zp8fGI4GiEGtFkILGA==,iv:lCjRClDKTmWtEMc1Z6jMfWQQ103/AaFbyETxNoGLr1E=,tag:grdktL6lnNtQk4rKp/hnCA==,type:str]
+    #ENC[AES256_GCM,data:FP1Mr1TmRI4L,iv:3K4LMbOQPvF1ORWNyaXDoC5MXn3yColR4eKs9sm9y5s=,tag:f3guTegVXw1A6aqolKQnqA==,type:comment]
+    xll: ENC[AES256_GCM,data:CAEd+usnLKoQZ+0PLEiJfbZpz2pyn+I/edC2KbNXBXZPAgT7IDENMnSQyxme899KqRVL4nLrtHs82aA8+kl/dE+QYSTCFVVuHg==,iv:Hs8rb0Iu5Xw74p9/cL2gWfPLh61VaLzIltKUSjRFZjc=,tag:/u5vI0oTMQbNoCEzhcWqOw==,type:str]
+    #ENC[AES256_GCM,data:UIns0CnC/QmJ,iv:Gn4XDPcdTyDLXAgGq7qwayrN206Gx7JsJ3V9G+4bTyA=,tag:FITVs8Tgkiq1XoS8joXM1Q==,type:comment]
+    zem: ENC[AES256_GCM,data:znpGuS8LVxaztnwQlIwu3hykWRBUtQvOsniLaOasXDbw9lHGX8lwwYJuCE+0I14HmiZK/RrrouIwfAfcjZQzPyjJ/SRoOG1Vyg==,iv:YXHX43y99/w9102vhsvFLVOUtJmuRnLVLu+ywfn9URY=,tag:AzsmkXOyX7y/D+ndteuMmA==,type:str]
+    #ENC[AES256_GCM,data:6vMItERptBsX,iv:G0sDjEfLciheMxTZbeLIbWKlimPD1ANIk/VVdhQifXA=,tag:oR9FEdVx6W+0uDeKfb37iw==,type:comment]
+    yjq: ENC[AES256_GCM,data:sGPQ0xALULREnhzl9g/V91M5osMglsSps6R4gYn5OZc/4xVC1phF3qajVN3YMOr7kKgkHbF2Rjm6/2vuK0k1iYZnFswUAmFlmw==,iv:5vG1hn7SlX6HCpas2BgxBSwWqLby8OCxcH3EKNvceIc=,tag:TVwFBAuosKnEOZecq1phXw==,type:str]
+    #ENC[AES256_GCM,data:ALHxkRABA+ll,iv:r1IDiHLFcTdLID3q16zrLTavAwQfddC7bXMKcFZFveI=,tag:4Pd0/Q1BmH4gJjaM4hbqqQ==,type:comment]
+    gb: ENC[AES256_GCM,data:z4CrtdmdLJJ0qZzr7qvihnluJQgjtciX56KdEmtemiRu0llEJk9qz6a23aJ7m40Sfc38elF1/LsvjOuBOC87+BVkKDCj76phag==,iv:WrFVxkr3snmqDXZx5kAYCLp7ixEIzxoT7El3rV7Ovqg=,tag:iExf2Y/HObHQrKMTRvqn7A==,type:str]
 mariadb:
     slurm: ENC[AES256_GCM,data:9wLQ1zF/kDaiw0s3UaRpiHgmngU7u6hwyqpddSjev0+Z0v58Q2oiJtK8vn+2VlSxx5ACfqEFbzp0PZYAxd575w==,iv:q9JTkgDymOwkbZ/PaxRAAQrtO96QmGgZcQuLTFCMoS4=,tag:dwOHlOTgZqT/1jQ+oGf7UQ==,type:str]
 sops:
@@ -37,8 +41,8 @@ sops:
             M0xoL1dQR0kvMWpzN0RMNWVCTFQxNFUKj9LPjBo5NGOrGYNvu8qZ13PLYjLEWllU
             LARzEn4XgkeHckouwvxZYMCx7WxmAruRWaOvnxTIczzSNP7wIrqnkA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-09T07:58:59Z"
-    mac: ENC[AES256_GCM,data:dNS3GGmHEJonDGNVGlhjRPnDSo0DljmX3pRrnYXsCLrjViOQpLmgInJF3g37Thpl5+PQOpjGpwSqTuWrIkTuSs3wWwjzA2xE6WtPStY13U7lGLhBmkLIocVqmWCPH5zs1pVKQnuk6jNaBUfWUA5aL2+WNcatnPqxIL45j0Chvmw=,iv:JhGN219z3uwl5fEx7KVLG/p23JWe1JHMPLg09G9+CWM=,tag:y5VuwVyMu8c8aDtKqWDykw==,type:str]
+    lastmodified: "2024-03-10T13:46:59Z"
+    mac: ENC[AES256_GCM,data:j+bdp0emAtTNNI7aZsKTJ+uARsuyLb9GRV0CeIb2EoZaOmj5cJpUzYtcAWIdCYplt1ZScCcR7iQPUlCzUb0+pXth7QDibtGJcj0dqw87DoaY3cqm7jNkKteiIYxXOCmbMBgED9eMxQVdcGZTDSuTQ0KjFYoXkcUSriMsJltDUDc=,iv:+eLNmlxeqB/Q7Rmz5B/wZSajiesV+/ED3ROJuuShpfo=,tag:95xKRRuqRZkUFUjHbPrDNw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

flake.nix

@@ -3,6 +3,7 @@
 
   inputs =
   {
+    # TODO: add color scheme
     nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable";
     "nixpkgs-23.05".url = "github:CHN-beta/nixpkgs/nixos-23.05";
@@ -18,7 +19,11 @@
     nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs-unstable"; };
     nur.url = "github:nix-community/NUR";
     nixos-cn = { url = "github:nixos-cn/flakes"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nur-xddxdd =
+    {
+      url = "github:xddxdd/nur-packages?rev=404bc382a29f3d78b03871b96016579d6a0aa305";
+      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/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -37,6 +42,16 @@
     nixos-hardware.url = "github:CHN-beta/nixos-hardware";
     envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
     nix-fast-build = { url = "github:/Mic92/nix-fast-build"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
+    chaotic =
+    {
+      url = "github:chaotic-cx/nyx";
+      inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
+    };
+    # TODO: pick it from nixpkgs
+    nix-inspect.url = "github:bluskript/nix-inspect";
+    gricad = { url = "github:Gricad/nur-packages"; flake = false; };
+    catppuccin.url = "github:catppuccin/nix";
 
     misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; };
     rsshub = { url = "github:DIYgod/RSSHub"; flake = false; };
@@ -54,12 +69,15 @@
     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; };
+    blurred-wallpaper =
+      { url = "github:bouteillerAlan/blurredwallpaper?rev=aecc88d43e458a0962a0091dcdb7baac34e263be"; flake = false; };
     slate = { url = "github:TheBigWazz/Slate"; flake = false; };
     linux-surface = { url = "github:linux-surface/linux-surface"; flake = false; };
     lepton = { url = "github:black7375/Firefox-UI-Fix"; flake = false; };
     lmod = { url = "github:TACC/Lmod"; flake = false; };
     mumax = { url = "github:CHN-beta/mumax"; flake = false; };
+    kylin-virtual-keyboard = { url = "git+https://gitee.com/openkylin/kylin-virtual-keyboard.git"; flake = false; };
+    cjktty = { url = "github:zhmars/cjktty-patches"; flake = false; };
   };
 
   outputs = inputs:
@@ -87,27 +105,43 @@
       # ssh-keygen -t rsa -C root@pe -f /mnt/nix/persistent/etc/ssh/ssh_host_rsa_key
       # ssh-keygen -t ed25519 -C root@pe -f /mnt/nix/persistent/etc/ssh/ssh_host_ed25519_key
       # systemd-machine-id-setup --root=/mnt/nix/persistent
-      nixosConfigurations = builtins.listToAttrs (builtins.map
-        (system:
-        {
-          name = system;
-          value = inputs.nixpkgs.lib.nixosSystem
+      nixosConfigurations =
+      (
+        (builtins.listToAttrs (builtins.map
+          (system:
           {
-            system = "x86_64-linux";
+            name = system;
+            value = inputs.nixpkgs.lib.nixosSystem
+            {
+              system = "x86_64-linux";
+              specialArgs = { topInputs = inputs; inherit localLib; };
+              modules = localLib.mkModules
+              [
+                (moduleInputs: { config.nixpkgs.overlays = [(prev: final:
+                  # replace pkgs with final to avoid infinite recursion
+                  { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; })
+                ./modules
+                ./devices/${system}
+              ];
+            };
+          })
+          devices))
+        // {
+          pi3b = inputs.nixpkgs.lib.nixosSystem
+          {
+            system = "aarch64-linux";
             specialArgs = { topInputs = inputs; inherit localLib; };
             modules = localLib.mkModules
             [
-              (moduleInputs:
-              {
-                config.nixpkgs.overlays = [(final: prev: { localPackages =
-                  import ./local/pkgs { inherit (moduleInputs) lib; pkgs = final; topInputs = inputs; };})];
-              })
+              (moduleInputs: { config.nixpkgs.overlays = [(prev: final:
+                # replace pkgs with final to avoid infinite recursion
+                { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; })
               ./modules
-              ./devices/${system}
+              ./devices/pi3b
             ];
           };
-        })
-        devices);
+        }
+      );
       # sudo HTTPS_PROXY=socks5://127.0.0.1:10884 nixos-install --flake .#bootstrap --option substituters http://127.0.0.1:5000 --option require-sigs false --option system-features gccarch-silvermont
       # nix-serve -p 5000
       # nix copy --substitute-on-destination --to ssh://server /run/current-system
@@ -143,12 +177,21 @@
                 inputs.self.nixosConfigurations.${node};
             };
           })
-          [ "vps6" "vps7" "nas" "surface" "xmupc1" "xmupc2" ]
+          [ "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; }); };
+        { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; topInputs = inputs; }); };
       config.archive = false;
+      devShell.x86_64-linux = let inherit (inputs.self.nixosConfigurations.pc) pkgs; in pkgs.mkShell
+      {
+        packages = with pkgs; [ pkg-config cmake ninja clang-tools_17 ];
+        buildInputs =
+          (with pkgs; [ fmt boost magic-enum libbacktrace eigen range-v3 ])
+          ++ (with pkgs.localPackages; [ concurrencpp tgbot-cpp nameof ]);
+        # hardeningDisable = [ "all" ];
+        # NIX_DEBUG = "1";
+      };
     };
 }

local/lib/default.nix

@@ -1,4 +1,4 @@
-lib:
+lib: rec
 {
   attrsToList = attrs: builtins.map (name: { inherit name; value = attrs.${name}; }) (builtins.attrNames attrs);
   mkConditional = condition: trueResult: falseResult: let inherit (lib) mkMerge mkIf; in
@@ -12,9 +12,9 @@ lib:
   mkModules = moduleList:
     (builtins.map
       (
-        let handle = module:
-          if ( builtins.typeOf module ) == "path" then (handle (import module))
-          else if ( builtins.typeOf module ) == "lambda" then ({ pkgs, utils, ... }@inputs: (module inputs))
+        let handle = module: let type = builtins.typeOf module; in
+          if type == "path" || type == "string" then (handle (import module))
+          else if type == "lambda" then ({ pkgs, utils, ... }@inputs: (module inputs))
           else module;
         in handle
       )
@@ -37,4 +37,21 @@ lib:
   findIndex = e: list:
     let findIndex_ = i: list: if (builtins.elemAt list i) == e then i else findIndex_ (i + 1) list;
     in findIndex_ 0 list;
+
+  # return a list of path, including:
+  # - all .nix file in the directory except for default.nix
+  # - all directories containing a default.nix
+  findModules = path:
+    mkModules (builtins.filter (path: path != null) (builtins.map
+      (subPath:
+        if subPath.value == "regular" && subPath.name != "default.nix"
+          then if lib.strings.hasSuffix ".nix" subPath.name
+            then "${path}/${subPath.name}"
+            else null
+          else if subPath.value == "directory"
+            then if (builtins.readDir "${path}/${subPath.name}")."default.nix" or null == "regular"
+              then "${path}/${subPath.name}"
+            else null
+          else null)
+      (attrsToList (builtins.readDir path))));
 }

local/pkgs/aocc/default.nix

@@ -1 +1,25 @@
-1k9anln9hmdjflrkq4iacrmhma7gfrfj6d0b8ywxys0wfpdvy12v
+{ version ? "4.2.0", stdenv, fetchurl, lib }:
+let versions =
+{
+  "4.1.0" = "1k9anln9hmdjflrkq4iacrmhma7gfrfj6d0b8ywxys0wfpdvy12v";
+  "4.2.0" = "1aycw6ygzr1db6xf3z7v5lpznhs8j7gcpkawd304vcj5qw75cnpd";
+};
+in stdenv.mkDerivation
+{
+  pname = "aocc";
+  inherit version;
+  src = fetchurl
+  {
+    url = "https://download.amd.com/developer/eula/aocc/aocc-"
+      + builtins.concatStringsSep "-" (lib.lists.take 2 (builtins.splitVersion version))
+      + "/aocc-compiler-${version}.tar";
+    sha256 = versions.${version};
+  };
+  dontBuild = true;
+  installPhase =
+  ''
+    mkdir -p $out
+    cp -r bin include lib lib32 libexec share $out
+  '';
+  dontFixup = true;
+}

local/pkgs/aocl/default.nix

@@ -0,0 +1,28 @@
+{ version ? "4.2.0", stdenv, fetchurl, lib }:
+let versions =
+{
+  "4.1.0" = "04780c2zks0g76c4n4a2cbbhs1qz4lza4ffiw1fj0md3f1lxihr5";
+  "4.2.0" = "0p4x0zza6y18hjjs1971gyc5kjd2f8nzzynp2jabhl2vxiys2nnj";
+};
+in stdenv.mkDerivation
+{
+  pname = "aocl";
+  inherit version;
+  src = fetchurl
+  {
+    url = "https://download.amd.com/developer/eula/aocl/aocl-"
+      + builtins.concatStringsSep "-" (lib.lists.take 2 (builtins.splitVersion version))
+      + "/aocl-linux-aocc-${version}.tar.gz";
+    sha256 = versions.${version};
+  };
+  dontBuild = true;
+  installPhase =
+  ''
+    installDir=$(mktemp -d)
+    bash ./install.sh -t $installDir
+    mkdir -p $out
+    cp -r $installDir/${version}/aocc/lib_LP64 $out/lib
+    cp -r $installDir/${version}/aocc/include_LP64 $out/include
+  '';
+  dontFixup = true;
+}

local/pkgs/biu/CMakeLists.txt

@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 3.14)
+project(biu 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(magic_enum REQUIRED)
+find_package(fmt REQUIRED)
+find_package(Boost REQUIRED COMPONENTS headers iostreams)
+# find_package(concurrencpp REQUIRED)
+find_package(Eigen3 REQUIRED)
+find_package(range-v3 REQUIRED)
+find_path(NAMEOF_INCLUDE_DIR nameof.hpp REQUIRED)
+# find_path(TGBOTCPP_INCLUDE_DIR tgbot/tgbot.h REQUIRED)
+# find_library(TGBOTCPP_LIB libTgBot.a REQUIRED)
+# find_path(BACKTRACE_INCLUDE_DIR backtrace.h REQUIRED)
+# find_library(BACKTRACE_LIB backtrace REQUIRED)
+
+# add_library(biu SHARED src/common.cpp src/logger.cpp src/string.cpp)
+add_library(biu SHARED src/common.cpp)
+target_include_directories(biu PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  ${NAMEOF_INCLUDE_DIR} ${TGBOTCPP_INCLUDE_DIR})
+target_link_libraries(biu PUBLIC
+  magic_enum::magic_enum
+  fmt::fmt
+  Boost::headers Boost::iostreams
+#   concurrencpp::concurrencpp
+  Eigen3::Eigen
+  range-v3::range-v3)
+# ${TGBOTCPP_LIB} ${BACKTRACE_LIB})
+set_property(TARGET biu PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
+install(TARGETS biu EXPORT biuConfig)
+install(EXPORT biuConfig NAMESPACE ${PROJECT_NAME}:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/biu)
+install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+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/biu/default.nix

@@ -1,17 +1,10 @@
 {
-  stdenv, fetchFromGitHub, cmake, pkg-config, ninja,
-  fmt, boost, magic-enum, libbacktrace, concurrencpp, tgbot-cpp, nameof, eigen, range-v3
-}: stdenv.mkDerivation rec
+  stdenv, cmake,
+  magic-enum, fmt, boost, eigen, range-v3, nameof
+}: stdenv.mkDerivation
 {
-  name = "libbiu";
-  src = fetchFromGitHub
-  {
-    owner = "CHN-beta";
-    repo = "biu";
-    rev = "8ed2e52968f98d3a6ddbd01e86e57604ba3a7f54";
-    sha256 = "OqQ+QkjjIbpve/xn/DJA7ONw/bBg5zGNr+VJjc3o+K8=";
-  };
-  nativeBuildInputs = [ cmake pkg-config ninja ];
-  buildInputs = [ fmt boost magic-enum libbacktrace concurrencpp tgbot-cpp nameof eigen range-v3 ];
-  propagatedBuildInputs = buildInputs;
+  name = "biu";
+  src = ./.;
+  buildInputs = [ magic-enum fmt boost eigen range-v3 nameof ];
+  nativeBuildInputs = [ cmake ];
 }

local/pkgs/biu/include/biu.hpp

@@ -0,0 +1,10 @@
+# pragma once
+// # include <biu/atomic/atomic.tpp>
+// # include <biu/called_by.hpp>
+# include <biu/common.tpp>
+// # include <biu/concepts.tpp>
+// # include <biu/format.tpp>
+// # include <biu/logger.tpp>
+// # include <biu/smartref.tpp>
+// # include <biu/string.tpp>
+# include <biu/eigen.hpp>

local/pkgs/biu/include/biu/atomic/atomic.hpp

@@ -0,0 +1,41 @@
+# pragma once
+# include <biu/logger.hpp>
+
+namespace biu::detail_
+{
+	template <DecayedType ValueType> class AtomicBase<ValueType, true>
+		: public Logger::ObjectMonitor<Atomic<ValueType, true>>, protected AtomicBase<ValueType, false>
+	{
+		using DeepBase_ = AtomicBase<ValueType, false>;
+		using DeepBase_::AtomicBase;
+		public: class TimeoutException : public Logger::Exception<TimeoutException>
+		{
+			using Logger::Exception<TimeoutException>::Exception;
+		};
+
+		protected: template
+		<
+			bool ReturnFunctionResult,
+			typename ConditionFunction = std::nullptr_t, typename Duration = std::nullptr_t, bool Nothrow = false
+		> static auto apply_
+		(
+			auto&& atomic, auto&& function,
+			ConditionFunction&& condition_function = nullptr, Duration timeout = nullptr
+		) -> DeepBase_::template ApplyReturnType_
+				<decltype(function), decltype(atomic), ReturnFunctionResult, ConditionFunction, Duration, Nothrow>
+			requires DeepBase_::template ApplyConstraint_
+				<decltype(function), decltype(atomic), ConditionFunction, Duration>;
+
+		protected: template <bool Nothrow = false, typename Duration = std::nullptr_t> static auto wait_
+			(auto&& atomic, auto&& condition_function, Duration timeout = nullptr)
+			-> DeepBase_::template WaitReturnType_<decltype(atomic), decltype(condition_function), Duration, Nothrow>
+			requires DeepBase_::template WaitConstraint_<decltype(condition_function), Duration>;
+
+		protected: template
+			<bool Nothrow = false, typename ConditionFunction = std::nullptr_t, typename Duration = std::nullptr_t>
+			static auto lock_
+			(auto&& atomic, ConditionFunction&& condition_function = nullptr, Duration timeout = nullptr)
+			-> DeepBase_::template LockReturnType_<decltype(atomic), Duration, Nothrow>
+			requires DeepBase_::template LockConstraint_<ConditionFunction, Duration>;
+	};
+}

local/pkgs/biu/include/biu/atomic/nolog.hpp

@@ -0,0 +1,267 @@
+# pragma once
+#	include <mutex>
+#	include <optional>
+#	include <condition_variable>
+#	include <cstddef>
+#	include <experimental/memory>
+#	include <biu/common.hpp>
+#	include <biu/concepts.hpp>
+#	include <biu/called_by.hpp>
+
+namespace biu
+{
+	template <DecayedType ValueType, bool UseLogger = true> class Atomic;
+	namespace detail_
+	{
+		template <DecayedType ValueType, bool UseLogger> class AtomicBase;
+		template <DecayedType ValueType> class AtomicBase<ValueType, false>
+		{
+			protected: mutable std::recursive_mutex Mutex_;
+			protected: mutable std::condition_variable_any ConditionVariable_;
+			protected: ValueType Value_;
+
+			AtomicBase() = default;
+			AtomicBase(const ValueType& value);
+			AtomicBase(ValueType&& value);
+
+			public: class TimeoutException : public std::exception
+			{
+				protected: std::string Message_;
+				public: explicit TimeoutException(std::string message);
+				public: const char* what() const noexcept override;
+			};
+
+			// Apply a function to stored value.
+			// Wait for some time (if provided) until condition funciton returns true (if provided)
+			// before applying the function.
+			protected: template
+				<
+					typename Function, typename Atomic,
+					typename ConditionFunction = std::nullptr_t, typename Duration = std::nullptr_t
+				>
+				constexpr static bool ApplyConstraint_ =
+				(
+					(std::invocable<Function, MoveQualifiers<Atomic, ValueType>> && std::is_null_pointer_v<ConditionFunction>)
+          || (
+						InvocableWithResult<ConditionFunction, bool, const ValueType&>
+							&& (std::is_null_pointer_v<Duration> || SpecializationOf<Duration, std::chrono::duration>)
+					)
+				);
+			protected: template
+				<
+					typename Function, typename Atomic, bool ReturnFunctionResult,
+					typename ConditionFunction = std::nullptr_t, typename Duration = std::nullptr_t,
+					bool Nothrow = false
+				> using ApplyReturnType_ = std::conditional_t
+					<
+						Nothrow,
+						std::conditional_t
+						<
+							ReturnFunctionResult && !std::is_void_v<std::invoke_result<Function, ValueType>>,
+							std::optional<std::remove_cvref_t<FallbackIfNoTypeDeclared<std::invoke_result
+								<Function, MoveQualifiers<Atomic, ValueType>, int>>>>,
+							bool
+						>,
+						std::conditional_t
+						<
+							ReturnFunctionResult,
+							std::invoke_result_t<Function, MoveQualifiers<Atomic, ValueType>>,
+							Atomic&&
+						>
+					>;
+			protected: template
+				<
+					bool ReturnFunctionResult,
+					typename ConditionFunction = std::nullptr_t, typename Duration = std::nullptr_t,
+					bool Nothrow = false
+				> static auto apply_
+				(
+					auto&& atomic, auto&& function,
+					ConditionFunction&& condition_function = nullptr, Duration timeout = nullptr
+				) -> ApplyReturnType_
+					<decltype(function), decltype(atomic), ReturnFunctionResult, ConditionFunction, Duration, Nothrow>
+					requires ApplyConstraint_<decltype(function), decltype(atomic), ConditionFunction, Duration>;
+
+			// Wait until condition funciton returns true, with an optional timeout
+			protected: template <typename ConditionFunction, typename Duration = std::nullptr_t>
+				constexpr static bool WaitConstraint_
+				= (InvocableWithResult<ConditionFunction, bool, const ValueType&>
+					&& (std::is_null_pointer_v<Duration> || SpecializationOf<Duration, std::chrono::duration>));
+			protected: template
+				<typename Atomic, typename ConditionFunction, typename Duration = std::nullptr_t, bool Nothrow = false>
+				using WaitReturnType_
+				= std::conditional_t<Nothrow && !std::is_null_pointer_v<Duration>, bool, Atomic&&>;
+			protected: template <bool Nothrow = false, typename Duration = std::nullptr_t> static auto wait_
+				(auto&& atomic, auto&& condition_function, Duration timeout = nullptr)
+				-> WaitReturnType_<decltype(atomic), decltype(condition_function), Duration, Nothrow>
+				requires WaitConstraint_<decltype(condition_function), Duration>;
+
+			protected: template <typename ConditionFunction = std::nullptr_t, typename Duration = std::nullptr_t>
+				constexpr static bool LockConstraint_
+				= std::is_null_pointer_v<ConditionFunction> ||
+					(
+						InvocableWithResult<ConditionFunction, bool, const ValueType&>
+							&& (std::is_null_pointer_v<Duration> || SpecializationOf<Duration, std::chrono::duration>)
+					);
+			protected: template <typename Atomic, typename Duration = std::nullptr_t, bool Nothrow = false>
+				using LockReturnType_
+				= std::conditional_t
+					<
+						Nothrow && !std::is_null_pointer_v<Duration>,
+						std::optional<std::conditional_t
+						<
+							std::is_const_v<Atomic>,
+							typename std::remove_reference_t<Atomic>::template Guard<true>,
+							typename std::remove_reference_t<Atomic>::template Guard<false>
+						>>,
+						std::conditional_t
+						<
+							std::is_const_v<Atomic>,
+							typename std::remove_reference_t<Atomic>::template Guard<true>,
+							typename std::remove_reference_t<Atomic>::template Guard<false>
+						>
+					>;
+			protected: template
+				<bool Nothrow = false, typename ConditionFunction = std::nullptr_t, typename Duration = std::nullptr_t>
+				static auto lock_
+				(auto&& atomic, ConditionFunction&& condition_function = nullptr, Duration timeout = nullptr)
+				-> LockReturnType_<decltype(atomic), Duration, Nothrow>
+				requires LockConstraint_<ConditionFunction, Duration>;
+		};
+	}
+
+	// Thread safe wrapper of custom class
+	template <DecayedType ValueType, bool UseLogger> class Atomic : public detail_::AtomicBase<ValueType, UseLogger>
+	{
+		public: Atomic() = default;
+		public: Atomic(const ValueType& value);
+		public: Atomic(ValueType&& value);
+		public: template <bool OtherUseLogger> Atomic(const Atomic<ValueType, OtherUseLogger>& other);
+		public: template <bool OtherUseLogger> Atomic(Atomic<ValueType, OtherUseLogger>&& other);
+		public: Atomic<ValueType, UseLogger>& operator=(const ValueType& value);
+		public: Atomic<ValueType, UseLogger>& operator=(ValueType&& value);
+		public: template <bool OtherUseLogger>
+			Atomic<ValueType, UseLogger>& operator=(const Atomic<ValueType, OtherUseLogger>& other);
+		public: template <bool OtherUseLogger>
+			Atomic<ValueType, UseLogger>& operator=(Atomic<ValueType, OtherUseLogger>&& other);
+		public: ValueType get() const&;
+		public: ValueType get() &&;
+		public: operator ValueType() const&;
+		public: operator ValueType() &&;
+
+		protected: using DeepBase_ = detail_::AtomicBase<ValueType, false>;
+
+		public: template <bool ReturnFunctionResult = false> auto apply(auto&& function) const&
+			-> DeepBase_::template ApplyReturnType_<decltype(function), decltype(*this), ReturnFunctionResult>
+			requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this)>;
+		public: template <bool ReturnFunctionResult = false> auto apply(auto&& function) &
+			-> DeepBase_::template ApplyReturnType_<decltype(function), decltype(*this), ReturnFunctionResult>
+			requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this)>;
+		public: template <bool ReturnFunctionResult = false> auto apply(auto&& function) &&
+			-> DeepBase_::template ApplyReturnType_<decltype(function), decltype(*this), ReturnFunctionResult>
+			requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this)>;
+		public: template <bool ReturnFunctionResult = false>
+			auto apply(auto&& function, auto&& condition_function) const&
+			-> DeepBase_::template ApplyReturnType_
+				<decltype(function), decltype(*this), ReturnFunctionResult, decltype(condition_function)>
+			requires DeepBase_::template ApplyConstraint_
+				<decltype(function), decltype(*this), decltype(condition_function)>;
+		public: template <bool ReturnFunctionResult = false> auto apply(auto&& function, auto&& condition_function) &
+			-> DeepBase_::template ApplyReturnType_
+				<decltype(function), decltype(*this), ReturnFunctionResult, decltype(condition_function)>
+			requires DeepBase_::template ApplyConstraint_
+				<decltype(function), decltype(*this), decltype(condition_function)>;
+		public: template <bool ReturnFunctionResult = false> auto apply(auto&& function, auto&& condition_function) &&
+			-> DeepBase_::template ApplyReturnType_
+				<decltype(function), decltype(*this), ReturnFunctionResult, decltype(condition_function)>
+			requires DeepBase_::template ApplyConstraint_
+				<decltype(function), decltype(*this), decltype(condition_function)>;
+		public: template <bool ReturnFunctionResult = false, bool Nothrow = false>
+			auto apply(auto&& function, auto&& condition_function, auto timeout) const&
+			-> DeepBase_::template ApplyReturnType_
+			<
+				decltype(function), decltype(*this), ReturnFunctionResult,
+				decltype(condition_function), decltype(timeout), Nothrow
+			> requires DeepBase_::template ApplyConstraint_
+				<decltype(function), decltype(*this), decltype(condition_function), decltype(timeout)>;
+		public: template <bool ReturnFunctionResult = false, bool Nothrow = false>
+			auto apply(auto&& function, auto&& condition_function, auto timeout) &
+			-> DeepBase_::template ApplyReturnType_
+			<
+				decltype(function), decltype(*this), ReturnFunctionResult,
+				decltype(condition_function), decltype(timeout), Nothrow
+			> requires DeepBase_::template ApplyConstraint_
+				<decltype(function), decltype(*this), decltype(condition_function), decltype(timeout)>;
+		public: template <bool ReturnFunctionResult = false, bool Nothrow = false>
+			auto apply(auto&& function, auto&& condition_function, auto timeout) &&
+			-> DeepBase_::template ApplyReturnType_
+			<
+				decltype(function), decltype(*this), ReturnFunctionResult,
+				decltype(condition_function), decltype(timeout), Nothrow
+			> requires DeepBase_::template ApplyConstraint_
+				<decltype(function), decltype(*this), decltype(condition_function), decltype(timeout)>;
+
+		public: auto wait(auto&& condition_function) const&
+			-> DeepBase_::template WaitReturnType_<decltype(*this), decltype(condition_function)>
+			requires DeepBase_::template WaitConstraint_<decltype(condition_function)>;
+		public: auto wait(auto&& condition_function) &
+			-> DeepBase_::template WaitReturnType_<decltype(*this), decltype(condition_function)>
+			requires DeepBase_::template WaitConstraint_<decltype(condition_function)>;
+		public: auto wait(auto&& condition_function) &&
+			-> DeepBase_::template WaitReturnType_<decltype(*this), decltype(condition_function)>
+			requires DeepBase_::template WaitConstraint_<decltype(condition_function)>;
+		public: template <bool Nothrow = false> auto wait(auto&& condition_function, auto timeout) const&
+			-> DeepBase_::template WaitReturnType_
+				<decltype(*this), decltype(condition_function), decltype(timeout), Nothrow>
+			requires DeepBase_::template WaitConstraint_<decltype(condition_function), decltype(timeout)>;
+		public: template <bool Nothrow = false> auto wait(auto&& condition_function, auto timeout) &
+			-> DeepBase_::template WaitReturnType_
+				<decltype(*this), decltype(condition_function), decltype(timeout), Nothrow>
+			requires DeepBase_::template WaitConstraint_<decltype(condition_function), decltype(timeout)>;
+		public: template <bool Nothrow = false> auto wait(auto&& condition_function, auto timeout) &&
+			-> DeepBase_::template WaitReturnType_
+				<decltype(*this), decltype(condition_function), decltype(timeout), Nothrow>
+			requires DeepBase_::template WaitConstraint_<decltype(condition_function), decltype(timeout)>;
+
+		// Attain lock from outside when constructing, and release when destructing.
+		// For non-const variant, When destructing, ConditionVariable_.notify_all() is called.
+		public: template <bool Const> class Guard
+		{
+			protected: std::unique_lock<std::recursive_mutex> Lock_;
+			protected: std::experimental::observer_ptr
+				<std::conditional_t<Const, const Atomic<ValueType, UseLogger>, Atomic<ValueType, UseLogger>>> Value_;
+
+			public: template <bool OtherConst> Guard(const Guard<OtherConst>& other) requires (Const || !OtherConst);
+			public: Guard
+				(decltype(Lock_)&& lock, decltype(Value_) value, CalledBy<detail_::AtomicBase<ValueType, UseLogger>>);
+			public: ~Guard();
+
+			public: std::conditional_t<Const, const ValueType&, ValueType&> operator*() const&;
+			public: std::conditional_t<Const, const ValueType*, ValueType*> operator->() const&;
+			public: std::conditional_t<Const, const ValueType&, ValueType&> value() const&;
+			public: auto operator*() const&& = delete;
+			public: auto operator->() const&& = delete;
+			public: auto value() const&& = delete;
+		};
+
+		public: auto lock() const& -> DeepBase_::template LockReturnType_<decltype(*this)>
+			requires DeepBase_::template LockConstraint_<>;
+		public: auto lock() & -> DeepBase_::template LockReturnType_<decltype(*this)>
+			requires DeepBase_::template LockConstraint_<>;
+		public: auto lock() const&& = delete;
+		public: auto lock(auto&& condition_function) const&
+			-> DeepBase_::template LockReturnType_<decltype(*this), decltype(condition_function)>
+			requires DeepBase_::template LockConstraint_<decltype(condition_function)>;
+		public: auto lock(auto&& condition_function) &
+			-> DeepBase_::template LockReturnType_<decltype(*this), decltype(condition_function)>
+			requires DeepBase_::template LockConstraint_<decltype(condition_function)>;
+		public: auto lock(auto&& condition_function) const&& = delete;
+		public: template <bool Nothrow = false> auto lock(auto&& condition_function, auto timeout) const&
+			-> DeepBase_::template LockReturnType_<decltype(*this), decltype(timeout), Nothrow>
+			requires DeepBase_::template LockConstraint_<decltype(condition_function), decltype(timeout)>;
+		public: template <bool Nothrow = false> auto lock(auto&& condition_function, auto timeout) &
+			-> DeepBase_::template LockReturnType_<decltype(*this), decltype(timeout), Nothrow>
+			requires DeepBase_::template LockConstraint_<decltype(condition_function), decltype(timeout)>;
+		public: template <bool Nothrow = false> auto lock(auto&& condition_function, auto timeout) const&& = delete;
+	};
+}

local/pkgs/biu/include/biu/atomic/nolog.tpp

@@ -0,0 +1,366 @@
+# pragma once
+# include <biu/atomic/nolog.hpp>
+
+namespace biu
+{
+	template <DecayedType ValueType> detail_::AtomicBase<ValueType, false>::AtomicBase(const ValueType& value)
+		: Value_{value} {}
+	template <DecayedType ValueType> detail_::AtomicBase<ValueType, false>::AtomicBase(ValueType&& value)
+		: Value_{std::move(value)} {}
+
+	template <DecayedType ValueType>
+		detail_::AtomicBase<ValueType, false>::TimeoutException::TimeoutException(std::string)
+		: Message_{"TimeoutException"} {}
+	template <DecayedType ValueType>
+		const char* detail_::AtomicBase<ValueType, false>::TimeoutException::what() const noexcept
+		{return Message_.c_str();}
+
+	template <DecayedType ValueType>
+		template <bool ReturnFunctionResult, typename ConditionFunction, typename Duration, bool Nothrow>
+		auto detail_::AtomicBase<ValueType, false>::apply_
+			(auto&& atomic, auto&& function, ConditionFunction&& condition_function, Duration timeout)
+		-> ApplyReturnType_
+			<decltype(function), decltype(atomic), ReturnFunctionResult, ConditionFunction, Duration, Nothrow>
+		requires ApplyConstraint_<decltype(function), decltype(atomic), ConditionFunction, Duration>
+	{
+		std::unique_lock lock{atomic.Mutex_};
+
+		// try to meet the condition
+		if constexpr (!std::is_null_pointer_v<ConditionFunction>)
+		{
+			if constexpr (std::is_null_pointer_v<Duration>)
+				atomic.ConditionVariable_.wait(lock, [&]
+					{return std::forward<ConditionFunction>(condition_function)(std::as_const(atomic.Value_));});
+			else if (!atomic.ConditionVariable_.wait_for(lock, timeout, [&]
+				{return std::forward<ConditionFunction>(condition_function)(std::as_const(atomic.Value_));}))
+			{
+				if constexpr (Nothrow)
+				{
+					if constexpr
+						(ReturnFunctionResult && !std::is_void_v<std::invoke_result_t<decltype(function), ValueType>>)
+						return std::nullopt;
+					else return false;
+				}
+				else throw TimeoutException{};
+			}
+		}
+
+		// apply the function and return
+		if constexpr (ReturnFunctionResult && !std::is_void_v<std::invoke_result_t<decltype(function), ValueType>>)
+		{
+			auto&& result = std::forward<decltype(function)>(function)
+				(static_cast<MoveQualifiers<decltype(atomic), ValueType>&&>(atomic.Value_));
+			if constexpr (!std::is_const_v<decltype(atomic)>) atomic.ConditionVariable_.notify_all();
+			return std::forward<decltype(result)>(result);
+		}
+		else
+		{
+			std::forward<decltype(function)>(function)
+				(static_cast<MoveQualifiers<decltype(atomic), ValueType>&&>(atomic.Value_));
+			if constexpr (!std::is_const_v<decltype(atomic)>) atomic.ConditionVariable_.notify_all();
+			if constexpr (ReturnFunctionResult && std::is_void_v<std::invoke_result_t<decltype(function), ValueType>>)
+				return;
+			else return std::forward<decltype(atomic)>(atomic);
+		}
+	}
+
+	template <DecayedType ValueType> template <bool Nothrow, typename Duration>
+		auto detail_::AtomicBase<ValueType, false>::wait_(auto&& atomic, auto&& condition_function, Duration timeout)
+		-> WaitReturnType_<decltype(atomic), decltype(condition_function), Duration, Nothrow>
+		requires WaitConstraint_<decltype(condition_function), Duration>
+	{
+		std::unique_lock lock{atomic.Mutex_};
+
+		if constexpr (std::is_null_pointer_v<Duration>)
+		{
+			atomic.ConditionVariable_.wait(lock, [&]
+				{return std::forward<decltype(condition_function)>(condition_function)(std::as_const(atomic.Value_));});
+			return std::forward<decltype(atomic)>(atomic);
+		}
+		else
+		{
+			if (!atomic.ConditionVariable_.wait_for(lock, timeout, [&]
+				{return std::forward<decltype(condition_function)>(condition_function)(std::as_const(atomic.Value_));}))
+			{
+				if constexpr (Nothrow) return false;
+				else throw TimeoutException{};
+			}
+			else
+			{
+				if constexpr (Nothrow) return true;
+				else return std::forward<decltype(atomic)>(atomic);
+			}
+		}
+	}
+
+	template <DecayedType ValueType> template <bool Nothrow, typename ConditionFunction, typename Duration>
+		auto detail_::AtomicBase<ValueType, false>::lock_
+		(auto&& atomic, ConditionFunction&& condition_function, Duration timeout)
+		-> LockReturnType_<decltype(atomic), Duration, Nothrow> requires LockConstraint_<ConditionFunction, Duration>
+	{
+		if constexpr (std::is_null_pointer_v<ConditionFunction>)
+			return {std::unique_lock{atomic.Mutex_}, std::experimental::make_observer(&atomic), {}};
+		else if constexpr (std::is_null_pointer_v<Duration>)
+		{
+			std::unique_lock lock{atomic.Mutex_};
+			atomic.ConditionVariable_.wait(lock, [&]
+				{return std::forward<ConditionFunction>(condition_function)(std::as_const(atomic.Value_));});
+			return {std::move(lock), std::experimental::make_observer(&atomic), {}};
+		}
+		else
+		{
+			std::unique_lock lock{atomic.Mutex_};
+			if (!atomic.ConditionVariable_.wait_for(lock, timeout, [&]
+				{return std::forward<ConditionFunction>(condition_function)(std::as_const(atomic.Value_));}))
+			{
+				if constexpr (Nothrow) return std::nullopt;
+				else throw TimeoutException{};
+			}
+			else
+				return {{std::move(lock), std::experimental::make_observer(&atomic), {}}};
+		}
+	}
+
+	template <DecayedType ValueType, bool UseLogger> Atomic<ValueType, UseLogger>::Atomic(const ValueType& value)
+		: detail_::AtomicBase<ValueType, UseLogger>{value} {}
+	template <DecayedType ValueType, bool UseLogger> Atomic<ValueType, UseLogger>::Atomic(ValueType&& value)
+		: detail_::AtomicBase<ValueType, UseLogger>{std::move(value)} {}
+	template <DecayedType ValueType, bool UseLogger> template <bool OtherUseLogger>
+		Atomic<ValueType, UseLogger>::Atomic(const Atomic<ValueType, OtherUseLogger>& other)
+		: detail_::AtomicBase<ValueType, UseLogger>{other} {}
+	template <DecayedType ValueType, bool UseLogger> template <bool OtherUseLogger>
+		Atomic<ValueType, UseLogger>::Atomic(Atomic<ValueType, OtherUseLogger>&& other)
+		: detail_::AtomicBase<ValueType, UseLogger>{std::move(other)} {}
+	template <DecayedType ValueType, bool UseLogger>
+		Atomic<ValueType, UseLogger>& Atomic<ValueType, UseLogger>::operator=(const ValueType& value)
+	{
+		std::scoped_lock lock{DeepBase_::Mutex_};
+		DeepBase_::Value_ = value;
+		DeepBase_::ConditionVariable_.notify_all();
+		return *this;
+	}
+	template <DecayedType ValueType, bool UseLogger>
+		Atomic<ValueType, UseLogger>& Atomic<ValueType, UseLogger>::operator=(ValueType&& value)
+	{
+		std::scoped_lock lock{DeepBase_::Mutex_};
+		DeepBase_::Value_ = std::move(value);
+		DeepBase_::ConditionVariable_.notify_all();
+		return *this;
+	}
+	template <DecayedType ValueType, bool UseLogger> template <bool OtherUseLogger>
+		Atomic<ValueType, UseLogger>& operator=(const Atomic<ValueType, OtherUseLogger>& other)
+	{
+		std::scoped_lock lock{DeepBase_::Mutex_};
+		DeepBase_::Value_ = value;
+		DeepBase_::ConditionVariable_.notify_all();
+		return *this;
+	}
+	template <DecayedType ValueType, bool UseLogger> template <bool OtherUseLogger>
+		Atomic<ValueType, UseLogger>& operator=(Atomic<ValueType, OtherUseLogger>&& other)
+	{
+		std::scoped_lock lock{DeepBase_::Mutex_};
+		DeepBase_::Value_ = std::move(value);
+		DeepBase_::ConditionVariable_.notify_all();
+		return *this;
+	}
+	template <DecayedType ValueType, bool UseLogger> ValueType Atomic<ValueType, UseLogger>::get() const&
+	{
+		std::scoped_lock lock{DeepBase_::Mutex_};
+		return DeepBase_::Value_;
+	}
+	template <DecayedType ValueType, bool UseLogger> ValueType Atomic<ValueType, UseLogger>::get() &&
+	{
+		std::scoped_lock lock{DeepBase_::Mutex_};
+		return std::move(DeepBase_::Value_);
+	}
+	template <DecayedType ValueType, bool UseLogger> Atomic<ValueType, UseLogger>::operator ValueType() const&
+		{return get();}
+	template <DecayedType ValueType, bool UseLogger> Atomic<ValueType, UseLogger>::operator ValueType() &&
+		{return std::move(*this).get();}
+
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function) const&
+		-> DeepBase_::template ApplyReturnType_<decltype(function), decltype(*this), ReturnFunctionResult>
+		requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this)>
+		{return apply_<ReturnFunctionResult>(*this, std::forward<decltype(function)>(function));}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function) &
+		-> DeepBase_::template ApplyReturnType_<decltype(function), decltype(*this), ReturnFunctionResult>
+		requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this)>
+		{return apply_<ReturnFunctionResult>(*this, std::forward<decltype(function)>(function));}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function) &&
+		-> DeepBase_::template ApplyReturnType_<decltype(function), decltype(*this), ReturnFunctionResult>
+		requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this)>
+		{return apply_<ReturnFunctionResult>(std::move(*this), std::forward<decltype(function)>(function));}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function, auto&& condition_function) const&
+		-> DeepBase_::template ApplyReturnType_
+			<decltype(function), decltype(*this), ReturnFunctionResult, decltype(condition_function)>
+		requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this), decltype(condition_function)>
+	{
+		return apply_<ReturnFunctionResult>
+		(
+			*this, std::forward<decltype(function)>(function),
+			std::forward<decltype(condition_function)>(condition_function)
+		);
+	}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function, auto&& condition_function) &
+		-> DeepBase_::template ApplyReturnType_
+			<decltype(function), decltype(*this), ReturnFunctionResult, decltype(condition_function)>
+		requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this), decltype(condition_function)>
+	{
+		return apply_<ReturnFunctionResult>
+		(
+			*this, std::forward<decltype(function)>(function),
+			std::forward<decltype(condition_function)>(condition_function)
+		);
+	}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function, auto&& condition_function) &&
+		-> DeepBase_::template ApplyReturnType_
+			<decltype(function), decltype(*this), ReturnFunctionResult, decltype(condition_function)>
+		requires DeepBase_::template ApplyConstraint_<decltype(function), decltype(*this), decltype(condition_function)>
+	{
+		return apply_<ReturnFunctionResult>
+		(
+			std::move(*this), std::forward<decltype(function)>(function),
+			std::forward<decltype(condition_function)>(condition_function)
+		);
+	}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult, bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function, auto&& condition_function, auto timeout) const&
+		-> DeepBase_::template ApplyReturnType_
+		<
+			decltype(function), decltype(*this), ReturnFunctionResult,
+			decltype(condition_function), decltype(timeout), Nothrow
+		> requires DeepBase_::template ApplyConstraint_
+			<decltype(function), decltype(*this), decltype(condition_function), decltype(timeout)>
+	{
+		return apply_<ReturnFunctionResult, Nothrow>
+		(
+			*this, std::forward<decltype(function)>(function),
+			std::forward<decltype(condition_function)>(condition_function), timeout
+		);
+	}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult, bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function, auto&& condition_function, auto timeout) &
+		-> DeepBase_::template ApplyReturnType_
+		<
+			decltype(function), decltype(*this), ReturnFunctionResult,
+			decltype(condition_function), decltype(timeout), Nothrow
+		> requires DeepBase_::template ApplyConstraint_
+			<decltype(function), decltype(*this), decltype(condition_function), decltype(timeout)>
+	{
+		return apply_<ReturnFunctionResult, Nothrow>
+		(
+			*this, std::forward<decltype(function)>(function),
+			std::forward<decltype(condition_function)>(condition_function), timeout
+		);
+	}
+	template <DecayedType ValueType, bool UseLogger> template <bool ReturnFunctionResult, bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::apply(auto&& function, auto&& condition_function, auto timeout) &&
+		-> DeepBase_::template ApplyReturnType_
+		<
+			decltype(function), decltype(*this), ReturnFunctionResult,
+			decltype(condition_function), decltype(timeout), Nothrow
+		> requires DeepBase_::template ApplyConstraint_
+			<decltype(function), decltype(*this), decltype(condition_function), decltype(timeout)>
+	{
+		return apply_<ReturnFunctionResult, Nothrow>
+		(
+			std::move(*this), std::forward<decltype(function)>(function),
+			std::forward<decltype(condition_function)>(condition_function), timeout
+		);
+	}
+
+	template <DecayedType ValueType, bool UseLogger>
+		auto Atomic<ValueType, UseLogger>::wait(auto&& condition_function) const&
+		-> DeepBase_::template WaitReturnType_<decltype(*this), decltype(condition_function)>
+		requires DeepBase_::template WaitConstraint_<decltype(condition_function)>
+		{return wait_(*this, std::forward<decltype(condition_function)>(condition_function));}
+	template <DecayedType ValueType, bool UseLogger>
+		auto Atomic<ValueType, UseLogger>::wait(auto&& condition_function) &
+		-> DeepBase_::template WaitReturnType_<decltype(*this), decltype(condition_function)>
+		requires DeepBase_::template WaitConstraint_<decltype(condition_function)>
+		{return wait_(*this, std::forward<decltype(condition_function)>(condition_function));}
+	template <DecayedType ValueType, bool UseLogger>
+		auto Atomic<ValueType, UseLogger>::wait(auto&& condition_function) &&
+		-> DeepBase_::template WaitReturnType_<decltype(*this), decltype(condition_function)>
+		requires DeepBase_::template WaitConstraint_<decltype(condition_function)>
+		{return wait_(std::move(*this), std::forward<decltype(condition_function)>(condition_function));}
+	template <DecayedType ValueType, bool UseLogger> template <bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::wait(auto&& condition_function, auto timeout) const&
+		-> DeepBase_::template WaitReturnType_
+			<decltype(*this), decltype(condition_function), decltype(timeout), Nothrow>
+		requires DeepBase_::template WaitConstraint_<decltype(condition_function), decltype(timeout)>
+		{return wait_<Nothrow>(*this, std::forward<decltype(condition_function)>(condition_function), timeout);}
+	template <DecayedType ValueType, bool UseLogger> template <bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::wait(auto&& condition_function, auto timeout) &
+		-> DeepBase_::template WaitReturnType_
+			<decltype(*this), decltype(condition_function), decltype(timeout), Nothrow>
+		requires DeepBase_::template WaitConstraint_<decltype(condition_function), decltype(timeout)>
+		{return wait_<Nothrow>(*this, std::forward<decltype(condition_function)>(condition_function), timeout);}
+	template <DecayedType ValueType, bool UseLogger> template <bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::wait(auto&& condition_function, auto timeout) &&
+		-> DeepBase_::template WaitReturnType_
+			<decltype(*this), decltype(condition_function), decltype(timeout), Nothrow>
+		requires DeepBase_::template WaitConstraint_<decltype(condition_function), decltype(timeout)>
+	{
+		return wait_<Nothrow>
+			(std::move(*this), std::forward<decltype(condition_function)>(condition_function), timeout);
+	}
+
+	template <DecayedType ValueType, bool UseLogger> template <bool Const> template <bool OtherConst>
+		Atomic<ValueType, UseLogger>::Guard<Const>::Guard(const Guard<OtherConst>& other)
+		requires (Const || !OtherConst)
+		: Lock_{other.Lock_}, Value_{other.Value_} {}
+	template <DecayedType ValueType, bool UseLogger> template <bool Const>
+		Atomic<ValueType, UseLogger>::Guard<Const>::Guard
+		(decltype(Lock_)&& lock, decltype(Value_) value, CalledBy<detail_::AtomicBase<ValueType, UseLogger>>)
+		: Lock_{std::move(lock)}, Value_{value} {}
+	template <DecayedType ValueType, bool UseLogger> template <bool Const>
+		Atomic<ValueType, UseLogger>::Guard<Const>::~Guard()
+		{Value_->ConditionVariable_.notify_all();}
+
+	template <DecayedType ValueType, bool UseLogger> template <bool Const>
+		std::conditional_t<Const, const ValueType&, ValueType&>
+		Atomic<ValueType, UseLogger>::Guard<Const>::operator*() const&
+		{return Value_->Value_;}
+	template <DecayedType ValueType, bool UseLogger> template <bool Const>
+		std::conditional_t<Const, const ValueType*, ValueType*>
+		Atomic<ValueType, UseLogger>::Guard<Const>::operator->() const&
+		{return &Value_->Value_;}
+	template <DecayedType ValueType, bool UseLogger> template <bool Const>
+		std::conditional_t<Const, const ValueType&, ValueType&>
+		Atomic<ValueType, UseLogger>::Guard<Const>::value() const&
+		{return Value_->Value_;}
+
+	template <DecayedType ValueType, bool UseLogger> auto Atomic<ValueType, UseLogger>::lock() const&
+		-> DeepBase_::template LockReturnType_<decltype(*this)> requires DeepBase_::template LockConstraint_<>
+		{return lock_(*this);}
+	template <DecayedType ValueType, bool UseLogger> auto Atomic<ValueType, UseLogger>::lock() &
+		-> DeepBase_::template LockReturnType_<decltype(*this)> requires DeepBase_::template LockConstraint_<>
+		{return lock_(*this);}
+	template <DecayedType ValueType, bool UseLogger>
+		auto Atomic<ValueType, UseLogger>::lock(auto&& condition_function) const&
+		-> DeepBase_::template LockReturnType_<decltype(*this), decltype(condition_function)>
+		requires DeepBase_::template LockConstraint_<decltype(condition_function)>
+		{return lock_(*this, condition_function);}
+	template <DecayedType ValueType, bool UseLogger>
+		auto Atomic<ValueType, UseLogger>::lock(auto&& condition_function) &
+		-> DeepBase_::template LockReturnType_<decltype(*this), decltype(condition_function)>
+		requires DeepBase_::template LockConstraint_<decltype(condition_function)>
+		{return lock_(*this, condition_function);}
+	template <DecayedType ValueType, bool UseLogger> template <bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::lock(auto&& condition_function, auto timeout) const&
+		-> DeepBase_::template LockReturnType_<decltype(*this), decltype(timeout), Nothrow>
+		requires DeepBase_::template LockConstraint_<decltype(condition_function), decltype(timeout)>
+		{return lock_<Nothrow>(*this, condition_function, timeout);}
+	template <DecayedType ValueType, bool UseLogger> template <bool Nothrow>
+		auto Atomic<ValueType, UseLogger>::lock(auto&& condition_function, auto timeout) &
+		-> DeepBase_::template LockReturnType_<decltype(*this), decltype(timeout), Nothrow>
+		requires DeepBase_::template LockConstraint_<decltype(condition_function), decltype(timeout)>
+		{return lock_<Nothrow>(*this, condition_function, timeout);}
+}

local/pkgs/biu/include/biu/called_by.hpp

@@ -0,0 +1,10 @@
+# pragma once
+
+namespace biu
+{
+	template <typename AllowedType> class CalledBy
+	{
+		protected: CalledBy() = default;
+		friend AllowedType;
+	};
+}

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

@@ -0,0 +1,66 @@
+# pragma once
+# include <regex>
+# include <fmt/format.h>
+# include <magic_enum.hpp>
+
+namespace biu
+{
+	std::size_t hash(auto&&... objs);
+	[[gnu::always_inline]] void unused(auto&&...);
+
+	using uint128_t = __uint128_t;
+
+	inline namespace literals
+	{
+		using namespace std::literals;
+		using namespace fmt::literals;
+		std::regex operator""_re(const char* str, std::size_t len);
+	}
+
+	inline namespace stream_operators { using namespace magic_enum::iostream_operators; }
+
+	struct CaseInsensitiveStringLessComparator
+	{
+		template <typename String> constexpr bool operator()(const String& s1, const String& s2) const;
+	};
+
+	namespace detail_
+	{
+		template <typename T> struct RemoveMemberPointerHelper { using Type = T; };
+		template <typename Class, typename Member> struct RemoveMemberPointerHelper<Member Class::*>
+			{ using Type = Member; };
+	}
+	template <typename MemberPointer> using RemoveMemberPointer
+		= typename detail_::RemoveMemberPointerHelper<MemberPointer>::Type;
+
+	[[noreturn]] void block_forever();
+
+	namespace detail_
+	{
+		template <typename From, typename To> struct MoveQualifiersHelper
+		{
+			protected: static constexpr bool Const_ = std::is_const_v<From>;
+			protected: static constexpr bool Volatile_ = std::is_volatile_v<From>;
+			protected: static constexpr bool Reference_ = std::is_reference_v<From>;
+			protected: static constexpr bool Lvalue_ = std::is_lvalue_reference_v<From>;
+			protected: using NoCvrefType_ = std::remove_cvref_t<To>;
+			protected: using NoCvType_
+				= std::conditional_t<Reference_, std::conditional_t<Lvalue_, NoCvrefType_&, NoCvrefType_&&>, NoCvrefType_>;
+			protected: using NoConstType_ = std::conditional_t<Volatile_, volatile NoCvType_, NoCvType_>;
+			public: using Type = std::conditional_t<Const_, const NoConstType_, NoConstType_>;
+		};
+	}
+	template <typename From, typename To> using MoveQualifiers
+		= typename detail_::MoveQualifiersHelper<From, To>::Type;
+
+	namespace detail_
+	{
+		template <typename T, typename Fallback = void> struct FallbackIfNoTypeDeclaredHelper { using Type = Fallback; };
+		template <typename T, typename Fallback> requires requires { typename T::Type; }
+			struct FallbackIfNoTypeDeclaredHelper<T, Fallback> { using Type = typename T::Type; };
+		template <typename T, typename Fallback> requires requires {typename T::type;}
+			struct FallbackIfNoTypeDeclaredHelper<T, Fallback> { using Type = typename T::type; };
+	}
+	template <typename T, typename Fallback = void> using FallbackIfNoTypeDeclared
+		= typename detail_::FallbackIfNoTypeDeclaredHelper<T, Fallback>::Type;
+}

local/pkgs/biu/include/biu/common.tpp

@@ -0,0 +1,24 @@
+# pragma once
+# include <boost/functional/hash.hpp>
+# include <biu/common.hpp>
+
+namespace biu
+{
+	inline void unused(auto&&...) {}
+	inline std::size_t hash(auto&&... objs)
+	{
+		std::size_t result = 0;
+		(boost::hash_combine(result, objs), ...);
+		return result;
+	}
+
+	template <typename String> inline constexpr bool CaseInsensitiveStringLessComparator::operator()
+		(const String& s1, const String& s2) const
+	{
+		return std::lexicographical_compare
+		(
+			s1.begin(), s1.end(), s2.begin(), s2.end(),
+			[](char c1, char c2){return std::tolower(c1) < std::tolower(c2);}
+		);
+	}
+}

local/pkgs/biu/include/biu/concepts.hpp

@@ -0,0 +1,47 @@
+# pragma once
+# include <concepts>
+# include <tuple>
+# include <type_traits>
+# include <complex>
+
+namespace biu
+{
+	template <typename T> concept DecayedType = std::same_as<std::decay_t<T>, T>;
+
+	namespace detail_::specialization_of_detail_
+	{
+		template <typename Tuple> struct DropFirstMemberOfTupleHelper;
+		template <typename First, typename... Others> struct DropFirstMemberOfTupleHelper<std::tuple<First, Others...>>
+			{using Type = std::tuple<Others...>;};
+		template <typename ProvidedArgs, typename ActualArgs> consteval bool check_provided_args();
+		template <typename Class, template <typename...> typename Template> struct SpecializationOfHelper
+			{template <typename... ProvidedArgs> consteval static bool check_provided_args();};
+		template <template <typename...> typename Template, typename... ActualArgs>
+			struct SpecializationOfHelper<Template<ActualArgs...>, Template>
+			{template <typename... ProvidedArgs> consteval static bool check_provided_args();};
+	}
+	template <typename Class, template <typename...> typename Template, typename... ProvidedArgs>
+		concept SpecializationOf
+		= detail_::specialization_of_detail_::SpecializationOfHelper<std::decay_t<Class>, Template>
+			::template check_provided_args<ProvidedArgs...>();
+
+	template <typename T> concept CompletedType = sizeof(T) == sizeof(T);
+
+	template <typename From, typename To> concept ImplicitlyConvertibleTo = std::is_convertible<From, To>::value;
+	template <typename To, typename From> concept ImplicitlyConvertibleFrom = std::is_convertible<From, To>::value;
+	template <typename From, typename To> concept ExplicitlyConvertibleTo = std::is_constructible<To, From>::value;
+	template <typename To, typename From> concept ExplicitlyConvertibleFrom = std::is_constructible<To, From>::value;
+	template <typename From, typename To> concept ConvertibleTo
+		= ImplicitlyConvertibleTo<From, To> || ExplicitlyConvertibleTo<From, To>;
+	template <typename From, typename To> concept ConvertibleFrom = ConvertibleTo<From, To>;
+
+	template <typename Function, auto... Args> concept ConstevalInvokable
+		= requires() {typename std::type_identity_t<int[(Function()(Args...), 1)]>;};
+
+	template <typename T> concept Enumerable = std::is_enum_v<T>;
+
+	template <typename Function, typename Result, typename... Args> concept InvocableWithResult
+		= std::is_invocable_r_v<Result, Function, Args...>;
+	
+	template <typename T> concept Arithmetic = std::is_arithmetic<T>::value || SpecializationOf<T, std::complex>;
+}

local/pkgs/biu/include/biu/concepts.tpp

@@ -0,0 +1,34 @@
+# pragma once
+# include <tuple>
+# include <biu/concepts.hpp>
+
+namespace biu
+{
+	template <typename ProvidedArgs, typename ActualArgs> consteval bool
+		detail_::specialization_of_detail_::check_provided_args()
+	{
+		if constexpr (std::tuple_size_v<ProvidedArgs> == 0)
+			return true;
+		else if constexpr (std::tuple_size_v<ActualArgs> == 0)
+			return false;
+		else if constexpr
+			(std::same_as<std::tuple_element_t<0, ProvidedArgs>, std::tuple_element_t<0, ActualArgs>>)
+			return check_provided_args 
+			<
+				typename DropFirstMemberOfTupleHelper<ProvidedArgs>::Type,
+				typename DropFirstMemberOfTupleHelper<ActualArgs>::Type
+			>();
+		else
+			return false;
+	}
+	template <typename Class, template <typename...> typename Template> template <typename... ProvidedArgs> consteval
+		bool detail_::specialization_of_detail_::SpecializationOfHelper<Class, Template>::check_provided_args()
+		{ return false; }
+	template <template <typename...> typename Template, typename... ActualArgs> template <typename... ProvidedArgs>
+		consteval bool detail_::specialization_of_detail_::SpecializationOfHelper
+			<Template<ActualArgs...>, Template>::check_provided_args()
+		{
+			return specialization_of_detail_::check_provided_args
+				<std::tuple<ProvidedArgs...>, std::tuple<ActualArgs...>>();
+		}
+}

local/pkgs/biu/include/biu/eigen.hpp

@@ -0,0 +1,54 @@
+# pragma once
+# include <vector>
+# include <span>
+# include <Eigen/Dense>
+# include <biu/concepts.hpp>
+
+namespace biu
+{
+  namespace detail_::eigen
+  {
+    // user-specified size of destination container: dynamic, unspecified(use default), or fixed
+    constexpr std::size_t dynamicSize = std::dynamic_extent, unspecifiedSize = std::dynamic_extent - 1;
+    static_assert(std::dynamic_extent == std::numeric_limits<std::size_t>::max());
+
+    // supported types of standard containers
+		template <typename T, typename Scalar> struct SpecializationOfArrayHelper : std::false_type {};
+		template <typename Scalar, std::size_t N>
+      struct SpecializationOfArrayHelper<std::array<Scalar, N>, Scalar> : std::true_type {};
+		template <typename Scalar, std::size_t N>
+      struct SpecializationOfArrayHelper<std::array<Scalar, N>, void> : std::true_type {};
+    template <typename T, typename Scalar = void> concept SpecializationOfArray =
+      SpecializationOfArrayHelper<T, Scalar>::value;
+    template <typename T, typename Scalar> concept StandardContainer =
+      SpecializationOf<T, std::vector, Scalar> || SpecializationOfArray<T, Scalar>;
+
+    // helper operator| to specify the size of the destination container
+    // usage: some_value | toEigen<Row, Col>
+    template <std::size_t Row, std::size_t Col> struct ToEigenHelper {};
+    template <std::size_t Row = unspecifiedSize, std::size_t Col = unspecifiedSize>
+      inline constexpr ToEigenHelper<Row, Col> toEigen;
+    // convert 1D standard container to Eigen::Vector
+    // if no size is specified, convert std::vector to dynamic-size Eigen::Vector,
+    //  std::array to fixed-size Eigen::Vector;
+    // if size is std::dynamic_extent, always convert to dynamic-size Eigen::Vector
+    // if size is specified as a number, convert to fixed-size Eigen::Vector if specified size equals the size of the
+    //  input, otherwise throw an error
+    template <template <int N> typename Callback, std::size_t ToSize> auto deduce_eigen_size(auto&& container);
+    template <Arithmetic T, StandardContainer<T> From, std::size_t ToSize> auto operator|
+      (const From&, const ToEigenHelper<ToSize, unspecifiedSize>&);
+    // convert 2D standard container to Eigen::Matrix
+    // the same rules as above apply
+    // besides, all rows must have the same size, otherwise throw an error
+    template
+    <
+      Arithmetic T, StandardContainer<T> FromPerRow, StandardContainer<FromPerRow> From,
+      std::size_t ToRow, std::size_t ToCol
+    >
+      auto operator|(const From&, const ToEigenHelper<ToRow, ToCol>&);
+
+    // TODO: implement fromEigen
+  }
+
+  inline namespace eigen { using detail_::eigen::toEigen; using detail_::eigen::operator|; }
+}

local/pkgs/biu/include/biu/eigen.tpp

@@ -0,0 +1,29 @@
+# pragma once
+# include <biu/eigen.hpp>
+// TODO: fix biu::logger
+// # include <biu/logger.hpp>
+# include <range/v3/view.hpp>
+
+namespace biu
+{
+  namespace detail_::eigen
+  {
+    template <template <int N> typename Callback, std::size_t ToSize> auto deduce_eigen_size(auto&& from)
+    {
+      if constexpr (ToSize == dynamicSize)
+        return Callback<Eigen::Dynamic>()(from.data(), from.size());
+      else if constexpr (ToSize == unspecifiedSize)
+        if constexpr (SpecializationOfArray<decltype(from)>)
+          return Callback<from.size()>()(from.data());
+        else
+          return Callback<Eigen::Dynamic>()(from.data(), from.size());
+      else
+        if (from.size() != ToSize)
+          // TODO: use biu::logger
+          throw std::invalid_argument("biu::toEigen: size mismatch");
+        else
+          return Callback<ToSize>()(from.data());
+    }
+    // TODO: implement 2D case
+  }
+}

local/pkgs/biu/include/biu/format.hpp

@@ -0,0 +1,72 @@
+# pragma once
+# include <variant>
+# include <experimental/memory>
+# include <fmt/ostream.h>
+# include <biu/string.hpp>
+# include <biu/concepts.hpp>
+
+namespace biu
+{
+	template <typename T, typename Char = char> concept Formattable = fmt::is_formattable<T, Char>::value;
+
+	namespace detail_
+	{
+		template <typename Char, Char... c> struct FormatLiteralHelper : protected BasicStaticString<Char, c...>
+			{template <typename... Param> std::basic_string<Char> operator()(Param&&... param) const;};
+	}
+	namespace literals
+		{template <typename Char, Char... c> consteval detail_::FormatLiteralHelper<Char, c...> operator""_f();}
+
+	namespace detail_
+	{
+		template <typename T> concept OptionalWrap
+			= SpecializationOf<T, std::optional> || SpecializationOf<T, std::shared_ptr>
+				|| SpecializationOf<T, std::weak_ptr> || SpecializationOf<T, std::unique_ptr>
+				|| SpecializationOf<T, std::experimental::observer_ptr>;
+		template <typename Wrap> struct UnderlyingTypeOfOptionalWrap;
+		template <typename Wrap> requires requires() {typename Wrap::value_type;}
+			struct UnderlyingTypeOfOptionalWrap<Wrap>
+			{using Type = std::remove_cvref_t<typename Wrap::value_type>;};
+		template <typename Wrap> requires requires() {typename Wrap::element_type;}
+			struct UnderlyingTypeOfOptionalWrap<Wrap>
+			{using Type = std::remove_cvref_t<typename Wrap::element_type>;};
+		template <typename T> struct FormatterReuseProxy
+		{
+			constexpr auto parse(fmt::format_parse_context& ctx)
+				-> std::invoke_result_t<decltype(&fmt::format_parse_context::begin), fmt::format_parse_context>;
+		};
+		template <typename T>
+			requires (!SpecializationOf<T, std::weak_ptr> && std::default_initializable<fmt::formatter<T>>)
+			struct FormatterReuseProxy<T> : fmt::formatter<T> {};
+	}
+}
+
+namespace std
+{
+	template <typename Char, typename... Ts> requires (sizeof...(Ts) > 0) basic_ostream<Char>& operator<<
+		(basic_ostream<Char>& os, const variant<Ts...>& value);
+}
+
+namespace fmt
+{
+	using namespace biu::stream_operators;
+
+	template <typename Char, biu::detail_::OptionalWrap Wrap> struct formatter<Wrap, Char>
+		: biu::detail_::FormatterReuseProxy<typename biu::detail_::UnderlyingTypeOfOptionalWrap<Wrap>::Type>
+	{
+		template <typename FormatContext> auto format(const Wrap& wrap, FormatContext& ctx)
+			-> std::invoke_result_t<decltype(&FormatContext::out), FormatContext>;
+	};
+
+	template <typename Char, biu::Enumerable T> struct formatter<T, Char>
+	{
+		bool full = false;
+		constexpr auto parse(fmt::format_parse_context& ctx)
+			-> std::invoke_result_t<decltype(&fmt::format_parse_context::begin), fmt::format_parse_context>;
+		template <typename FormatContext> auto format(const T& value, FormatContext& ctx)
+			-> std::invoke_result_t<decltype(&FormatContext::out), FormatContext>;
+	};
+
+	template <typename Char, typename... Ts> struct formatter<std::variant<Ts...>, Char>
+		: basic_ostream_formatter<Char> {};
+}

local/pkgs/biu/include/biu/format.tpp

@@ -0,0 +1,122 @@
+# pragma once
+# include <nameof.hpp>
+# include <biu/format.hpp>
+
+namespace biu
+{
+	template <typename Char, Char... c> template <typename... Param>
+		std::basic_string<Char> detail_::FormatLiteralHelper<Char, c...>::operator() (Param&&... param) const
+		{return fmt::format(BasicStaticString<Char, c...>::StringView, std::forward<Param>(param)...);}
+	template <typename Char, Char... c> consteval
+		detail_::FormatLiteralHelper<Char, c...> literals::operator""_f()
+		{return {};}
+
+	template <typename T> constexpr
+		auto detail_::FormatterReuseProxy<T>::parse(fmt::format_parse_context& ctx)
+		-> std::invoke_result_t<decltype(&fmt::format_parse_context::begin), fmt::format_parse_context>
+	{
+		if (ctx.begin() != ctx.end() && *ctx.begin() != '}')
+			throw fmt::format_error
+			(
+				"{} do not support to be format, so the wrapper should not have any format syntax."_f
+					(nameof::nameof_full_type<T>())
+			);
+		return ctx.begin();
+	}
+}
+
+namespace std
+{
+	template <typename Char, typename... Ts> requires (sizeof...(Ts) > 0)
+		basic_ostream<Char>& operator<<(basic_ostream<Char>& os, const variant<Ts...>& value)
+	{
+		using namespace biu::literals;
+		auto try_print = [&]<typename T>
+		{
+			if (holds_alternative<T>(value))
+			{
+				if constexpr (biu::Formattable<T, Char>)
+					os << "({}: {})"_f(nameof::nameof_full_type<T>(), get<T>(value));
+				else
+					os << "({}: {})"_f(nameof::nameof_full_type<T>(), "non-null unformattable value");
+			}
+		};
+		(try_print.template operator()<Ts>(), ...);
+		return os;
+	}
+}
+
+namespace fmt
+{
+	template <typename Char, biu::detail_::OptionalWrap Wrap> template <typename FormatContext>
+		auto formatter<Wrap, Char>::format(const Wrap& wrap, FormatContext& ctx)
+		-> std::invoke_result_t<decltype(&FormatContext::out), FormatContext>
+	{
+		using namespace biu::literals;
+		using namespace biu::stream_operators;
+		using value_t = biu::detail_::UnderlyingTypeOfOptionalWrap<Wrap>::Type;
+		auto format_value_type = [&, this](const value_t& value)
+		{
+			if constexpr (!biu::Formattable<value_t, Char>)
+				return format_to(ctx.out(), "non-null unformattable value");
+			else if constexpr (std::default_initializable<formatter<value_t>>)
+				biu::detail_::FormatterReuseProxy<value_t>::format(value, ctx);
+			else
+				format_to(ctx.out(), "{}", value);
+		};
+		format_to(ctx.out(), "(");
+		if constexpr (biu::SpecializationOf<Wrap, std::optional>)
+		{
+			if (wrap)
+				format_value_type(*wrap);
+			else
+				format_to(ctx.out(), "null");
+		}
+		else if constexpr (biu::SpecializationOf<Wrap, std::weak_ptr>)
+		{
+			if (auto shared = wrap.lock())
+			{
+				format_to(ctx.out(), "{} ", ptr(shared.get()));
+				format_value_type(*shared);
+			}
+			else
+				format_to(ctx.out(), "null");
+		}
+		else
+		{
+			if (wrap)
+			{
+				format_to(ctx.out(), "{} ", ptr(wrap.get()));
+				format_value_type(*wrap);
+			}
+			else
+				format_to(ctx.out(), "null");
+		}
+		return format_to(ctx.out(), ")");
+	}
+
+	template <typename Char, biu::Enumerable T> constexpr
+		auto formatter<T, Char>::parse(format_parse_context& ctx)
+		-> std::invoke_result_t<decltype(&format_parse_context::begin), format_parse_context>
+	{
+		auto it = ctx.begin();
+		if (it != ctx.end() && *it == 'f')
+		{
+			full = true;
+			it++;
+		}
+		if (it != ctx.end() && *it != '}')
+			throw format_error{"syntax error."};
+		return it;
+	}
+
+	template <typename Char, biu::Enumerable T> template <typename FormatContext>
+		auto formatter<T, Char>::format(const T& value, FormatContext& ctx)
+		-> std::invoke_result_t<decltype(&FormatContext::out), FormatContext>
+	{
+		if (full)
+			return format_to(ctx.out(), "{}::{}", nameof::nameof_type<T>(), nameof::nameof_enum(value));
+		else
+			return format_to(ctx.out(), "{}", nameof::nameof_enum(value));
+	}
+}

local/pkgs/biu/include/biu/logger.hpp

@@ -0,0 +1,103 @@
+# pragma once
+# include <map>
+# include <boost/stacktrace.hpp>
+# include <biu/atomic/nolog.hpp>
+
+namespace biu
+{
+	class Logger
+	{
+		// All the member function corresponding to stacktrace should be inlined
+		// All the public function (including public function of member class) should be thread safe.
+
+		public: Logger() = delete;
+
+		// Setup output stream and log level in a thread-safe way
+		public: enum class Level
+		{
+			None,
+			Error,
+			Access,
+			Info,
+			Debug
+		};
+		protected: struct LoggerConfigType_
+		{
+			std::experimental::observer_ptr<std::ostream> Stream;
+			std::shared_ptr<std::ostream> StreamStorage;
+			Logger::Level Level;
+		};
+		protected: static Atomic<std::optional<LoggerConfigType_>, false> LoggerConfig_;
+		public: static void init(std::experimental::observer_ptr<std::ostream> stream, Level level);
+		public: static void init(std::shared_ptr<std::ostream> stream, Level level);
+
+		// Send a telegram message if token and chat id are set, all the functions are thread-safe
+		protected: static Atomic<std::optional<std::pair<std::string, std::string>>, false> TelegramConfig_;
+		public: static void telegram_init(const std::string& token, const std::string& chat_id);
+		public: static void telegram_notify(const std::string& message);
+		public: static void telegram_notify_async(const std::string& message);
+
+		// Monitor the lifetime of an object
+		// usage: struct my_class : protected Logger::ObjectMonitor<my_class> {}
+		public: template <typename T> class ObjectMonitor
+		{
+			protected: const std::chrono::time_point<std::chrono::steady_clock> CreateTime_;
+
+			// call log<Debug>("create {type} at {address}.");
+			protected: [[gnu::always_inline]] ObjectMonitor();
+
+			// call log<Debug>("destroy {type} at {address} after {duration} ms.");
+			protected: [[gnu::always_inline]] virtual ~ObjectMonitor();
+		};
+		template <typename T> friend class ObjectMonitor;
+
+		// List of objects that is being monitored by ObjectMonitor, {address, type}
+		protected: static Atomic<std::multimap<const void*, std::string_view>, false> Objects_;
+
+		public: template <typename FinalException> class Exception : public std::exception
+		{
+			protected: const std::string Message_;
+			protected: const boost::stacktrace::stacktrace Stacktrace_;
+
+			public: explicit Exception(const std::string& message);
+			public: const char* what() const noexcept final {return Message_.c_str();}
+		};
+
+		// Monitor the start and end of a function, as well as corresponding thread.
+		// This object should be construct at the beginning of the function, and should never be passed to another
+		// function or thread.
+		public: class Guard
+		{
+			protected: thread_local static unsigned Indent_;
+			protected: const std::chrono::time_point<std::chrono::steady_clock> StartTime_;
+
+			// if sizeof...(Param) > 0, call log<Debug>("begin function with {arguments}.");
+			// else call log<Debug>("begin function.");
+			public: template <typename... Param> [[gnu::always_inline]] explicit Guard(Param&&... param);
+
+			// call log<Debug>("end function after {duration} ms.")
+			public: [[gnu::always_inline]] virtual ~Guard();
+
+			// call log<Debug>("reached after {duration} ms.")
+			public: [[gnu::always_inline]] void operator()() const;
+
+			// call log<Debug>("return {return} after {duration} ms.")
+			public: template <typename T> [[gnu::always_inline]] T rtn(T&& value) const;
+
+			// print the following message if LoggerConfig_ is set and the level is higher than the level of the
+			// LoggerConfig_
+			// [ {time} {thread} {indent} {filename}:{line} {function_name} ] {message}
+			public: template <Level L> [[gnu::always_inline]] void log(const std::string& message) const;
+
+			public: template <typename FinalException> [[gnu::always_inline]] void print_exception
+			(
+				const std::string& type, const std::string& message, const boost::stacktrace::stacktrace& stacktrace,
+				CalledBy<Exception<FinalException>>
+			) const;
+		};
+		friend class Guard;
+
+		// list of threads which is being monitored by Guard and number of Guard created in this thread so far
+		protected: static Atomic<std::map<std::size_t, std::size_t>, false> Threads_;
+	};
+}

local/pkgs/biu/include/biu/logger.tpp

@@ -0,0 +1,143 @@
+# pragma once
+# define BOOST_STACKTRACE_USE_BACKTRACE
+# include <fmt/chrono.h>
+# include <biu/logger.hpp>
+# include <biu/common.hpp>
+# include <biu/format.hpp>
+
+namespace biu
+{
+	template <typename T> Logger::ObjectMonitor<T>::ObjectMonitor()
+		: CreateTime_{std::chrono::steady_clock::now()}
+	{
+		Guard guard;
+		guard.log<Level::Debug>("create {} at {}."_f(nameof::nameof_full_type<T>(), fmt::ptr(this)));
+		auto&& lock = Objects_.lock();
+		lock->emplace(this, nameof::nameof_full_type<T>());
+	}
+	template <typename T> Logger::ObjectMonitor<T>::~ObjectMonitor()
+	{
+		Guard guard;
+		guard.log<Level::Debug>("destroy {} at {} after {} ms."_f
+		(
+			nameof::nameof_full_type<T>(), fmt::ptr(this),
+			std::chrono::duration_cast<std::chrono::milliseconds>
+				(std::chrono::steady_clock::now() - CreateTime_).count()
+		));
+		auto&& lock = Objects_.lock();
+		auto range = lock->equal_range(this);
+		for (auto it = range.first; it != range.second; it++)
+			if (it->second == nameof::nameof_full_type<T>())
+			{
+				lock->erase(it);
+				return;
+			}
+		guard.log<Level::Error>
+			("{} {} not found in Logger::Objects."_f(fmt::ptr(this), nameof::nameof_full_type<T>()));
+	}
+
+	template <typename FinalException> Logger::Exception<FinalException>::Exception(const std::string& message)
+	{
+		Logger::Guard log{message};
+		log.print_exception(nameof::nameof_full_type<FinalException>(), message, Stacktrace_);
+	}
+
+	template <typename... Param> inline Logger::Guard::Guard(Param&&... param)
+		: StartTime_{std::chrono::steady_clock::now()}
+	{
+		Indent_++;
+		auto&& lock = Threads_.lock();
+		auto thread_id = std::hash<std::thread::id>{}(std::this_thread::get_id());
+		if (lock->contains(thread_id))
+			lock.value()[thread_id]++;
+		else
+			lock->emplace(thread_id, 1);
+		if constexpr (sizeof...(Param) > 0)
+		{
+			std::stringstream ss;
+			std::vector<std::string> params = {"{}"_f(std::forward<Param>(param))...};
+			ss << "begin function with {";
+			for (auto& param : params)
+				ss << param << ", ";
+			ss.seekp(-2, ss.cur);
+			ss << "}.";
+			log<Level::Debug>(ss.str());
+		}
+		else
+			log<Level::Debug>("begin function.");
+	}
+	inline Logger::Guard::~Guard()
+	{
+		log<Level::Debug>("end function after {} ms."_f(std::chrono::duration_cast<std::chrono::milliseconds>
+			(std::chrono::steady_clock::now() - StartTime_).count()));
+		Indent_--;
+		auto&& lock = Threads_.lock();
+		auto thread_id = std::hash<std::thread::id>{}(std::this_thread::get_id());
+		if (lock->contains(thread_id))
+		{
+			lock.value()[thread_id]--;
+			if (lock.value()[thread_id] == 0)
+				lock->erase(thread_id);
+		}
+		else [[unlikely]]
+			log<Level::Debug>("{:08x} not found in Logger::Threads."_f
+				(std::hash<std::thread::id>{}(std::this_thread::get_id()) % std::numeric_limits<std::uint64_t>::max()));
+	}
+	inline void Logger::Guard::operator()() const
+	{
+		log<Level::Debug>("reached after {} ms."_f
+		(
+			std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - StartTime_).count()
+		));
+	}
+	template <typename T> inline T Logger::Guard::rtn(T&& value) const
+	{
+		log<Level::Debug>("return {} after {} ms."_f
+		(
+			std::forward<T>(value), 
+			std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - StartTime_).count()
+		));
+		return std::forward<T>(value);
+	}
+	template <Logger::Level L> inline void Logger::Guard::log(const std::string& message) const
+	{
+		if (auto&& lock = LoggerConfig_.lock(); *lock && lock.value()->Level >= L)
+		{
+			static_assert(std::same_as<std::size_t, std::uint64_t>);
+			auto time = std::chrono::system_clock::now();
+			boost::stacktrace::stacktrace stack;
+			*lock.value()->Stream << "[ {:%Y-%m-%d %H:%M:%S}:{:03} {:08x} {:04} {}:{} {} ] {}\n"_f
+			(
+				time,
+				std::chrono::time_point_cast<std::chrono::milliseconds>(time).time_since_epoch().count() % 1000,
+				std::hash<std::thread::id>{}(std::this_thread::get_id())
+					% std::numeric_limits<std::uint64_t>::max(),
+				Indent_,
+				stack[0].source_file().empty() ? "??"s : stack[0].source_file(),
+				stack[0].source_line() == 0 ? "??"s : "{}"_f(stack[0].source_line()),
+				stack[0].name(),
+				message
+			) << std::flush;
+		}
+	}
+	template <typename FinalException> inline void Logger::Guard::print_exception
+	(
+		const std::string& type, const std::string& message, const boost::stacktrace::stacktrace& stacktrace,
+		CalledBy<Exception<FinalException>>
+	) const
+	{
+		log<Level::Error>("{}: {}"_f(type, message));
+		if (auto&& lock = LoggerConfig_.lock(); *lock && lock.value()->Level >= Logger::Level::Error)
+		{
+			static_assert(std::same_as<std::size_t, std::uint64_t>);
+			for (auto frame : stacktrace)
+				*lock.value()->Stream << "\tfrom {}:{} {}\n"_f
+				(
+					frame.source_file().empty() ? "??"s : frame.source_file(),
+					frame.source_line() == 0 ? "??"s : "{}"_f(frame.source_line()),
+					frame.name()
+				);
+			*lock.value()->Stream << std::flush;
+		}
+	}
+}

local/pkgs/biu/include/biu/smartref.hpp

@@ -0,0 +1,18 @@
+# pragma once
+# include <memory>
+# include <type_traits>
+
+namespace biu
+{
+	// store a reference to an lvalue, or a value (instead of a reference) copy or moved from an rvalue
+	template <typename T> class SmartRef
+	{
+		protected: std::unique_ptr<T> Ptr_;
+		protected: T& Ref_;
+
+		public: SmartRef(T& val);
+		public: template <typename... Us> requires (std::is_constructible_v<T, Us...>) SmartRef(Us&&... val);
+		public: T& operator*();
+		public: T* operator->();
+	};
+}

local/pkgs/biu/include/biu/smartref.tpp

@@ -0,0 +1,13 @@
+# pragma once
+# include <utility>
+# include <biu/smartref.hpp>
+
+namespace biu
+{
+	template <typename T> inline SmartRef<T>::SmartRef(T& val) : Ref_(val) {}
+	template <typename T> template <typename... Us> requires (std::is_constructible_v<T, Us...>)
+		inline SmartRef<T>::SmartRef(Us&&... val)
+		: Ptr_(std::make_unique<T>(std::forward<Us>(val)...)), Ref_(*Ptr_) {}
+	template <typename T> inline T& SmartRef<T>::operator*() {return Ref_;}
+	template <typename T> inline T* SmartRef<T>::operator->() {return &Ref_;}
+}

local/pkgs/biu/include/biu/string.hpp

@@ -0,0 +1,111 @@
+# pragma once
+# include <regex>
+# include <array>
+# include <string>
+# include <string_view>
+# include <iostream>
+# include <concurrencpp/concurrencpp.h>
+# include <biu/concepts.hpp>
+# include <biu/smartref.hpp>
+
+namespace biu
+{
+	// Store a string in a static member of a class; or, use a class to represent a string.
+	template <DecayedType Char, Char... c> struct BasicStaticString
+	{
+		static constexpr std::array<Char, sizeof...(c)> Array{c...};
+		static constexpr std::basic_string_view<Char> StringView{Array.data(), sizeof...(c)};
+	};
+	template <char... c> using StaticString = BasicStaticString<char, c...>;
+	inline namespace stream_operators
+	{
+		template <typename Char, Char... c>
+			std::basic_ostream<Char>& operator<<(std::basic_ostream<Char>& os, BasicStaticString<Char, c...>);
+	}
+	inline namespace literals
+		{ template <typename Char, Char... c> consteval BasicStaticString<Char, c...> operator""_ss(); }
+	namespace detail_
+	{
+		template <typename C, typename T> struct SpecializationOfBasicStaticStringHelper : std::false_type {};
+		template <typename C, C... c>
+			struct SpecializationOfBasicStaticStringHelper<C, BasicStaticString<C, c...>> : std::true_type {};
+		template <typename C, C... c>
+			struct SpecializationOfBasicStaticStringHelper<void, BasicStaticString<C, c...>> : std::true_type {};
+		template <typename T, typename C> concept SpecializationOfBasicStaticString
+			= SpecializationOfBasicStaticStringHelper<std::decay_t<C>, std::decay_t<T>>::value;
+	}
+	template <typename T, typename C = void> concept SpecializationOfBasicStaticString
+		= detail_::SpecializationOfBasicStaticString<T, C>
+			&& detail_::SpecializationOfBasicStaticString<T, void>;
+	template <typename T> concept SpecializationOfStaticString = SpecializationOfBasicStaticString<T, char>;
+
+	// Store a string in a fixed-size array
+	template <DecayedType Char, std::size_t N> struct BasicFixedString
+	{
+		Char Data[N];
+		constexpr static const std::size_t Size = N - 1;
+		constexpr BasicFixedString(const Char (&str)[N]);
+	};
+	template <std::size_t N> using FixedString = BasicFixedString<char, N>;
+	inline namespace stream_operators
+	{
+		template <typename Char, std::size_t N> std::basic_ostream<Char>& operator<<
+			(std::basic_ostream<Char>& os, const BasicFixedString<Char, N>& str);
+	}
+	inline namespace literals { template <BasicFixedString FS> constexpr decltype(FS) operator""_fs(); }
+	namespace detail_
+	{
+		template <typename C, typename T> struct SpecializationOfBasicFixedStringHelper : std::false_type {};
+		template <typename C, std::size_t N>
+			struct SpecializationOfBasicFixedStringHelper<C, BasicFixedString<C, N>> : std::true_type {};
+		template <typename C, std::size_t N>
+			struct SpecializationOfBasicFixedStringHelper<void, BasicFixedString<C, N>> : std::true_type {};
+		template <typename T, typename C> concept SpecializationOfBasicFixedString
+			= SpecializationOfBasicFixedStringHelper<std::decay_t<C>, std::decay_t<T>>::value;
+	}
+	template <typename T, typename C = void> concept SpecializationOfBasicFixedString
+		= detail_::SpecializationOfBasicFixedString<T, C>
+			&& detail_::SpecializationOfBasicFixedString<T, void>;
+	template <typename T> concept SpecializationOfFixedString = SpecializationOfBasicFixedString<T, char>;
+
+	// Store a string with at most N characters
+	template <DecayedType Char, std::size_t N> struct BasicVariableString
+	{
+		Char Data[N];
+		std::size_t Size;
+		constexpr static const std::size_t MaxSize = N - 1;
+		template <std::size_t M> requires (M<=N) constexpr BasicVariableString(const Char (&str)[M]);
+	};
+	template <std::size_t N> using VariableString = BasicVariableString<char, N>;
+	inline namespace stream_operators
+	{
+		template <typename Char, std::size_t N> std::basic_ostream<Char>& operator<<
+			(std::basic_ostream<Char>& os, const BasicVariableString<Char, N>& str);
+	}
+
+	namespace detail_
+	{
+		template <typename C, typename T> struct SpecializationOfBasicVariableStringHelper : std::false_type {};
+		template <typename C, std::size_t N>
+			struct SpecializationOfBasicVariableStringHelper<C, BasicVariableString<C, N>> : std::true_type {};
+		template <typename C, std::size_t N>
+			struct SpecializationOfBasicVariableStringHelper<void, BasicVariableString<C, N>> : std::true_type {};
+		template <typename T, typename C> concept SpecializationOfBasicVariableString
+			= SpecializationOfBasicVariableStringHelper<std::decay_t<C>, std::decay_t<T>>::value;
+	}
+	template <typename T, typename C = void> concept SpecializationOfBasicVariableString
+		= detail_::SpecializationOfBasicVariableString<T, C>
+			&& detail_::SpecializationOfBasicVariableString<T, void>;
+	template <typename T> concept SpecializationOfVariableString = SpecializationOfBasicVariableString<T, char>;
+
+	namespace string
+	{
+		// Find specific content in a string. Return unmatched content before the match and the match result every
+		// time. If match reached the end, the second returned value will be std::sregex_iterator().
+		concurrencpp::generator<std::pair<std::string_view, std::sregex_iterator>> find
+			(SmartRef<const std::string> data, SmartRef<const std::regex> regex);
+		// Use a regex to find all matches and replace them with a callback function
+		std::string replace
+			(const std::string& data, const std::regex& regex, std::function<std::string(const std::smatch&)> function);
+	}
+}

local/pkgs/biu/include/biu/string.tpp

@@ -0,0 +1,30 @@
+# pragma once
+# include <biu/string.hpp>
+
+namespace biu
+{
+	template <typename Char, Char... c> inline std::basic_ostream<Char>& stream_operators::operator<<
+		(std::basic_ostream<Char>& os, BasicStaticString<Char, c...>)
+		{ return os << std::basic_string_view{c...}; }
+	template <typename Char, Char... c> consteval BasicStaticString<Char, c...> literals::operator""_ss()
+		{ return {}; }
+
+	template <DecayedType Char, std::size_t N> constexpr
+		BasicFixedString<Char, N>::BasicFixedString(const Char (&str)[N])
+		{ std::copy_n(str, N, Data); }
+	template <typename Char, std::size_t N> std::basic_ostream<Char>& stream_operators::operator<<
+		(std::basic_ostream<Char>& os, const BasicFixedString<Char, N>& str)
+		{ return os << std::basic_string_view<Char>(str.Data, str.Size); }
+	template <BasicFixedString FS> constexpr decltype(FS) literals::operator""_fs()
+		{ return FS; }
+
+	template <DecayedType Char, std::size_t N> template <std::size_t M> requires (M<=N) constexpr
+		BasicVariableString<Char, N>::BasicVariableString(const Char (&str)[M]) : Size(M)
+	{
+		std::fill(Data, Data + N, '\0');
+		std::copy_n(str, M, Data);
+	}
+	template <typename Char, std::size_t N> std::basic_ostream<Char>& stream_operators::operator<<
+		(std::basic_ostream<Char>& os, const BasicVariableString<Char, N>& str)
+		{ return os << std::basic_string_view<Char>(str.Data, str.Size); }
+}

local/pkgs/biu/src/common.cpp

@@ -0,0 +1,14 @@
+# include <future>
+# include <utility>
+# include <biu.hpp>
+
+namespace biu
+{
+	std::regex literals::operator""_re(const char* str, std::size_t len)
+		{ return std::regex{str, len}; }
+	void block_forever()
+	{
+		std::promise<void>().get_future().wait();
+		std::unreachable();
+	}
+}

local/pkgs/biu/src/logger.cpp

@@ -0,0 +1,36 @@
+# include <tgbot/tgbot.h>
+# include <biu.hpp>
+
+namespace biu
+{
+	Atomic<std::optional<typename Logger::LoggerConfigType_>, false> Logger::LoggerConfig_;
+	void Logger::init(std::experimental::observer_ptr<std::ostream> stream, Level level)
+	{
+		auto&& lock = LoggerConfig_.lock();
+		lock->emplace(stream, nullptr, level);
+	}
+	void Logger::init(std::shared_ptr<std::ostream> stream, Level level)
+	{
+		auto&& lock = LoggerConfig_.lock();
+		lock->emplace(std::experimental::make_observer(stream.get()), stream, level);
+	}
+
+	Atomic<std::optional<std::pair<std::string, std::string>>, false> Logger::TelegramConfig_;
+	void Logger::telegram_init(const std::string& token, const std::string& chat_id)
+		{TelegramConfig_ = std::make_pair(token, chat_id);}
+	void Logger::telegram_notify(const std::string& message)
+	{
+		if (auto&& lock = TelegramConfig_.lock(); *lock)
+		{
+			TgBot::Bot bot{lock.value()->first};
+			bot.getApi().sendMessage(lock.value()->first, message);
+		}
+	}
+	void Logger::telegram_notify_async(const std::string& message)
+		{std::thread{Logger::telegram_notify, message}.detach();}
+
+	Atomic<std::multimap<const void*, std::string_view>, false> Logger::Objects_;
+
+	thread_local unsigned Logger::Guard::Indent_ = 0;
+	Atomic<std::map<std::size_t, std::size_t>, false> Logger::Threads_;
+}

local/pkgs/biu/src/string.cpp

@@ -0,0 +1,53 @@
+# include <fmt/chrono.h>
+# include <biu.hpp>
+
+namespace biu
+{
+	concurrencpp::generator<std::pair<std::string_view, std::sregex_iterator>> string::find
+		(SmartRef<const std::string> data, SmartRef<const std::regex> regex)
+	{
+		Logger::Guard log;
+		std::string::const_iterator unmatched_prefix_begin = data->cbegin(), unmatched_prefix_end;
+		std::sregex_iterator regit;
+		while (true)
+		{
+			if (regit == std::sregex_iterator{})
+				regit = std::sregex_iterator{data->begin(), data->end(), *regex};
+			else
+				regit++;
+			if (regit == std::sregex_iterator{})
+			{
+				unmatched_prefix_end = data->cend();
+				log.log<Logger::Level::Debug>("distance: {}"_f(std::distance(unmatched_prefix_begin, unmatched_prefix_end)));
+			}
+			else
+				unmatched_prefix_end = (*regit)[0].first;
+			co_yield
+			{
+				std::string_view
+				{
+					&*unmatched_prefix_begin,
+					static_cast<std::size_t>(std::distance(unmatched_prefix_begin, unmatched_prefix_end))
+				},
+				regit
+			};
+			if (regit == std::sregex_iterator{})
+				break;
+			unmatched_prefix_begin = (*regit)[0].second;
+		}
+	}
+
+	std::string string::replace
+		(const std::string& data, const std::regex& regex, std::function<std::string(const std::smatch&)> function)
+	{
+		Logger::Guard log;
+		std::string result;
+		for (auto matched : find(data, regex))
+		{
+			result.append(matched.first);
+			if (matched.second != std::sregex_iterator{})
+				result.append(function(*matched.second));
+		}
+		return result;
+	}
+}

local/pkgs/default.nix

@@ -1,69 +1,91 @@
-{ lib, pkgs, topInputs }: with pkgs; rec
+inputs: rec
 {
-  typora = callPackage ./typora {};
-  vesta = callPackage ./vesta {};
-  rsshub = callPackage ./rsshub { src = topInputs.rsshub; };
-  misskey = callPackage ./misskey { nodejs = nodejs_21; src = topInputs.misskey; };
-  mk-meili-mgn = callPackage ./mk-meili-mgn {};
-  vaspkit = callPackage ./vaspkit { attrsToList = (import ../lib lib).attrsToList; };
-  v-sim = callPackage ./v-sim { src = topInputs.v-sim; };
-  concurrencpp = callPackage ./concurrencpp { stdenv = gcc13Stdenv; src = topInputs.concurrencpp; };
-  eigengdb = python3Packages.callPackage ./eigengdb {};
-  nodesoup = callPackage ./nodesoup { src = topInputs.nodesoup; };
-  matplotplusplus = callPackage ./matplotplusplus { inherit nodesoup glad; src = topInputs.matplotplusplus; };
-  zpp-bits = callPackage ./zpp-bits { src = topInputs.zpp-bits; };
-  eigen = callPackage ./eigen { src = topInputs.eigen; };
-  nameof = callPackage ./nameof { src = topInputs.nameof; };
-  pslist = callPackage ./pslist {};
-  glad = callPackage ./glad {};
-  chromiumos-touch-keyboard = callPackage ./chromiumos-touch-keyboard {};
-  yoga-support = callPackage ./yoga-support {};
-  tgbot-cpp = callPackage ./tgbot-cpp { src = topInputs.tgbot-cpp; };
-  biu = callPackage ./biu { inherit concurrencpp tgbot-cpp nameof; stdenv = gcc13Stdenv; };
-  citation-style-language = callPackage ./citation-style-language { src = topInputs.citation-style-language; };
-  mirism = callPackage ./mirism
+  typora = inputs.pkgs.callPackage ./typora {};
+  vesta = inputs.pkgs.callPackage ./vesta {};
+  rsshub = inputs.pkgs.callPackage ./rsshub { src = inputs.topInputs.rsshub; };
+  misskey = inputs.pkgs.callPackage ./misskey { nodejs = inputs.pkgs.nodejs_21; src = inputs.topInputs.misskey; };
+  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
+    { 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; };
+  citation-style-language = inputs.pkgs.callPackage ./citation-style-language
+    { src = inputs.topInputs.citation-style-language; };
+  mirism = inputs.pkgs.callPackage ./mirism
   {
     inherit cppcoro nameof tgbot-cpp date;
-    nghttp2 = pkgs."nghttp2-23.05".override { enableAsioLib = true; };
+    nghttp2 = inputs.pkgs.callPackage "${inputs.topInputs."nixpkgs-23.05"}/pkgs/development/libraries/nghttp2"
+      { enableAsioLib = true; };
   };
-  cppcoro = callPackage ./cppcoro { src = topInputs.cppcoro; };
-  date = callPackage ./date { src = topInputs.date; };
-  esbonio = python3Packages.callPackage ./esbonio {};
-  pix2tex = python3Packages.callPackage ./pix2tex {};
-  pyreadline3 = python3Packages.callPackage ./pyreadline3 {};
-  torchdata = python3Packages.callPackage ./torchdata {};
-  torchtext = python3Packages.callPackage ./torchtext { inherit torchdata; };
-  win11os-kde = callPackage ./win11os-kde { src = topInputs.win11os-kde; };
-  fluent-kde = callPackage ./fluent-kde { src = topInputs.fluent-kde; };
-  blurred-wallpaper = callPackage ./blurred-wallpaper { src = topInputs.blurred-wallpaper; };
-  slate = callPackage ./slate { src = topInputs.slate; };
-  nvhpc = callPackage ./nvhpc {};
-  lmod = callPackage ./lmod { src = topInputs.lmod; };
-  vasp =
+  cppcoro = inputs.pkgs.callPackage ./cppcoro { src = inputs.topInputs.cppcoro; };
+  date = inputs.pkgs.callPackage ./date { src = inputs.topInputs.date; };
+  esbonio = inputs.pkgs.python3Packages.callPackage ./esbonio {};
+  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; };
+  blurred-wallpaper = inputs.pkgs.callPackage ./blurred-wallpaper { 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; };
+  vasp = rec
   {
-    source = callPackage ./vasp/source.nix {};
-    gnu = callPackage ./vasp/gnu
+    source = inputs.pkgs.callPackage ./vasp/source.nix {};
+    gnu = inputs.pkgs.callPackage ./vasp/gnu
     {
-      inherit (llvmPackages) openmp;
-      wannier90 = callPackage "${topInputs.nixpkgs-unstable}/pkgs/by-name/wa/wannier90/package.nix" {};
-      hdf5 = hdf5.override { mpiSupport = true; fortranSupport = true; };
+      inherit (inputs.pkgs.llvmPackages) openmp;
+      inherit wannier90 additionalCommands;
+      hdf5 = inputs.pkgs.hdf5.override { mpiSupport = true; fortranSupport = true; };
     };
-    nvidia = callPackage ./vasp/nvidia
+    gnu-mkl = inputs.pkgs.callPackage ./vasp/gnu-mkl
     {
-      inherit lmod;
-      nvhpc = nvhpc."24.1";
-      hdf5 = hdf5-nvhpc.override { nvhpc = nvhpc."24.1"; };
-      wannier90 = callPackage "${topInputs.nixpkgs-unstable}/pkgs/by-name/wa/wannier90/package.nix" {};
-    };
-    intel = callPackage ./vasp/intel
-    {
-      inherit lmod;
-      oneapi = oneapi."2022.2";
-      hdf5 = hdf5.override { mpiSupport = true; fortranSupport = true; };
-      inherit (unstablePackages) wannier90;
+      inherit (inputs.pkgs.llvmPackages) openmp;
+      inherit wannier90 additionalCommands;
+      hdf5 = inputs.pkgs.hdf5.override { mpiSupport = true; fortranSupport = true; };
     };
+    nvidia = inputs.pkgs.callPackage ./vasp/nvidia
+      { inherit lmod nvhpc wannier90 additionalCommands vtst; hdf5 = hdf5-nvhpc; };
+    intel = inputs.pkgs.callPackage ./vasp/intel
+      { inherit lmod oneapi wannier90 additionalCommands vtst; hdf5 = hdf5-oneapi; };
+    amd = inputs.pkgs.callPackage ./vasp/amd
+      { inherit aocc aocl wannier90 additionalCommands; hdf5 = hdf5-aocc; openmpi = openmpi-aocc; gcc = gcc-pie; };
+    wannier90 = inputs.pkgs.callPackage
+      "${inputs.topInputs.nixpkgs-unstable}/pkgs/by-name/wa/wannier90/package.nix" {};
+    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; };
+    hdf5-aocc = inputs.pkgs.callPackage ./vasp/hdf5-aocc
+      { inherit (inputs.pkgs.hdf5) src; inherit aocc; openmpi = openmpi-aocc; gcc = gcc-pie; };
+    openmpi-aocc = inputs.pkgs.callPackage ./vasp/openmpi-aocc { inherit aocc; gcc = gcc-pie; };
+    gcc-pie = inputs.pkgs.wrapCC (inputs.pkgs.gcc.cc.overrideAttrs (prev:
+      { configureFlags = prev.configureFlags ++ [ "--enable-default-pie" ];}));
+    additionalCommands = let uid = inputs.config.nixos.user.uid.gb; in
+      ''[ "$(${inputs.pkgs.coreutils}/bin/id -u)" -eq ${builtins.toString uid} ] && exit 1'';
+    vtst = (inputs.pkgs.callPackage ./vasp/vtst.nix {});
+    vtstscripts = inputs.pkgs.callPackage ./vasp/vtstscripts.nix {};
   };
-  hdf5-nvhpc = callPackage ./hdf5-nvhpc { inherit lmod; inherit (hdf5) src; nvhpc = nvhpc."24.1"; };
-  oneapi = callPackage ./oneapi {};
-  mumax = callPackage ./mumax { src = topInputs.mumax; };
+  # TODO: use other people packaged hpc version
+  oneapi = inputs.pkgs.callPackage ./oneapi {};
+  mumax = inputs.pkgs.callPackage ./mumax { src = inputs.topInputs.mumax; };
+  aocc = inputs.pkgs.callPackage ./aocc {};
+  aocl = inputs.pkgs.callPackage ./aocl {};
+  kylin-virtual-keyboard = inputs.pkgs.libsForQt5.callPackage ./kylin-virtual-keyboard
+    { src = inputs.topInputs.kylin-virtual-keyboard; };
+  biu = inputs.pkgs.callPackage ./biu { inherit nameof; };
+
+  fromYaml = content: builtins.fromJSON (builtins.readFile
+    (inputs.pkgs.runCommand "toJSON" {}
+      "${inputs.pkgs.remarshal}/bin/yaml2json ${builtins.toFile "content.yaml" content} $out"));
 }

local/pkgs/kylin-virtual-keyboard/default.nix

@@ -0,0 +1,17 @@
+{
+  stdenv, src, wrapQtAppsHook,
+  qtbase, gsettings-qt, pkg-config, kwindowsystem, fcitx5-qt, qmake, wrapGAppsHook, glib
+}: stdenv.mkDerivation
+{
+  name = "kylin-virtual-keyboard";
+  inherit src;
+  buildInputs = [ qtbase gsettings-qt kwindowsystem fcitx5-qt ];
+  nativeBuildInputs = [ wrapQtAppsHook pkg-config qmake wrapGAppsHook glib ];
+  qmakeFlags = [ "PREFIX=/" ];
+  installFlags = [ "INSTALL_ROOT=$(out)" ];
+  postInstall =
+  ''
+    mv $out/usr/* $out
+    rm -rf $out/usr
+  '';
+}

local/pkgs/nvhpc/default.nix

@@ -1,4 +1,5 @@
 {
+  version ? "24.1",
   stdenvNoCC, fetchurl, buildFHSEnv,
   gfortran, flock
 }:
@@ -17,7 +18,7 @@ let
     targetPkgs = pkgs: with pkgs; [ coreutils ];
     extraBwrapArgs = [ "--bind" "$out" "$out" ];
   };
-in let buildNvhpc = version: stdenvNoCC.mkDerivation
+in stdenvNoCC.mkDerivation
 {
   pname = "nvhpc";
   inherit version;
@@ -38,5 +39,5 @@ in let buildNvhpc = version: stdenvNoCC.mkDerivation
     mkdir -p $out
     ${builder}/bin/builder ./install
   '';
-};
-in builtins.mapAttrs (version: _: buildNvhpc version) versions
+  requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
+}

local/pkgs/oneapi/default.nix

@@ -1,4 +1,5 @@
 {
+  version ? "2024.0",
   stdenvNoCC, fetchurl, buildFHSEnv,
   ncurses
 }:
@@ -56,7 +57,7 @@ let
   };
   componentString = components: if components == null then "--components default" else
     " --components " + (builtins.concatStringsSep ":" components);
-in let buildOneapi = version: stdenvNoCC.mkDerivation rec
+in stdenvNoCC.mkDerivation rec
 {
   pname = "oneapi";
   inherit version;
@@ -84,5 +85,6 @@ in let buildOneapi = version: stdenvNoCC.mkDerivation rec
     ${builder}/bin/builder $out/share/intel/modulefiles-setup.sh --output-dir=$out/share/intel/modulefiles \
       --ignore-latest
   '';
-};
-in builtins.mapAttrs (version: _: buildOneapi version) versions
+  dontFixup = true;
+  requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
+}

local/pkgs/vasp/amd/default.nix

@@ -0,0 +1,75 @@
+{
+  buildFHSEnv, writeScript, stdenvNoCC, requireFile, substituteAll,
+  aocc, rsync, which, hdf5, wannier90, aocl, openmpi, gcc, zlib, glibc, binutils, libpsm2,
+  additionalCommands ? ""
+}:
+let
+  sources = import ../source.nix { inherit requireFile; };
+  buildEnv = buildFHSEnv
+  {
+    name = "buildEnv";
+    targetPkgs = _: [ zlib aocc aocl openmpi gcc.cc gcc.cc.lib glibc.dev binutils.bintools ];
+  };
+  buildScript = writeScript "build"
+  ''
+    mkdir -p bin
+    make DEPS=1 -j$NIX_BUILD_CORES
+  '';
+  include = version: substituteAll
+  {
+    src = ./makefile.include-${version};
+    gccArch = stdenvNoCC.hostPlatform.gcc.arch;
+  };
+  vasp = version: stdenvNoCC.mkDerivation rec
+  {
+    pname = "vasp-amd";
+    inherit version;
+    src = sources.${version};
+    configurePhase =
+    ''
+      cp ${include version} makefile.include
+      cp ${../constr_cell_relax.F} src/constr_cell_relax.F
+    '';
+    buildInputs = [ wannier90 ];
+    nativeBuildInputs = [ rsync which ];
+    AMDBLIS_ROOT = aocl;
+    AMDLIBFLAME_ROOT = aocl;
+    AMDSCALAPACK_ROOT = aocl;
+    AMDFFTW_ROOT = aocl;
+    HDF5_ROOT = hdf5;
+    WANNIER90_ROOT = wannier90;
+    OMPI_CC = "clang";
+    OMPI_CXX = "clang++";
+    OMPI_FC = "flang";
+    buildPhase = "${buildEnv}/bin/buildEnv ${buildScript}";
+    installPhase =
+    ''
+      mkdir -p $out/bin
+      for i in std gam ncl; do cp bin/vasp_$i $out/bin/vasp-$i; done
+    '';
+    dontFixup = true;
+    requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
+  };
+  startScript = version: writeScript "vasp-nvidia-${version}"
+  ''
+    # if OMP_NUM_THREADS is not set, set it according to SLURM_CPUS_PER_TASK or to 1
+    if [ -z "''${OMP_NUM_THREADS-}" ]; then
+      if [ -n "''${SLURM_CPUS_PER_TASK-}" ]; then
+        OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
+      else
+        OMP_NUM_THREADS=1
+      fi
+    fi
+    export OMP_NUM_THREADS
+
+    ${additionalCommands}
+
+    exec "$@"
+  '';
+  runEnv = version: buildFHSEnv
+  {
+    name = "vasp-amd-${builtins.replaceStrings ["."] [""] version}-env";
+    targetPkgs = _: [ zlib (vasp version) aocc aocl openmpi gcc.cc.lib hdf5 wannier90 libpsm2 ];
+    runScript = startScript version;
+  };
+in builtins.mapAttrs (version: _: runEnv version) sources

local/pkgs/vasp/amd/makefile.include-6.3.1

@@ -0,0 +1,91 @@
+# Default precompiler options
+CPP_OPTIONS = -DHOST=\"LinuxGNU\" \
+              -DMPI -DMPI_BLOCK=8000 -Duse_collective \
+              -DscaLAPACK \
+              -DCACHE_SIZE=4000 \
+              -Davoidalloc \
+              -Dvasp6 \
+              -Duse_bse_te \
+              -Dtbdyn \
+              -Dfock_dblbuf \
+              -D_OPENMP -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj
+
+CPP         = flang -E -C -w $*$(FUFFIX) >$*$(SUFFIX) $(CPP_OPTIONS) -ffree-form
+
+FC          = mpif90 -fopenmp
+FCL         = mpif90 -fopenmp
+
+FREE        = -ffree-form -ffree-line-length-none
+
+FFLAGS      = -w -fno-fortran-main -Mbackslash
+
+OFLAG       = -O2
+OFLAG_IN    = $(OFLAG)
+DEBUG       = -O0
+
+OBJECTS     = fftmpiw.o fftmpi_map.o fftw3d.o fft3dlib.o
+OBJECTS_O1 += fftw3d.o fftmpi.o fftmpiw.o
+OBJECTS_O2 += fft3dlib.o
+
+# For what used to be vasp.5.lib
+CPP_LIB     = $(CPP)
+FC_LIB      = $(FC)
+CC_LIB      = clang
+CFLAGS_LIB  = -O
+FFLAGS_LIB  = -O1
+FREE_LIB    = $(FREE)
+
+OBJECTS_LIB = linpack_double.o getshmem.o
+
+# For the parser library
+CXX_PARS    = clang++
+LLIBS       = -lstdc++
+
+##
+## Customize as of this point! Of course you may change the preceding
+## part of this file as well if you like, but it should rarely be
+## necessary ...
+##
+
+# When compiling on the target machine itself, change this to the
+# relevant target when cross-compiling for another architecture
+VASP_TARGET_CPU ?= -march=@gccArch@
+FFLAGS     += $(VASP_TARGET_CPU)
+
+# BLAS (mandatory)
+AMDBLIS_ROOT ?= /path/to/your/amdblis/installation
+BLAS        = -L${AMDBLIS_ROOT}/lib -lblis-mt
+
+# LAPACK (mandatory)
+AMDLIBFLAME_ROOT ?= /path/to/your/amdlibflame/installation
+LAPACK      = -L${AMDLIBFLAME_ROOT}/lib -lflame
+
+# scaLAPACK (mandatory)
+AMDSCALAPACK_ROOT ?= /path/to/your/amdscalapack/installation
+SCALAPACK   = -L${AMDSCALAPACK_ROOT}/lib -lscalapack
+
+LLIBS      += $(SCALAPACK) $(LAPACK) $(BLAS)
+
+# FFTW (mandatory)
+AMDFFTW_ROOT  ?= /path/to/your/amdfftw/installation
+LLIBS      += -L$(AMDFFTW_ROOT)/lib -lfftw3 -lfftw3_omp
+INCS       += -I$(AMDFFTW_ROOT)/include
+
+# HDF5-support (optional but strongly recommended)
+CPP_OPTIONS+= -DVASP_HDF5
+HDF5_ROOT  ?= /path/to/your/hdf5/installation
+LLIBS      += -L$(HDF5_ROOT)/lib -lhdf5_fortran
+INCS       += -I$(HDF5_ROOT)/include
+
+# For the VASP-2-Wannier90 interface (optional)
+CPP_OPTIONS    += -DVASP2WANNIER90
+WANNIER90_ROOT ?= /path/to/your/wannier90/installation
+LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier
+
+# For the fftlib library (recommended)
+CPP_OPTIONS+= -Dsysv
+FCL        += fftlib.o
+CXX_FFTLIB  = clang++ -fopenmp -std=c++11 -DFFTLIB_THREADSAFE
+INCS_FFTLIB = -I./include -I$(AMDFFTW_ROOT)/include
+LIBS       += fftlib
+LLIBS      += -ldl

local/pkgs/vasp/amd/makefile.include-6.4.0

@@ -0,0 +1,91 @@
+# Default precompiler options
+CPP_OPTIONS = -DHOST=\"LinuxGNU\" \
+              -DMPI -DMPI_BLOCK=8000 -Duse_collective \
+              -DscaLAPACK \
+              -DCACHE_SIZE=4000 \
+              -Davoidalloc \
+              -Dvasp6 \
+              -Duse_bse_te \
+              -Dtbdyn \
+              -Dfock_dblbuf \
+              -D_OPENMP -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj
+
+CPP         = flang -E -ffree-form -C -w $*$(FUFFIX) >$*$(SUFFIX) $(CPP_OPTIONS) -ffree-form
+
+FC          = mpif90 -fopenmp
+FCL         = mpif90 -fopenmp
+
+FREE        = -ffree-form -ffree-line-length-none
+
+FFLAGS      = -w -fno-fortran-main -Mbackslash
+
+OFLAG       = -O2
+OFLAG_IN    = $(OFLAG)
+DEBUG       = -O0
+
+OBJECTS     = fftmpiw.o fftmpi_map.o fftw3d.o fft3dlib.o
+OBJECTS_O1 += fftw3d.o fftmpi.o fftmpiw.o
+OBJECTS_O2 += fft3dlib.o
+
+# For what used to be vasp.5.lib
+CPP_LIB     = $(CPP)
+FC_LIB      = $(FC)
+CC_LIB      = clang
+CFLAGS_LIB  = -O
+FFLAGS_LIB  = -O1
+FREE_LIB    = $(FREE)
+
+OBJECTS_LIB = linpack_double.o getshmem.o
+
+# For the parser library
+CXX_PARS    = clang++
+LLIBS       = -lstdc++
+
+##
+## Customize as of this point! Of course you may change the preceding
+## part of this file as well if you like, but it should rarely be
+## necessary ...
+##
+
+# When compiling on the target machine itself, change this to the
+# relevant target when cross-compiling for another architecture
+VASP_TARGET_CPU ?= -march=@gccArch@
+FFLAGS     += $(VASP_TARGET_CPU)
+
+# BLAS (mandatory)
+AMDBLIS_ROOT ?= /path/to/your/amdblis/installation
+BLAS        = -L${AMDBLIS_ROOT}/lib -lblis-mt
+
+# LAPACK (mandatory)
+AMDLIBFLAME_ROOT ?= /path/to/your/amdlibflame/installation
+LAPACK      = -L${AMDLIBFLAME_ROOT}/lib -lflame
+
+# scaLAPACK (mandatory)
+AMDSCALAPACK_ROOT ?= /path/to/your/amdscalapack/installation
+SCALAPACK   = -L${AMDSCALAPACK_ROOT}/lib -lscalapack
+
+LLIBS      += $(SCALAPACK) $(LAPACK) $(BLAS)
+
+# FFTW (mandatory)
+AMDFFTW_ROOT  ?= /path/to/your/amdfftw/installation
+LLIBS      += -L$(AMDFFTW_ROOT)/lib -lfftw3 -lfftw3_omp
+INCS       += -I$(AMDFFTW_ROOT)/include
+
+# HDF5-support (optional but strongly recommended)
+CPP_OPTIONS+= -DVASP_HDF5
+HDF5_ROOT  ?= /path/to/your/hdf5/installation
+LLIBS      += -L$(HDF5_ROOT)/lib -lhdf5_fortran
+INCS       += -I$(HDF5_ROOT)/include
+
+# For the VASP-2-Wannier90 interface (optional)
+CPP_OPTIONS    += -DVASP2WANNIER90
+WANNIER90_ROOT ?= /path/to/your/wannier90/installation
+LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier
+
+# For the fftlib library (recommended)
+CPP_OPTIONS+= -Dsysv
+FCL        += fftlib.o
+CXX_FFTLIB  = clang++ -fopenmp -std=c++11 -DFFTLIB_THREADSAFE
+INCS_FFTLIB = -I./include -I$(AMDFFTW_ROOT)/include
+LIBS       += fftlib
+LLIBS      += -ldl

local/pkgs/vasp/gnu-mkl/default.nix

@@ -0,0 +1,57 @@
+{
+  stdenvNoCC, requireFile, writeShellApplication,
+  rsync, mkl, mpi, openmp, gfortran, gcc, fftwMpi, hdf5, wannier90,
+  additionalCommands ? ""
+}:
+let
+  sources = import ../source.nix { inherit requireFile; };
+  include = version: ./makefile.include-${version};
+  vasp = version: stdenvNoCC.mkDerivation rec
+  {
+    pname = "vasp-gnu-mkl";
+    inherit version;
+    src = sources.${version};
+    configurePhase =
+    ''
+      cp ${include version} makefile.include
+      cp ${../constr_cell_relax.F} src/constr_cell_relax.F
+      mkdir -p bin
+    '';
+    enableParallelBuilding = true;
+    makeFlags = "DEPS=1";
+    buildInputs = [ mkl mpi openmp fftwMpi.dev fftwMpi hdf5 hdf5.dev wannier90 ];
+    nativeBuildInputs = [ rsync gfortran gfortran.cc gcc ];
+    FFTW_ROOT = fftwMpi.dev;
+    HDF5_ROOT = hdf5.dev;
+    WANNIER90_ROOT = wannier90;
+    MKLROOT = mkl;
+    installPhase =
+    ''
+      mkdir -p $out/bin
+      for i in std gam ncl; do
+        cp bin/vasp_$i $out/bin/vasp-$i
+      done
+    '';
+  };
+  startScript = version: writeShellApplication
+  {
+    name = "vasp-gnu-${builtins.replaceStrings ["."] [""] version}-env";
+    runtimeInputs = [(vasp version)];
+    text =
+    ''
+      # if OMP_NUM_THREADS is not set, set it according to SLURM_CPUS_PER_TASK or to 1
+      if [ -z "''${OMP_NUM_THREADS-}" ]; then
+        if [ -n "''${SLURM_CPUS_PER_TASK-}" ]; then
+          OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
+        else
+          OMP_NUM_THREADS=1
+        fi
+      fi
+      export OMP_NUM_THREADS
+
+      ${additionalCommands}
+
+      exec "$@"
+    '';
+  };
+in builtins.mapAttrs (version: _: startScript version) sources

local/pkgs/vasp/gnu-mkl/makefile.include-6.3.1

@@ -0,0 +1,87 @@
+# Default precompiler options
+CPP_OPTIONS = -DHOST=\"LinuxGNU\" \
+              -DMPI -DMPI_BLOCK=8000 -Duse_collective \
+              -DscaLAPACK \
+              -DCACHE_SIZE=4000 \
+              -Davoidalloc \
+              -Dvasp6 \
+              -Duse_bse_te \
+              -Dtbdyn \
+              -Dfock_dblbuf \
+              -D_OPENMP -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj
+
+CPP         = gcc -E -C -w $*$(FUFFIX) >$*$(SUFFIX) $(CPP_OPTIONS)
+
+FC          = mpif90 -fopenmp
+FCL         = mpif90 -fopenmp
+
+FREE        = -ffree-form -ffree-line-length-none
+
+FFLAGS      = -w -ffpe-summary=none
+
+OFLAG       = -O2
+OFLAG_IN    = $(OFLAG)
+DEBUG       = -O0
+
+OBJECTS     = fftmpiw.o fftmpi_map.o fftw3d.o fft3dlib.o
+OBJECTS_O1 += fftw3d.o fftmpi.o fftmpiw.o
+OBJECTS_O2 += fft3dlib.o
+
+# For what used to be vasp.5.lib
+CPP_LIB     = $(CPP)
+FC_LIB      = $(FC)
+CC_LIB      = gcc
+CFLAGS_LIB  = -O
+FFLAGS_LIB  = -O1
+FREE_LIB    = $(FREE)
+
+OBJECTS_LIB = linpack_double.o getshmem.o
+
+# For the parser library
+CXX_PARS    = g++
+LLIBS       = -lstdc++
+
+##
+## Customize as of this point! Of course you may change the preceding
+## part of this file as well if you like, but it should rarely be
+## necessary ...
+##
+
+# When compiling on the target machine itself, change this to the
+# relevant target when cross-compiling for another architecture
+# VASP_TARGET_CPU ?= -march=native
+# FFLAGS     += $(VASP_TARGET_CPU)
+
+# For gcc-10 and higher (comment out for older versions)
+FFLAGS     += -fallow-argument-mismatch
+
+# Intel MKL for FFTW, BLAS, LAPACK, and scaLAPACK
+MKLROOT   ?= /path/to/your/mkl/installation
+LLIBS_MKL  = -L$(MKLROOT)/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_scalapack_lp64 -lmkl_blacs_openmpi_lp64 -lgomp -lpthread -lm -ldl
+INCS       = -I$(MKLROOT)/include/fftw
+
+# Use a separate scaLAPACK installation (optional but recommended in combination with OpenMPI)
+# Comment out the two lines below if you want to use scaLAPACK from MKL instead
+#SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
+#LLIBS_MKL  = -L$(SCALAPACK_ROOT)/lib -lscalapack -L$(MKLROOT)/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
+
+LLIBS      += $(LLIBS_MKL)
+
+# HDF5-support (optional but strongly recommended)
+CPP_OPTIONS+= -DVASP_HDF5
+HDF5_ROOT  ?= /path/to/your/hdf5/installation
+LLIBS      += -L$(HDF5_ROOT)/lib -lhdf5_fortran
+INCS       += -I$(HDF5_ROOT)/include
+
+# For the VASP-2-Wannier90 interface (optional)
+CPP_OPTIONS    += -DVASP2WANNIER90
+WANNIER90_ROOT ?= /path/to/your/wannier90/installation
+LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier
+
+# For the fftlib library (hardly any benefit in combination with MKL's FFTs)
+#CPP_OPTIONS+= -Dsysv
+#FCL        += fftlib.o
+#CXX_FFTLIB  = g++ -fopenmp -std=c++11 -DFFTLIB_USE_MKL -DFFTLIB_THREADSAFE
+#INCS_FFTLIB = -I./include -I$(MKLROOT)/include/fftw
+#LIBS       += fftlib
+#LLIBS      += -ldl

local/pkgs/vasp/gnu-mkl/makefile.include-6.4.0

@@ -0,0 +1,87 @@
+# Default precompiler options
+CPP_OPTIONS = -DHOST=\"LinuxGNU\" \
+              -DMPI -DMPI_BLOCK=8000 -Duse_collective \
+              -DscaLAPACK \
+              -DCACHE_SIZE=4000 \
+              -Davoidalloc \
+              -Dvasp6 \
+              -Duse_bse_te \
+              -Dtbdyn \
+              -Dfock_dblbuf \
+              -D_OPENMP -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj
+
+CPP         = gcc -E -C -w $*$(FUFFIX) >$*$(SUFFIX) $(CPP_OPTIONS)
+
+FC          = mpif90 -fopenmp
+FCL         = mpif90 -fopenmp
+
+FREE        = -ffree-form -ffree-line-length-none
+
+FFLAGS      = -w -ffpe-summary=none
+
+OFLAG       = -O3
+OFLAG_IN    = $(OFLAG)
+DEBUG       = -O0
+
+OBJECTS     = fftmpiw.o fftmpi_map.o fftw3d.o fft3dlib.o
+OBJECTS_O1 += fftw3d.o fftmpi.o fftmpiw.o
+OBJECTS_O2 += fft3dlib.o
+
+# For what used to be vasp.5.lib
+CPP_LIB     = $(CPP)
+FC_LIB      = $(FC)
+CC_LIB      = gcc
+CFLAGS_LIB  = -O
+FFLAGS_LIB  = -O1
+FREE_LIB    = $(FREE)
+
+OBJECTS_LIB = linpack_double.o getshmem.o
+
+# For the parser library
+CXX_PARS    = g++
+LLIBS       = -lstdc++
+
+##
+## Customize as of this point! Of course you may change the preceding
+## part of this file as well if you like, but it should rarely be
+## necessary ...
+##
+
+# When compiling on the target machine itself, change this to the
+# relevant target when cross-compiling for another architecture
+# VASP_TARGET_CPU ?= -march=native
+# FFLAGS     += $(VASP_TARGET_CPU)
+
+# For gcc-10 and higher (comment out for older versions)
+FFLAGS     += -fallow-argument-mismatch
+
+# Intel MKL for FFTW, BLAS, LAPACK, and scaLAPACK
+MKLROOT   ?= /path/to/your/mkl/installation
+LLIBS_MKL  = -L$(MKLROOT)/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_scalapack_lp64 -lmkl_blacs_openmpi_lp64 -lgomp -lpthread -lm -ldl
+INCS       = -I$(MKLROOT)/include/fftw
+
+# Use a separate scaLAPACK installation (optional but recommended in combination with OpenMPI)
+# Comment out the two lines below if you want to use scaLAPACK from MKL instead
+#SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
+#LLIBS_MKL  = -L$(SCALAPACK_ROOT)/lib -lscalapack -L$(MKLROOT)/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
+
+LLIBS      += $(LLIBS_MKL)
+
+# HDF5-support (optional but strongly recommended)
+CPP_OPTIONS+= -DVASP_HDF5
+HDF5_ROOT  ?= /path/to/your/hdf5/installation
+LLIBS      += -L$(HDF5_ROOT)/lib -lhdf5_fortran
+INCS       += -I$(HDF5_ROOT)/include
+
+# For the VASP-2-Wannier90 interface (optional)
+CPP_OPTIONS    += -DVASP2WANNIER90
+WANNIER90_ROOT ?= /path/to/your/wannier90/installation
+LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier
+
+# For the fftlib library (hardly any benefit in combination with MKL's FFTs)
+#CPP_OPTIONS+= -Dsysv
+#FCL        += fftlib.o
+#CXX_FFTLIB  = g++ -fopenmp -std=c++11 -DFFTLIB_USE_MKL -DFFTLIB_THREADSAFE
+#INCS_FFTLIB = -I./include -I$(MKLROOT)/include/fftw
+#LIBS       += fftlib
+#LLIBS      += -ldl

local/pkgs/vasp/gnu/default.nix

@@ -1,6 +1,7 @@
 {
-  stdenvNoCC, requireFile, writeShellApplication, substituteAll,
-  rsync, blas, scalapack, mpi, openmp, gfortran, gcc, fftwMpi, hdf5, wannier90
+  stdenvNoCC, requireFile, writeShellApplication,
+  rsync, blas, scalapack, mpi, openmp, gfortran, gcc, fftwMpi, hdf5, wannier90,
+  additionalCommands ? ""
 }:
 let
   sources = import ../source.nix { inherit requireFile; };
@@ -33,14 +34,22 @@ let
   };
   startScript = version: writeShellApplication
   {
-    name = "vasp-gnu-${version}";
-    runtimeInputs = [ (vasp version) ];
+    name = "vasp-gnu-${builtins.replaceStrings ["."] [""] version}-env";
+    runtimeInputs = [(vasp version)];
     text =
     ''
-      if [ -n "''${SLURM_CPUS_PER_TASK-}" ] && [ -n "''${SLURM_THREADS_PER_CPU-}" ]; then
-        export OMP_NUM_THREADS=$(( SLURM_CPUS_PER_TASK * SLURM_THREADS_PER_CPU ))
+      # if OMP_NUM_THREADS is not set, set it according to SLURM_CPUS_PER_TASK or to 1
+      if [ -z "''${OMP_NUM_THREADS-}" ]; then
+        if [ -n "''${SLURM_CPUS_PER_TASK-}" ]; then
+          OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
+        else
+          OMP_NUM_THREADS=1
+        fi
       fi
-      export PATH=$PATH:$PWD
+      export OMP_NUM_THREADS
+
+      ${additionalCommands}
+
       exec "$@"
     '';
   };

local/pkgs/vasp/gnu/makefile.include-6.3.1

@@ -84,9 +84,9 @@ WANNIER90_ROOT ?= /path/to/your/wannier90/installation
 LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier
 
 # For the fftlib library (recommended)
-#CPP_OPTIONS+= -Dsysv
-#FCL        += fftlib.o
-#CXX_FFTLIB  = g++ -fopenmp -std=c++11 -DFFTLIB_THREADSAFE
-#INCS_FFTLIB = -I./include -I$(FFTW_ROOT)/include
-#LIBS       += fftlib
-#LLIBS      += -ldl
+CPP_OPTIONS+= -Dsysv
+FCL        += fftlib.o
+CXX_FFTLIB  = g++ -fopenmp -std=c++11 -DFFTLIB_THREADSAFE
+INCS_FFTLIB = -I./include -I$(FFTW_ROOT)/include
+LIBS       += fftlib
+LLIBS      += -ldl

local/pkgs/vasp/gnu/makefile.include-6.4.0

@@ -87,7 +87,6 @@ LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier
 CPP_OPTIONS+= -Dsysv
 FCL        += fftlib.o
 CXX_FFTLIB  = g++ -fopenmp -std=c++11 -DFFTLIB_THREADSAFE
-# INCS_FFTLIB = -I./include -I$(FFTW_ROOT)/include
-INCS_FFTLIB = -I./include
+INCS_FFTLIB = -I./include -I$(FFTW_ROOT)/include
 LIBS       += fftlib
 LLIBS      += -ldl

local/pkgs/vasp/hdf5-aocc/default.nix

@@ -0,0 +1,46 @@
+{
+  buildFHSEnv, writeScript, stdenvNoCC,
+  src,
+  aocc, cmake, openmpi, zlib, gcc, glibc, binutils, pkg-config
+}:
+let
+  buildEnv = buildFHSEnv
+  {
+    name = "buildEnv";
+    targetPkgs = _: [ zlib aocc gcc.cc.lib.lib glibc.dev binutils.bintools openmpi pkg-config ];
+    extraBwrapArgs = [ "--bind" "$out" "$out" ];
+  };
+  buildScript = writeScript "build"
+  ''
+    mkdir build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX=$out -DHDF5_INSTALL_CMAKE_DIR=$out/lib/cmake \
+      -DHDF5_BUILD_FORTRAN=ON -DHDF5_ENABLE_PARALLEL=ON ..
+    make -j$NIX_BUILD_CORES
+    make install
+  '';
+in stdenvNoCC.mkDerivation
+{
+  name = "hdf5-aocc";
+  inherit src;
+  dontConfigure = true;
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
+  CC = "clang";
+  CXX = "clang++";
+  FC = "flang";
+  OMPI_CC = "clang";
+  OMPI_CXX = "clang++";
+  OMPI_FC = "flang";
+  CFLAGS = "-march=${stdenvNoCC.hostPlatform.gcc.arch} -O2";
+  CXXFLAGS = "-march=${stdenvNoCC.hostPlatform.gcc.arch} -O2";
+  FCFLAGS = "-march=${stdenvNoCC.hostPlatform.gcc.arch} -O2";
+  buildPhase =
+  ''
+    mkdir -p $out
+    ${buildEnv}/bin/buildEnv ${buildScript}
+  '';
+  dontInstall = true;
+  dontFixup = true;
+  requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
+}

local/pkgs/vasp/hdf5-nvhpc/default.nix

@@ -1,8 +1,7 @@
 {
   buildFHSEnv, writeScript, stdenvNoCC,
   src,
-  nvhpc, lmod, cmake, gfortran,
-  config, nvhpcArch ? config.nvhpcArch or "px"
+  nvhpc, lmod, cmake, gfortran
 }:
 let
   buildEnv = buildFHSEnv
@@ -36,5 +35,6 @@ in stdenvNoCC.mkDerivation
     ${buildEnv}/bin/buildEnv ${buildScript}
   '';
   dontInstall = true;
-  requiredSystemFeatures = [ "nvhpcarch-${nvhpcArch}" ];
+  dontFixup = true;
+  requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
 }

local/pkgs/vasp/hdf5-oneapi/default.nix

@@ -0,0 +1,48 @@
+{
+  buildFHSEnv, writeScript, stdenvNoCC, symlinkJoin,
+  src,
+  oneapi, lmod, cmake, gcc, glibc, binutils,
+  config, oneapiArch ? config.oneapiArch or "SSE3"
+}:
+let
+  gccFull = symlinkJoin { name = "gcc"; paths = [ gcc gcc.cc gcc.cc.lib glibc.dev binutils.bintools ]; };
+  buildEnv = buildFHSEnv
+  {
+    name = "buildEnv";
+    targetPkgs = pkgs: with pkgs; [ zlib (writeTextDir "etc/release" "") gccFull ];
+    extraBwrapArgs = [ "--bind" "$out" "$out" ];
+  };
+  buildScript = writeScript "build"
+  ''
+    . ${lmod}/share/lmod/lmod/init/bash
+    module use ${oneapi}/share/intel/modulefiles
+    module load tbb compiler-rt oclfpga # dependencies
+    module load mpi mkl compiler
+    mkdir build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX=$out -DHDF5_INSTALL_CMAKE_DIR=$out/lib/cmake \
+      -DHDF5_BUILD_FORTRAN=ON -DHDF5_ENABLE_PARALLEL=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=OFF \
+      -DBUILD_TESTING=OFF ..
+    make -j$NIX_BUILD_CORES
+    make install
+  '';
+in stdenvNoCC.mkDerivation
+{
+  name = "hdf5-oneapi";
+  inherit src;
+  dontConfigure = true;
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
+  I_MPI_CC = "icx";
+  I_MPI_CXX = "icpx";
+  I_MPI_FC = "ifx";
+  I_MPI_F90 = "ifx";
+  buildPhase =
+  ''
+    mkdir -p $out
+    ${buildEnv}/bin/buildEnv ${buildScript}
+  '';
+  dontInstall = true;
+  dontFixup = true;
+  requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
+}

local/pkgs/vasp/intel/default.nix

@@ -1,15 +1,15 @@
 {
-  buildFHSEnv, writeScript, stdenvNoCC, requireFile, substituteAll, symlinkJoin,
-  config, oneapiArch ? config.oneapiArch or "SSE3",
-  oneapi, gfortran, gcc, glibc, lmod, rsync, which, hdf5, wannier90
+  buildFHSEnv, writeScript, stdenvNoCC, requireFile, substituteAll, symlinkJoin, writeTextDir,
+  config, oneapiArch ? config.oneapiArch or "SSE3", additionalCommands ? "",
+  oneapi, gcc, glibc, lmod, rsync, which, wannier90, binutils, hdf5, zlib, vtst
 }:
 let
-  versions = import ../source.nix;
+  sources = import ../source.nix { inherit requireFile; };
   buildEnv = buildFHSEnv
   {
     name = "buildEnv";
     # make "module load mpi" success
-    targetPkgs = pkgs: with pkgs; [ zlib (writeTextDir "etc/release" "") ];
+    targetPkgs = _: [ zlib (writeTextDir "etc/release" "") gccFull ];
   };
   buildScript = writeScript "build"
   ''
@@ -18,34 +18,30 @@ let
     module load tbb compiler-rt oclfpga # dependencies
     module load mpi mkl compiler
     mkdir -p bin
-    make DEPS=1 -j$NIX_BUILD_CORES std
+    make DEPS=1 -j$NIX_BUILD_CORES
   '';
   include = version: substituteAll
   {
     src = ./makefile.include-${version};
     inherit oneapiArch;
-    gcc = symlinkJoin { name = "gcc"; paths = [ gfortran gfortran.cc gcc ]; };
   };
+  gccFull = symlinkJoin { name = "gcc"; paths = [ gcc gcc.cc gcc.cc.lib glibc.dev binutils.bintools ]; };
   vasp = version: stdenvNoCC.mkDerivation rec
   {
-    pname = "vasp";
+    pname = "vasp-intel";
     inherit version;
-    src = requireFile
-    {
-      name = "${pname}-${version}";
-      sha256 = versions.${version};
-      hashMode = "recursive";
-      message = "Source file not found.";
-    };
+    src = sources.${version};
+    patches = [ ../vtst.patch ];
     configurePhase =
     ''
       cp ${include version} makefile.include
+      chmod +w makefile.include
       cp ${../constr_cell_relax.F} src/constr_cell_relax.F
+      cp -r ${vtst version}/* src
+      chmod -R +w src
     '';
-    enableParallelBuilding = false;
-    buildInputs = [ hdf5 hdf5.dev wannier90 glibc glibc.dev ];
-    nativeBuildInputs = [ gfortran gfortran.cc gcc rsync which ];
-    HDF5_ROOT = hdf5.dev;
+    nativeBuildInputs = [ rsync which ];
+    HDF5_ROOT = hdf5;
     WANNIER90_ROOT = wannier90;
     buildPhase = "${buildEnv}/bin/buildEnv ${buildScript}";
     installPhase =
@@ -53,19 +49,67 @@ let
       mkdir -p $out/bin
       for i in std gam ncl; do cp bin/vasp_$i $out/bin/vasp-$i; done
     '';
+    dontFixup = true;
+    requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
   };
-  startScript = version: writeScript "vasp-intel-${version}"
+  startScript = { version, variant }: writeScript "vasp-intel-${version}"
   ''
     . ${lmod}/share/lmod/lmod/init/bash
     module use ${oneapi}/share/intel/modulefiles
     module load tbb compiler-rt oclfpga # dependencies
     module load mpi mkl compiler
-    exec "$@"
+
+    # if OMP_NUM_THREADS is not set, set it according to SLURM_CPUS_PER_TASK or to 1
+    if [ -z "''${OMP_NUM_THREADS-}" ]; then
+      if [ -n "''${SLURM_CPUS_PER_TASK-}" ]; then
+        OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
+      else
+        OMP_NUM_THREADS=1
+      fi
+    fi
+    export OMP_NUM_THREADS
+
+    # if I_MPI_PIN_PROCESSOR_LIST is not set, set it to allcores
+    if [ -z "''${I_MPI_PIN_PROCESSOR_LIST-}" ]; then
+      I_MPI_PIN_PROCESSOR_LIST=allcores
+    fi
+    export I_MPI_PIN_PROCESSOR_LIST
+
+    # set I_MPI_PIN I_MPI_PIN_DOMAIN I_MPI_DEBUG if not set
+    export I_MPI_PIN=''${I_MPI_PIN-yes}
+    export I_MPI_PIN_DOMAIN=''${I_MPI_PIN_DOMAIN-omp}
+    export I_MPI_DEBUG=''${I_MPI_DEBUG-4}
+
+    # fork to bootstrap, do not use srun, causing it could not find proper ld
+    export I_MPI_HYDRA_BOOTSTRAP=''${I_MPI_HYDRA_BOOTSTRAP-fork}
+
+    # set OMP_STACKSIZE if not set
+    export OMP_STACKSIZE=''${OMP_STACKSIZE-512M}
+
+    ${additionalCommands}
+
+    ${
+      if variant == "env" then ''exec "$@"''
+      else
+      ''
+        if [ -n "''${SLURM_JOB_ID-}" ]; then
+          exec mpirun -n $SLURM_NTASKS ${vasp version}/bin/vasp-${variant}
+        else
+          exec mpirun -n 1 ${vasp version}/bin/vasp-${variant}
+        fi
+      ''
+    }
   '';
-  runEnv = version: buildFHSEnv
+  runEnv = { version, variant }: let shortVersion = builtins.replaceStrings ["."] [""] version; in buildFHSEnv
+  {
+    name = "vasp-intel-${shortVersion}${if variant == "" then "" else "-${variant}"}";
+    targetPkgs = _: [ zlib (vasp version) (writeTextDir "etc/release" "") gccFull ];
+    runScript = startScript { inherit version; variant = if variant == "" then "std" else variant; };
+  };
+in builtins.mapAttrs
+  (version: _: symlinkJoin
   {
     name = "vasp-intel-${version}";
-    targetPkgs = pkgs: with pkgs; [ zlib (vasp version) (writeTextDir "etc/release" "") ];
-    runScript = startScript version;
-  };
-in builtins.mapAttrs (version: _: runEnv version) versions
+    paths = builtins.map (variant: runEnv { inherit version variant; }) [ "" "env" "std" "gam" "ncl" ];
+  })
+  sources

local/pkgs/vasp/intel/makefile.include-6.3.1

@@ -12,8 +12,8 @@ CPP_OPTIONS = -DHOST=\"LinuxIFC\" \
 
 CPP         = fpp -f_com=no -free -w0  $*$(FUFFIX) $*$(SUFFIX) $(CPP_OPTIONS)
 
-FC          = I_MPI_FC=ifort mpif90 -qopenmp
-FCL         = I_MPI_FC=ifort mpif90
+FC          = mpiifx -qopenmp
+FCL         = mpiifx
 
 FREE        = -free -names lowercase
 
@@ -30,7 +30,7 @@ OBJECTS_O2 += fft3dlib.o
 # For what used to be vasp.5.lib
 CPP_LIB     = $(CPP)
 FC_LIB      = $(FC)
-CC_LIB      = icc
+CC_LIB      = icx
 CFLAGS_LIB  = -O
 FFLAGS_LIB  = -O1
 FREE_LIB    = $(FREE)
@@ -38,7 +38,7 @@ FREE_LIB    = $(FREE)
 OBJECTS_LIB = linpack_double.o getshmem.o
 
 # For the parser library
-CXX_PARS    = icpc
+CXX_PARS    = icpx
 LLIBS       = -lstdc++
 
 ##
@@ -56,12 +56,13 @@ FFLAGS     += $(VASP_TARGET_CPU)
 # (Note: for Intel Parallel Studio's MKL use -mkl instead of -qmkl)
 FCL        += -qmkl
 MKLROOT    ?= /path/to/your/mkl/installation
+LLIBS      += -L$(MKLROOT)/lib/intel64 -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
 INCS        =-I$(MKLROOT)/include/fftw
 
 # Use a separate scaLAPACK installation (optional but recommended in combination with OpenMPI)
 # Comment out the two lines below if you want to use scaLAPACK from MKL instead
-#SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
-#LLIBS      += -L${SCALAPACK_ROOT}/lib -lscalapack
+# SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
+# LLIBS      += -L${SCALAPACK_ROOT}/lib -lscalapack
 
 # HDF5-support (optional but strongly recommended)
 CPP_OPTIONS+= -DVASP_HDF5

local/pkgs/vasp/intel/makefile.include-6.4.0

@@ -12,8 +12,8 @@ CPP_OPTIONS = -DHOST=\"LinuxIFC\" \
 
 CPP         = fpp -f_com=no -free -w0  $*$(FUFFIX) $*$(SUFFIX) $(CPP_OPTIONS)
 
-FC          = I_MPI_F90=ifort mpif90 -qopenmp
-FCL         = I_MPI_F90=ifort mpif90
+FC          = mpiifx -qopenmp
+FCL         = mpiifx
 
 FREE        = -free -names lowercase
 
@@ -30,7 +30,7 @@ OBJECTS_O2 += fft3dlib.o
 # For what used to be vasp.5.lib
 CPP_LIB     = $(CPP)
 FC_LIB      = $(FC)
-CC_LIB      = icc
+CC_LIB      = icx
 CFLAGS_LIB  = -O
 FFLAGS_LIB  = -O1
 FREE_LIB    = $(FREE)
@@ -38,7 +38,7 @@ FREE_LIB    = $(FREE)
 OBJECTS_LIB = linpack_double.o getshmem.o
 
 # For the parser library
-CXX_PARS    = icpc
+CXX_PARS    = icpx
 LLIBS       = -lstdc++
 
 ##
@@ -56,12 +56,13 @@ FFLAGS     += $(VASP_TARGET_CPU)
 # (Note: for Intel Parallel Studio's MKL use -mkl instead of -qmkl)
 FCL        += -qmkl
 MKLROOT    ?= /path/to/your/mkl/installation
+LLIBS      += -L$(MKLROOT)/lib/intel64 -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
 INCS        =-I$(MKLROOT)/include/fftw
 
 # Use a separate scaLAPACK installation (optional but recommended in combination with OpenMPI)
 # Comment out the two lines below if you want to use scaLAPACK from MKL instead
-#SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
-#LLIBS      += -L${SCALAPACK_ROOT}/lib -lscalapack
+# SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
+# LLIBS      += -L${SCALAPACK_ROOT}/lib -lscalapack
 
 # HDF5-support (optional but strongly recommended)
 CPP_OPTIONS+= -DVASP_HDF5

local/pkgs/vasp/nvidia/default.nix

@@ -1,14 +1,14 @@
 {
-  buildFHSEnv, writeScript, stdenvNoCC, requireFile, substituteAll,
-  config, cudaCapabilities ? config.cudaCapabilities, nvhpcArch ? config.nvhpcArch or "px",
-  nvhpc, lmod, mkl, gfortran, rsync, which, hdf5, wannier90
+  buildFHSEnv, writeScript, stdenvNoCC, requireFile, substituteAll, symlinkJoin,
+  config, cudaCapabilities ? config.cudaCapabilities, nvhpcArch ? config.nvhpcArch or "px", additionalCommands ? "",
+  nvhpc, lmod, mkl, gfortran, rsync, which, hdf5, wannier90, zlib, vtst
 }:
 let
   sources = import ../source.nix { inherit requireFile; };
   buildEnv = buildFHSEnv
   {
     name = "buildEnv";
-    targetPkgs = pkgs: with pkgs; [ zlib ];
+    targetPkgs = _: [ zlib ];
   };
   buildScript = writeScript "build"
   ''
@@ -31,16 +31,20 @@ let
     pname = "vasp-nvidia";
     inherit version;
     src = sources.${version};
+    patches = [ ../vtst.patch ];
     configurePhase =
     ''
       cp ${include version} makefile.include
+      chmod +w makefile.include
       cp ${../constr_cell_relax.F} src/constr_cell_relax.F
+      cp -r ${vtst version}/* src
+      chmod -R +w src
     '';
     enableParallelBuilding = true;
     buildInputs = [ mkl hdf5 wannier90 ];
     nativeBuildInputs = [ gfortran rsync which ];
-    MKLROOT = "${mkl}";
-    HDF5_ROOT = "${hdf5}";
+    MKLROOT = mkl;
+    HDF5_ROOT = hdf5;
     WANNIER90_ROOT = wannier90;
     buildPhase = "${buildEnv}/bin/buildEnv ${buildScript}";
     installPhase =
@@ -48,24 +52,49 @@ let
       mkdir -p $out/bin
       for i in std gam ncl; do cp bin/vasp_$i $out/bin/vasp-$i; done
     '';
-    requiredSystemFeatures = [ "nvhpcarch-${nvhpcArch}" ];
+    dontFixup = true;
+    requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
   };
-  startScript = version: writeScript "vasp-nvidia-${version}"
+  startScript = { version, variant }: writeScript "vasp-nvidia-${version}"
   ''
     . ${lmod}/share/lmod/lmod/init/bash
     module use ${nvhpc}/share/nvhpc/modulefiles
     module load nvhpc
 
-    # if SLURM_CPUS_PER_TASK and SLURM_THREADS_PER_CPU are set, use them to set OMP_NUM_THREADS
-    if [ -n "''${SLURM_CPUS_PER_TASK-}" ] && [ -n "''${SLURM_THREADS_PER_CPU-}" ]; then
-      export OMP_NUM_THREADS=$(( SLURM_CPUS_PER_TASK * SLURM_THREADS_PER_CPU ))
+    # if OMP_NUM_THREADS is not set, set it according to SLURM_CPUS_PER_TASK or to 1
+    if [ -z "''${OMP_NUM_THREADS-}" ]; then
+      if [ -n "''${SLURM_CPUS_PER_TASK-}" ]; then
+        OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
+      else
+        OMP_NUM_THREADS=1
+      fi
     fi
-    exec "$@"
+    export OMP_NUM_THREADS
+
+    ${additionalCommands}
+
+    ${
+      if variant == "env" then ''exec "$@"''
+      else
+      ''
+        if [ -n "''${SLURM_JOB_ID-}" ]; then
+          exec mpirun --bind-to none ${vasp version}/bin/vasp-${variant}
+        else
+          exec mpirun -np 1 ${vasp version}/bin/vasp-${variant}
+        fi
+      ''
+    }
   '';
-  runEnv = version: buildFHSEnv
+  runEnv = { version, variant }: let shortVersion = builtins.replaceStrings ["."] [""] version; in buildFHSEnv
+  {
+    name = "vasp-nvidia-${shortVersion}${if variant == "" then "" else "-${variant}"}";
+    targetPkgs = _: [ zlib (vasp version) ];
+    runScript = startScript { inherit version; variant = if variant == "" then "std" else variant; };
+  };
+in builtins.mapAttrs
+  (version: _: symlinkJoin
   {
     name = "vasp-nvidia-${version}";
-    targetPkgs = pkgs: with pkgs; [ zlib (vasp version) ];
-    runScript = startScript version;
-  };
-in builtins.mapAttrs (version: _: runEnv version) sources
+    paths = builtins.map (variant: runEnv { inherit version variant; }) [ "" "env" "std" "gam" "ncl" ];
+  })
+  sources

local/pkgs/vasp/openmpi-aocc/default.nix

@@ -0,0 +1,45 @@
+{
+  lib, buildFHSEnv, writeScript, stdenvNoCC,
+  openmpi, 
+  aocc, cmake, libnl, pmix, libpsm2, libfabric, zlib, numactl, ucx, ucc, libevent, hwloc, rdma-core, perl, glibc, binutils, gcc
+}:
+let
+  buildEnv = buildFHSEnv
+  {
+    name = "buildEnv";
+    targetPkgs = _: [ zlib aocc gcc.cc.lib.lib glibc.dev binutils.bintools libnl numactl ucx ucc libevent hwloc rdma-core libpsm2 libfabric perl ];
+    extraBwrapArgs = [ "--bind" "$out" "$out" ];
+  };
+  buildScript = writeScript "build"
+  ''
+    ./configure --prefix=$out --disable-mca-dso
+    make -j$NIX_BUILD_CORES
+    make install
+  '';
+in stdenvNoCC.mkDerivation
+{
+  name = "openmpi-aocc";
+  inherit (openmpi) src postPatch;
+  dontConfigure = true;
+  CC = "clang";
+  CXX = "clang++";
+  FC = "flang";
+  OMPI_CC = "clang";
+  OMPI_CXX = "clang++";
+  OMPI_FC = "flang";
+  CFLAGS = "-march=${stdenvNoCC.hostPlatform.gcc.arch} -O2";
+  CXXFLAGS = "-march=${stdenvNoCC.hostPlatform.gcc.arch} -O2";
+  FCFLAGS = "-march=${stdenvNoCC.hostPlatform.gcc.arch} -O2";
+  enableParallelBuilding = true;
+  buildPhase =
+  ''
+    runHook preBuild
+    mkdir -p $out
+    ${buildEnv}/bin/buildEnv ${buildScript}
+    runHook postBuild
+  '';
+  postBuild = with openmpi; postInstall + postFixup;
+  dontInstall = true;
+  dontFixup = true;
+  requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" ];
+}

local/pkgs/vasp/vtst.nix

@@ -0,0 +1,9 @@
+{ fetchzip, lib }: version:
+  let
+    src = fetchzip
+    {
+      url = "http://theory.cm.utexas.edu/code/vtstcode-199.tgz";
+      sha256 = "06c9f14a90ka3p396q6spr25xwkih4n01nm1qjj9fnvqzxlp9k9y";
+    };
+    shortVersion = builtins.concatStringsSep "." (lib.lists.take 2 (builtins.splitVersion version));
+  in if version == null then src else "${src}/vtstcode${shortVersion}"

local/pkgs/vasp/vtst.patch

@@ -0,0 +1,56 @@
+diff --color -ur /nix/store/wxa9k7aq7yw0b8rrcnvsmi8jq487x1lr-vasp-6.4.0/src/main.F /home/chn/Desktop/vasp/src/main.F
+--- a/src/main.F	1970-01-01 08:00:01.000000000 +0800
++++ b/src/main.F	2024-04-14 11:09:56.920197043 +0800
+@@ -965,7 +965,7 @@
+ ! init all chains (INCAR reader)
+ !-----------------------------------------------------------------------
+       LCHAIN = IMAGES > 0 .AND. .NOT.AFQMC_SET % ACTIVE
+-      IF (LCHAIN) CALL chain_init( T_INFO, IO)
++      CALL chain_init( T_INFO, IO)
+ !-----------------------------------------------------------------------
+ !xml finish copying parameters from INCAR to xml file
+ ! no INCAR reading from here
+@@ -3623,7 +3623,7 @@
+       ENDIF
+ 
+       CALL CHAIN_FORCE(T_INFO%NIONS,DYN%POSION,TOTEN,TIFOR, &
+-           LATT_CUR%A,LATT_CUR%B,IO%IU6)
++           TSIF,LATT_CUR%A,LATT_CUR%B,IO%IU6)
+ 
+       CALL PARALLEL_TEMPERING(NSTEP,T_INFO%NIONS,DYN%POSION,DYN%VEL,TOTEN,TIFOR,DYN%TEBEG,DYN%TEEND, &
+            LATT_CUR%A,LATT_CUR%B,IO%IU6)
+diff --color -ur /nix/store/wxa9k7aq7yw0b8rrcnvsmi8jq487x1lr-vasp-6.4.0/src/makefile /home/chn/Desktop/vasp/src/makefile
+--- a/src/makefile	1970-01-01 08:00:01.000000000 +0800
++++ b/src/makefile	2024-04-14 11:12:29.534219679 +0800
+@@ -14,7 +14,7 @@
+ OFLAG=$(OFLAG_2)
+ OFLAG_IN=$(OFLAG)
+ 
+-LIB=lib parser
++LIB=lib parser pyamff_fortran
+ LLIB=-Llib -ldmy -Lparser -lparser
+ 
+ SRCDIR=../../src
+@@ -146,7 +146,7 @@
+ 	$(MAKE) -C $@ -j1
+ #	$(MAKE) -C $@
+ 
+-dependencies: sources
++dependencies: sources libs
+ 	$(MAKE) depend
+ 
+ depend: $(F90SRC)
+diff --color -ur /nix/store/wxa9k7aq7yw0b8rrcnvsmi8jq487x1lr-vasp-6.4.0/src/.objects /home/chn/Desktop/vasp/src/.objects
+--- a/src/.objects	1970-01-01 08:00:01.000000000 +0800
++++ b/src/.objects	2024-04-14 11:10:56.879417040 +0800
+@@ -122,6 +122,10 @@
+ 	dos.o \
+ 	elf.o \
+ 	hamil_rot.o \
++	bfgs.o dynmat.o instanton.o lbfgs.o sd.o cg.o dimer.o bbm.o \
++	fire.o lanczos.o neb.o qm.o \
++	pyamff_fortran/*.o ml_pyamff.o \
++	opt.o \
+ 	chain.o \
+ 	dyna.o \
+ 	fileio.o \

local/pkgs/vasp/vtstscripts.nix

@@ -0,0 +1,24 @@
+{ fetchzip, stdenv, autoPatchelfHook, perl, writeScriptBin }:
+  let vtstscript-unwrapped = stdenv.mkDerivation
+  {
+    name = "vtstscript-unwrapped";
+    src = fetchzip
+    {
+      url = "http://theory.cm.utexas.edu/code/vtstscripts.tgz";
+      sha256 = "04476wgxvja15jijh9dxbzwy4mdrdqnd93s66jsm26rf73caj7lr";
+    };
+    buildInputs = [ autoPatchelfHook perl ];
+    installPhase =
+    ''
+      mkdir -p $out/lib/vtstscripts
+      cp -r * $out/lib/vtstscripts
+      patchShebangs $out/lib/vtstscripts
+    '';
+  };
+  in writeScriptBin "vtstscripts"
+  ''
+    # add vtstscript-unwrapped in PERL5LIB
+    export PERL5LIB=${vtstscript-unwrapped}/lib/vtstscripts''${PERL5LIB:+:$PERL5LIB}
+    export PATH=${vtstscript-unwrapped}/lib/vtstscripts''${PATH:+:$PATH}
+    exec "$@"
+  ''

modules/default.nix

@@ -13,6 +13,9 @@ inputs:
       topInputs.nur.nixosModules.nur
       topInputs.nur-xddxdd.nixosModules.setupOverlay
       topInputs.impermanence.nixosModules.impermanence
+      topInputs.nix-flatpak.nixosModules.nix-flatpak
+      topInputs.chaotic.nixosModules.default
+      topInputs.catppuccin.nixosModules.catppuccin
       (inputs:
       {
         config =
@@ -31,19 +34,18 @@ inputs:
               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; };
-              # needed by mirism
-              "nghttp2-23.05" =
-                inputs.pkgs.callPackage "${inputs.topInputs."nixpkgs-23.05"}/pkgs/development/libraries/nghttp2" {};
               firefox-addons = (import "${topInputs.rycee}" { inherit (prev) pkgs; }).firefox-addons;
+              inherit (import topInputs.gricad { pkgs = final; }) intel-oneapi intel-oneapi-2022;
             })
           ];
           home-manager.sharedModules =
           [
             topInputs.plasma-manager.homeManagerModules.plasma-manager
             topInputs.nix-doom-emacs.hmModule
+            topInputs.catppuccin.homeManagerModules.catppuccin
           ];
         };
       })
-      ./hardware ./packages ./system ./virtualization ./services ./bugs ./users
+      ./hardware ./packages ./system ./virtualization ./services ./bugs ./user
     ];
   }

modules/hardware/default.nix

@@ -1,77 +1,79 @@
 inputs:
 {
-  imports = inputs.localLib.mkModules [ ./gpu.nix ./legion.nix ];
-  options.nixos.hardware = let inherit (inputs.lib) mkOption types; in
-  {
-    bluetooth.enable = mkOption { type = types.bool; default = false; };
-    joystick.enable = mkOption { type = types.bool; default = false; };
-    printer.enable = mkOption { type = types.bool; default = false; };
-    sound.enable = mkOption { type = types.bool; default = false; };
-    cpus = mkOption { type = types.listOf (types.enum [ "intel" "amd" ]); default = []; };
-  };
-  config =
+  imports = inputs.localLib.findModules ./.;
+  options.nixos.hardware =
     let
-      inherit (inputs.lib) mkMerge mkIf;
-      inherit (inputs.config.nixos) hardware;
-      inherit (builtins) listToAttrs map concatLists;
-      inherit (inputs.localLib) attrsToList;
-    in mkMerge
-    [
-      # bluetooth
-      (mkIf hardware.bluetooth.enable { hardware.bluetooth.enable = true; })
-      # joystick
-      (mkIf hardware.joystick.enable { hardware = { xone.enable = true; xpadneo.enable = true; }; })
-      # printer
-      (
-        mkIf hardware.printer.enable
+      inherit (inputs.lib) mkOption types;
+      default = if inputs.config.nixos.system.gui.enable then {} else null;
+    in
+    {
+      bluetooth = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
+      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
+  [
+    # bluetooth
+    (inputs.lib.mkIf (hardware.bluetooth != null) { hardware.bluetooth.enable = true; })
+    # joystick
+    (inputs.lib.mkIf (hardware.joystick != null) { hardware = { xone.enable = true; xpadneo.enable = true; }; })
+    # printer
+    (
+      inputs.lib.mkIf (hardware.printer != null)
+      {
+        services =
         {
-          services =
+          printing =
           {
-            printing = { enable = true; drivers = [ inputs.pkgs.cnijfilter2 ]; };
-            avahi = { enable = true; nssmdns = true; openFirewall = true; };
+            enable = true;
+            drivers = inputs.lib.mkIf (inputs.config.nixos.system.nixpkgs.arch == "x86_64") [ inputs.pkgs.cnijfilter2 ];
           };
-        }
-      )
-      # sound
-      (
-        mkIf hardware.sound.enable
-        {
-          hardware.pulseaudio.enable = false;
-          services.pipewire = { enable = true; alsa = { enable = true; support32Bit = true; }; pulse.enable = true; };
-          sound.enable = true;
-          security.rtkit.enable = true;
-          environment.etc."wireplumber/main.lua.d/50-alsa-config.lua".text =
-            let
-              content = builtins.readFile
-                (inputs.pkgs.wireplumber + "/share/wireplumber/main.lua.d/50-alsa-config.lua");
-              matched = builtins.match
-                ".*\n([[:space:]]*)(--\\[\"session\\.suspend-timeout-seconds\"][^\n]*)[\n].*" content;
-              spaces = builtins.elemAt matched 0;
-              comment = builtins.elemAt matched 1;
-              config = ''["session.suspend-timeout-seconds"] = 0'';
-            in
-              builtins.replaceStrings [(spaces + comment)] [(spaces + config)] content;
-        }
-      )
-      # cpus
-      (
-        mkIf (hardware.cpus != [])
-        {
-          hardware.cpu = 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
-              concatLists (map (cpu: modules.${cpu}) hardware.cpus);
-        }
-      )
-    ];
+          avahi = { enable = true; nssmdns = true; openFirewall = true; };
+        };
+      }
+    )
+    # sound
+    (
+      inputs.lib.mkIf (hardware.sound != null)
+      {
+        hardware.pulseaudio.enable = false;
+        services.pipewire = { enable = true; alsa = { enable = true; support32Bit = true; }; pulse.enable = true; };
+        sound.enable = true;
+        security.rtkit.enable = true;
+        environment.etc."wireplumber/main.lua.d/50-alsa-config.lua".text =
+          let
+            content = builtins.readFile
+              (inputs.pkgs.wireplumber + "/share/wireplumber/main.lua.d/50-alsa-config.lua");
+            matched = builtins.match
+              ".*\n([[:space:]]*)(--\\[\"session\\.suspend-timeout-seconds\"][^\n]*)[\n].*" content;
+            spaces = builtins.elemAt matched 0;
+            comment = builtins.elemAt matched 1;
+            config = ''["session.suspend-timeout-seconds"] = 0'';
+          in
+            builtins.replaceStrings [(spaces + comment)] [(spaces + config)] content;
+      }
+    )
+    # 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);
+      }
+    )
+  ];
 }

modules/hardware/legion.nix

@@ -1,16 +1,10 @@
 inputs:
 {
-  options.nixos.hardware.legion = let inherit (inputs.lib) mkOption types; in
+  options.nixos.hardware.legion = let inherit (inputs.lib) mkOption types; in mkOption
+    { type = types.nullOr (types.submodule {}); default = null; };
+  config = let inherit (inputs.config.nixos.hardware) legion; in inputs.lib.mkIf (legion != null)
   {
-    enable = mkOption { type = types.bool; default = false; };
+    environment.systemPackages = [ inputs.pkgs.lenovo-legion ];
+    boot.extraModulePackages = [ inputs.config.boot.kernelPackages.lenovo-legion-module ];
   };
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-      inherit (inputs.config.nixos.hardware) legion;
-    in mkIf legion.enable
-    {
-      environment.systemPackages = [ inputs.pkgs.lenovo-legion ];
-      boot.extraModulePackages = [ inputs.config.boot.kernelPackages.lenovo-legion-module ];
-    };
 }

modules/packages/chromium.nix

@@ -0,0 +1,39 @@
+inputs:
+{
+  config = inputs.lib.mkIf (builtins.elem "desktop-extra" inputs.config.nixos.packages._packageSets)
+  {
+    programs.chromium = { enable = true; extraOpts.PasswordManagerEnabled = false; };
+    nixos.user.sharedModules =
+    [{
+      config.programs.chromium =
+      {
+        enable = true;
+        extensions =
+        # TODO: declartive way to install extensions, with fixed xpi file
+        # TODO: declartively config
+        [
+          { id = "mpkodccbngfoacfalldjimigbofkhgjn"; } # Aria2 Explorer
+          { id = "nngceckbapebfimnlniiiahkandclblb"; } # Bitwarden
+          { id = "kbfnbcaeplbcioakkpcpgfkobkghlhen"; } # Grammarly
+          { id = "ihnfpdchjnmlehnoeffgcbakfmdjcckn"; } # Pixiv Fanbox Downloader
+          { id = "cimiefiiaegbelhefglklhhakcgmhkai"; } # Plasma Integration
+          { id = "dkndmhgdcmjdmkdonmbgjpijejdcilfh"; } # Powerful Pixiv Downloader
+          { id = "padekgcemlokbadohgkifijomclgjgif"; } # Proxy SwitchyOmega
+          { id = "kefjpfngnndepjbopdmoebkipbgkggaa"; } # RSSHub Radar
+          { id = "abpdnfjocnmdomablahdcfnoggeeiedb"; } # Save All Resources
+          { id = "nbokbjkabcmbfdlbddjidfmibcpneigj"; } # SmoothScroll
+          { id = "onepmapfbjohnegdmfhndpefjkppbjkm"; } # SuperCopy 超级复制
+          { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # uBlock Origin
+          { id = "gppongmhjkpfnbhagpmjfkannfbllamg"; } # Wappalyzer
+          { id = "hkbdddpiemdeibjoknnofflfgbgnebcm"; } # YouTube™ 双字幕
+          { id = "ekhagklcjbdpajgpjgmbionohlpdbjgc"; } # Zotero Connector
+          { id = "ikhdkkncnoglghljlkmcimlnlhkeamad"; } # 划词翻译
+          { id = "dhdgffkkebhmkfjojejmpbldmpobfkfo"; } # 篡改猴
+          { id = "hipekcciheckooncpjeljhnekcoolahp"; } # Tabliss
+          { id = "nkbihfbeogaeaoehlefnkodbefgpgknn"; } # MetaMask
+          { id = "bpoadfkcbjbfhfodiogcnhhhpibjhbnh"; } # 沉浸式翻译
+        ];
+      };
+    }];
+  };
+}

modules/packages/default.nix

@@ -1,12 +1,6 @@
 inputs:
 {
-  imports = inputs.localLib.mkModules
-  [
-    ./server
-    ./desktop
-    ./desktop-fat
-    ./workstation
-  ];
+  imports = inputs.localLib.findModules ./.;
   options.nixos.packages =
     let
       inherit (inputs.lib) mkOption types;
@@ -14,15 +8,20 @@ inputs:
       [
         # no gui, only used for specific purpose
         "server"
+        "server-extra"
         # gui, for daily use, but not install large programs such as matlab
         "desktop"
-        "desktop-fat"
+        "desktop-extra"
         # nearly everything
         "workstation"
       ];
     in
     {
-      packageSet = mkOption { type = types.enum packageSets; default = "server"; };
+      packageSet = mkOption
+      {
+        type = types.enum packageSets;
+        default = if inputs.config.nixos.system.gui.enable then "desktop" else "server";
+      };
       extraPackages = mkOption { type = types.listOf types.unspecified; default = []; };
       excludePackages = mkOption { type = types.listOf types.unspecified; default = []; };
       extraPythonPackages = mkOption { type = types.listOf types.unspecified; default = []; };
@@ -41,32 +40,31 @@ inputs:
       _prebuildPackages = mkOption { type = types.listOf types.unspecified; default = []; };
     };
   config =
-    let
-      inherit (builtins) concatLists map;
-    in
-    {
-      environment.systemPackages = let inherit (inputs.lib.lists) subtractLists; in with inputs.config.nixos.packages;
-        (subtractLists excludePackages (_packages ++ extraPackages))
-        ++ [
-          (inputs.pkgs.python3.withPackages (pythonPackages:
-            subtractLists
-              (concatLists (map (packageFunction: packageFunction pythonPackages) excludePythonPackages))
-              (concatLists (map (packageFunction: packageFunction pythonPackages)
-                (_pythonPackages ++ extraPythonPackages)))))
-          (inputs.pkgs.callPackage ({ stdenv }: stdenv.mkDerivation
-          {
-            name = "prebuild-packages";
-            propagateBuildInputs = subtractLists excludePrebuildPackages (_prebuildPackages ++ extraPrebuildPackages);
-            phases = [ "installPhase" ];
-            installPhase =
-            ''
-              runHook preInstall
-              mkdir -p $out
-              runHook postInstall
-            '';
-          }) {})
-        ];
-    };
+  {
+    environment.systemPackages = let inherit (inputs.lib.lists) subtractLists; in with inputs.config.nixos.packages;
+      (inputs.lib.lists.subtractLists excludePackages (_packages ++ extraPackages))
+      ++ [
+        (inputs.pkgs.python3.withPackages (pythonPackages:
+          inputs.lib.lists.subtractLists
+            (builtins.concatLists (builtins.map (packageFunction: packageFunction pythonPackages)
+              excludePythonPackages))
+            (builtins.concatLists (builtins.map (packageFunction: packageFunction pythonPackages)
+              (_pythonPackages ++ extraPythonPackages)))))
+        (inputs.pkgs.callPackage ({ stdenv }: stdenv.mkDerivation
+        {
+          name = "prebuild-packages";
+          propagateBuildInputs = inputs.lib.lists.subtractLists excludePrebuildPackages
+            (_prebuildPackages ++ extraPrebuildPackages);
+          phases = [ "installPhase" ];
+          installPhase =
+          ''
+            runHook preInstall
+            mkdir -p $out
+            runHook postInstall
+          '';
+        }) {})
+      ];
+  };
 }
 
     # programs.firejail =

modules/packages/desktop-extra.nix

@@ -0,0 +1,46 @@
+inputs:
+{
+  config = inputs.lib.mkIf (builtins.elem "desktop-extra" inputs.config.nixos.packages._packageSets)
+  {
+    nixos =
+    {
+      packages = with inputs.pkgs;
+      {
+        _packages =
+        [
+          # system management
+          etcher btrfs-assistant snapper-gui libsForQt5.qtstyleplugin-kvantum ventoy-full cpu-x
+          # password and key management
+          yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden
+          # download
+          qbittorrent nur-xddxdd.baidupcs-go wgetpaste
+          # development
+          scrcpy weston cage openbox krita
+          # media
+          spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio
+          waifu2x-converter-cpp inkscape blender
+          # editor
+          unstablePackages.typora
+          # themes
+          orchis-theme plasma-overdose-kde-theme materia-kde-theme graphite-kde-theme arc-kde-theme materia-theme
+          # news
+          fluent-reader
+          # nix tools
+          deploy-rs.deploy-rs 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
+          # browser
+          google-chrome
+          # office
+          crow-translate zotero pandoc ydict libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview
+          (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
+          nextcloud-client
+          # math, physics and chemistry
+          octaveFull root ovito localPackages.vesta localPackages.vaspkit localPackages.v-sim
+        ] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
+      };
+    };
+    programs.kdeconnect.enable = true;
+  };
+}

modules/packages/desktop-fat/default.nix

@@ -1,50 +0,0 @@
-inputs:
-{
-  imports = inputs.localLib.mkModules [ ./steam.nix ];
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-    in mkIf (builtins.elem "desktop-fat" inputs.config.nixos.packages._packageSets)
-    {
-      nixos =
-      {
-        packages = with inputs.pkgs;
-        {
-          _packages =
-          [
-            # system management
-            etcher btrfs-assistant snapper-gui libsForQt5.qtstyleplugin-kvantum ventoy-full cpu-x
-            # password and key management
-            yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden
-            # download
-            qbittorrent nur-xddxdd.baidupcs-go wgetpaste
-            # development
-            scrcpy weston cage openbox krita
-            # media
-            spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio
-            waifu2x-converter-cpp inkscape blender
-            # editor
-            unstablePackages.typora
-            # themes
-            orchis-theme plasma-overdose-kde-theme materia-kde-theme graphite-kde-theme arc-kde-theme materia-theme
-            # news
-            fluent-reader
-            # nix tools
-            deploy-rs.deploy-rs 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
-            # browser
-            google-chrome
-            # office
-            crow-translate zotero pandoc ydict libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview
-            (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
-            nextcloud-client
-            # math, physics and chemistry
-            octaveFull root ovito localPackages.vesta localPackages.vaspkit localPackages.v-sim
-          ] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
-        };
-      };
-      programs.kdeconnect.enable = true;
-    };
-}

modules/packages/desktop-fat/steam.nix

@@ -1,23 +0,0 @@
-inputs:
-{
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-    in mkIf (builtins.elem "desktop-fat" inputs.config.nixos.packages._packageSets)
-    {
-      programs.steam =
-      {
-        enable = true;
-        package = inputs.pkgs.steam.override (prev:
-        {
-          steam = prev.steam.overrideAttrs (prev:
-          {
-            postInstall = prev.postInstall +
-            ''
-              sed -i 's#Comment\[zh_CN\]=.*$#Comment\[zh_CN\]=思题慕®学习平台#' $out/share/applications/steam.desktop
-            '';
-          });
-        });
-      };
-    };
-}

modules/packages/desktop/chromium.nix

@@ -1,40 +0,0 @@
-inputs:
-{
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-    in mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
-    {
-      programs.chromium = { enable = true; extraOpts.PasswordManagerEnabled = false; };
-      nixos.users.sharedModules =
-      [{
-        config.programs.chromium =
-        {
-          enable = true;
-          extensions =
-          [
-            { id = "mpkodccbngfoacfalldjimigbofkhgjn"; } # Aria2 Explorer
-            { id = "nngceckbapebfimnlniiiahkandclblb"; } # Bitwarden
-            { id = "kbfnbcaeplbcioakkpcpgfkobkghlhen"; } # Grammarly
-            { id = "ihnfpdchjnmlehnoeffgcbakfmdjcckn"; } # Pixiv Fanbox Downloader
-            { id = "cimiefiiaegbelhefglklhhakcgmhkai"; } # Plasma Integration
-            { id = "dkndmhgdcmjdmkdonmbgjpijejdcilfh"; } # Powerful Pixiv Downloader
-            { id = "padekgcemlokbadohgkifijomclgjgif"; } # Proxy SwitchyOmega
-            { id = "kefjpfngnndepjbopdmoebkipbgkggaa"; } # RSSHub Radar
-            { id = "abpdnfjocnmdomablahdcfnoggeeiedb"; } # Save All Resources
-            { id = "nbokbjkabcmbfdlbddjidfmibcpneigj"; } # SmoothScroll
-            { id = "onepmapfbjohnegdmfhndpefjkppbjkm"; } # SuperCopy 超级复制
-            { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # uBlock Origin
-            { id = "gppongmhjkpfnbhagpmjfkannfbllamg"; } # Wappalyzer
-            { id = "hkbdddpiemdeibjoknnofflfgbgnebcm"; } # YouTube™ 双字幕
-            { id = "ekhagklcjbdpajgpjgmbionohlpdbjgc"; } # Zotero Connector
-            { id = "ikhdkkncnoglghljlkmcimlnlhkeamad"; } # 划词翻译
-            { id = "dhdgffkkebhmkfjojejmpbldmpobfkfo"; } # 篡改猴
-            { id = "hipekcciheckooncpjeljhnekcoolahp"; } # Tabliss
-            { id = "nkbihfbeogaeaoehlefnkodbefgpgknn"; } # MetaMask
-            { id = "bpoadfkcbjbfhfodiogcnhhhpibjhbnh"; } # 沉浸式翻译
-          ];
-        };
-      }];
-    };
-}

modules/packages/desktop/default.nix

@@ -1,54 +1,56 @@
 inputs:
 {
-  imports = inputs.localLib.mkModules [ ./vscode.nix ./firefox.nix ./chromium.nix ./plasma ];
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-    in mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
+  config = inputs.lib.mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
+  {
+    nixos =
     {
-      nixos =
-      {
-        packages._packages = with inputs.pkgs;
-        [
-          # system management
-          gparted kio-fuse wayland-utils clinfo glxinfo vulkan-tools dracut
-          (
-            writeShellScriptBin "xclip"
-            ''
-              #!${bash}/bin/bash
-              if [ "$XDG_SESSION_TYPE" = "x11" ]; then
-                exec ${xclip}/bin/xclip -sel clip "$@"
-              else
-                exec ${wl-clipboard-x11}/bin/xclip "$@"
-              fi
-            ''
-          )
-          # color management
-          argyllcms xcalib
-          # networking
-          remmina putty mtr-gui
-          # media
-          mpv nomacs
-          # themes
-          tela-circle-icon-theme localPackages.win11os-kde localPackages.fluent-kde localPackages.blurred-wallpaper
-          localPackages.slate utterly-nord-plasma
-        ];
-      };
-      programs =
-      {
-        adb.enable = true;
-        wireshark = { enable = true; package = inputs.pkgs.wireshark; };
-        vim.package = inputs.pkgs.vim-full;
-        yubikey-touch-detector.enable = true;
-      };
-      nixpkgs.config.packageOverrides = pkgs: 
-      {
-        telegram-desktop = pkgs.telegram-desktop.overrideAttrs (attrs:
-        {
-          patches = (if (attrs ? patches) then attrs.patches else []) ++ [ ./telegram.patch ];
-        });
-      };
-      services.pcscd.enable = true;
+      packages._packages = with inputs.pkgs;
+      [
+        # system management
+        gparted kio-fuse wayland-utils clinfo glxinfo vulkan-tools dracut
+        (
+          writeShellScriptBin "xclip"
+          ''
+            #!${bash}/bin/bash
+            if [ "$XDG_SESSION_TYPE" = "x11" ]; then
+              exec ${xclip}/bin/xclip -sel clip "$@"
+            else
+              exec ${wl-clipboard-x11}/bin/xclip "$@"
+            fi
+          ''
+        )
+        # color management
+        argyllcms xcalib
+        # networking
+        remmina putty mtr-gui
+        # media
+        mpv nomacs
+        # themes
+        tela-circle-icon-theme localPackages.win11os-kde localPackages.fluent-kde localPackages.blurred-wallpaper
+        localPackages.slate utterly-nord-plasma
+        # terminal
+        unstablePackages.warp-terminal
+        # development
+        adb-sync
+        # virtual keyboard
+        localPackages.kylin-virtual-keyboard
+      ];
     };
+    programs =
+    {
+      adb.enable = true;
+      wireshark = { enable = true; package = inputs.pkgs.wireshark; };
+      vim.package = inputs.pkgs.vim-full;
+      yubikey-touch-detector.enable = true;
+    };
+    nixpkgs.config.packageOverrides = pkgs: 
+    {
+      telegram-desktop = pkgs.telegram-desktop.overrideAttrs (attrs:
+      {
+        patches = (if (attrs ? patches) then attrs.patches else []) ++ [ ./telegram.patch ];
+      });
+    };
+    services.pcscd.enable = true;
+  };
 }
 

modules/packages/desktop/plasma/default.nix

@@ -1,98 +0,0 @@
-inputs:
-{
-  imports = inputs.localLib.mkModules [ ./konsole.nix ];
-  config.nixos.users.sharedModules = inputs.lib.mkIf inputs.config.nixos.system.gui.enable
-  [{
-    config.programs.plasma = inputs.lib.mkMerge
-    [
-      # TODO: autostart, panel, discard user changed settings
-      # general
-      {
-        enable = true;
-        configFile.plasma-localerc = { Formats.LANG = "en_US.UTF-8"; Translations.LANGUAGE = "zh_CN"; };
-      }
-      # kwin
-      {
-        kwin.titlebarButtons =
-        {
-          right = [ "help" "keep-below-windows" "keep-above-windows" "minimize" "maximize" "close" ];
-          left = [ "more-window-actions" ];
-        };
-        windows.allowWindowsToRememberPositions = false;
-        configFile =
-        {
-          plasmanotifyrc.Notifications.PopupPosition = "BottomRight";
-          kwinrc =
-          {
-            Tiling.padding = 4;
-            Wayland."InputMethod[$e]" = "/run/current-system/sw/share/applications/org.fcitx.Fcitx5.desktop";
-            Windows.RollOverDesktops = true;
-            Compositing = { AllowTearing = false; WindowsBlockCompositing = false; };
-          };
-        };
-      }
-      # baloo
-      { configFile.baloofilerc."Basic Settings".Indexing-Enabled = false; }
-      # dolphin and file chooser
-      {
-        configFile =
-        {
-          dolphinrc =
-          {
-            General = { ShowFullPath = true; FilterBar = true; RememberOpenedTabs = false; };
-            PreviewSettings.Plugins = builtins.concatStringsSep ","
-            [
-              "blenderthumbnail"
-              "comicbookthumbnail"
-              "djvuthumbnail"
-              "ebookthumbnail"
-              "exrthumbnail"
-              "marble_thumbnail_geojson"
-              "marble_thumbnail_gpx"
-              "jpegthumbnail"
-              "marble_thumbnail_kmz"
-              "marble_thumbnail_kml"
-              "kraorathumbnail"
-              "windowsimagethumbnail"
-              "windowsexethumbnail"
-              "mltpreview"
-              "mobithumbnail"
-              "opendocumentthumbnail"
-              "marble_thumbnail_osm"
-              "palathumbcreator"
-              "gsthumbnail"
-              "rawthumbnail"
-              "svgthumbnail"
-              "imagethumbnail"
-              "fontthumbnail"
-              "directorythumbnail"
-              "textthumbnail"
-              "webarchivethumbnail"
-              "ffmpegthumbs"
-              "audiothumbnail"
-            ];
-          };
-          kdeglobals."KFileDialog Settings" =
-          {
-            "Allow Expansion" = true;
-            "Automatically select filename extension" = true;
-            "Show Bookmarks" = true;
-            "Show Full Path" = true;
-            "Show Inline Previews" = true;
-            "Show Preview" = true;
-            "Show Speedbar" = true;
-            "Show hidden files" = true;
-            "Sort by" = "Name";
-            "Sort directories first" = true;
-            "Sort hidden files last" = true;
-            "View Style" = "DetailTree";
-          };
-        };
-      }
-      # krunner
-      { configFile.krunnerrc = { General.FreeFloating = true; Plugins.baloosearchEnabled = false; }; }
-      # lock screen
-      { configFile.kscreenlockerrc.Daemon.Autolock = false; }
-    ];
-  }];
-}

modules/packages/desktop/plasma/konsole.nix

@@ -1,84 +0,0 @@
-inputs:
-{
-  config = inputs.lib.mkIf inputs.config.nixos.system.gui.enable
-  {
-    nixos.users.sharedModules =
-    [(hmInputs: {
-      config =
-      {
-        programs.plasma =
-        {
-          overrideConfig = true;
-          overrideConfigFiles = [ "konsolerc" "yakuakerc" ];
-          configFile =
-          {
-            yakuakerc =
-            {
-              Appearance =
-              {
-                HideSkinBorders = true;
-                Skin = "Slate";
-                Translucency = true;
-              };
-              "Desktop Entry".DefaultProfile = "plasma-manager.profile";
-              Dialogs.FirstRun = false;
-              Window =
-              {
-                KeepOpen = false;
-                KeepOpenAfterLastSessionCloses = true;
-                ShowSystrayIcon = false;
-              };
-            };
-            konsolerc =
-            {
-              "Desktop Entry".DefaultProfile = "plasma-manager.profile";
-              "MainWindow.Toolbar sessionToolbar".ToolButtonStyle = "IconOnly";
-            };
-          };
-          dataFile."konsole/plasma-manager.profile" =
-          {
-            Appearance =
-            {
-              AntiAliasFonts = true;
-              BoldIntense = true;
-              ColorScheme = "Breeze";
-              Font = "FiraCode Nerd Font Mono,10,-1,5,50,0,0,0,0,0";
-              UseFontLineChararacters = true;
-              WordModeAttr = false;
-            };
-            "Cursor Options".CursorShape = 1;
-            General =
-            {
-              Name = "plasma-manager";
-              Parent = "FALLBACK/";
-              TerminalCenter = true;
-              TerminalMargin = 1;
-            };
-            "Interaction Options" =
-            {
-              AutoCopySelectedText = true;
-              TrimLeadingSpacesInSelectedText = true;
-              TrimTrailingSpacesInSelectedText = true;
-              UnderlineFilesEnabled = true;
-            };
-            Scrolling =
-            {
-              HistoryMode = 2;
-              ReflowLines = false;
-            };
-            "Terminal Features".BlinkingCursorEnabled = true;
-          };
-        };
-        home.file.".local/share/konsole/Breeze.colorscheme".text = builtins.replaceStrings
-          [ "Opacity=1" ] [ "Opacity=0.9\nBlur=true" ]
-          (builtins.readFile "${inputs.pkgs.konsole}/share/konsole/Breeze.colorscheme");
-      };
-    })];
-    environment.persistence =
-      let impermanence = inputs.config.nixos.system.impermanence;
-      in inputs.lib.mkIf impermanence.enable (inputs.lib.mkMerge (builtins.map
-        (user:
-          { "${impermanence.root}".users.${user}.directories = [ ".local/share/konsole" ".local/share/yakuake" ]; })
-        inputs.config.nixos.users.users));
-  };
-}

modules/packages/emacs/default.nix

@@ -0,0 +1,7 @@
+inputs:
+{
+  config = inputs.lib.mkIf (builtins.elem "workstation" inputs.config.nixos.packages._packageSets)
+  {
+    nixos.user.sharedModules = [{ config.programs.doom-emacs = { enable = true; doomPrivateDir = ./doom.d; }; }];
+  };
+}

modules/packages/firefox.nix

@@ -2,13 +2,15 @@ inputs:
 {
   config = inputs.lib.mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
   {
-    nixos.users.sharedModules = [{ config =
+    nixos.user.sharedModules = [{ config =
     {
       programs.firefox =
       {
         enable = true;
         # TODO: switch to 24.05
         # nativeMessagingHosts = [ inputs.pkgs.plasma-browser-integration ];
+        # TODO: switch to chromium as default browser
+        # TODO: use fixed-version of plugins
         package = inputs.pkgs.firefox.override { nativeMessagingHosts = [ inputs.pkgs.plasma-browser-integration ]; };
         policies.DefaultDownloadDirectory = "\${home}/Downloads";
         profiles.default =
@@ -17,18 +19,7 @@ inputs:
           [
             immersive-translate tampermonkey bitwarden cookies-txt dualsub firefox-color i-dont-care-about-cookies
             metamask pakkujs switchyomega rsshub-radar rsspreview tabliss tree-style-tab ublock-origin wallabagger
-            wappalyzer grammarly plasma-integration
-            (
-              buildFirefoxXpiAddon rec
-              {
-                pname = "zotero-connector";
-                version = "5.0.119";
-                addonId = "zotero@chnm.gmu.edu";
-                url = "https://download.zotero.org/connector/firefox/release/Zotero_Connector-${version}.xpi";
-                sha256 = "17yhkp5nrx325q3amlasb4nsw0bldm8i2i9fh8ql2hwj8fmy25mr";
-                meta = {};
-              }
-            )
+            wappalyzer grammarly plasma-integration zotero-connector.zotero-connector
           ];
           search = { default = "Google"; force = true; };
           userChrome = builtins.readFile "${inputs.topInputs.lepton}/userChrome.css";

modules/packages/flatpak.nix

@@ -0,0 +1,11 @@
+inputs:
+{
+  config = inputs.lib.mkIf (builtins.elem "desktop-extra" inputs.config.nixos.packages._packageSets)
+  {
+    services.flatpak =
+    {
+      enable = true;
+      uninstallUnmanaged = true;
+    };
+  };
+}

modules/packages/gpg.nix

@@ -0,0 +1,7 @@
+inputs:
+{
+  config = inputs.lib.mkIf (builtins.elem "server" inputs.config.nixos.packages._packageSets)
+  {
+    programs.gnupg.agent = { enable = true; pinentryFlavor = "tty"; };
+  };
+}

modules/packages/plasma/default.nix

@@ -0,0 +1,113 @@
+inputs:
+{
+  imports = inputs.localLib.findModules ./.;
+  config = inputs.lib.mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
+  {
+    nixos.user.sharedModules =
+    [{
+      config.programs.plasma = inputs.lib.mkMerge
+      [
+        # TODO: autostart, panel, discard user changed settings
+        # general
+        {
+          enable = true;
+          configFile.plasma-localerc = { Formats.LANG.value = "en_US.UTF-8"; Translations.LANGUAGE.value = "zh_CN"; };
+        }
+        # kwin
+        {
+          kwin.titlebarButtons =
+          {
+            right = [ "help" "keep-below-windows" "keep-above-windows" "minimize" "maximize" "close" ];
+            left = [ "more-window-actions" ];
+          };
+          windows.allowWindowsToRememberPositions = false;
+          configFile =
+          {
+            plasmanotifyrc.Notifications.PopupPosition.value = "BottomRight";
+            kwinrc =
+            {
+              Tiling.padding.value = 4;
+              Wayland."InputMethod[$e]".value = "/run/current-system/sw/share/applications/org.fcitx.Fcitx5.desktop";
+              Windows.RollOverDesktops.value = true;
+              Compositing = { AllowTearing.value = false; WindowsBlockCompositing.value = false; };
+            };
+          };
+        }
+        # baloo
+        { configFile.baloofilerc."Basic Settings".Indexing-Enabled.value = false; }
+        # dolphin and file chooser
+        {
+          configFile =
+          {
+            dolphinrc =
+            {
+              General = { ShowFullPath.value = true; FilterBar.value = true; RememberOpenedTabs.value = false; };
+              PreviewSettings.Plugins.value = builtins.concatStringsSep ","
+              [
+                "blenderthumbnail"
+                "comicbookthumbnail"
+                "djvuthumbnail"
+                "ebookthumbnail"
+                "exrthumbnail"
+                "marble_thumbnail_geojson"
+                "marble_thumbnail_gpx"
+                "jpegthumbnail"
+                "marble_thumbnail_kmz"
+                "marble_thumbnail_kml"
+                "kraorathumbnail"
+                "windowsimagethumbnail"
+                "windowsexethumbnail"
+                "mltpreview"
+                "mobithumbnail"
+                "opendocumentthumbnail"
+                "marble_thumbnail_osm"
+                "palathumbcreator"
+                "gsthumbnail"
+                "rawthumbnail"
+                "svgthumbnail"
+                "imagethumbnail"
+                "fontthumbnail"
+                "directorythumbnail"
+                "textthumbnail"
+                "webarchivethumbnail"
+                "ffmpegthumbs"
+                "audiothumbnail"
+              ];
+            };
+            kdeglobals."KFileDialog Settings" =
+            {
+              "Allow Expansion".value = true;
+              "Automatically select filename extension".value = true;
+              "Show Bookmarks".value = true;
+              "Show Full Path".value = true;
+              "Show Inline Previews".value = true;
+              "Show Preview".value = true;
+              "Show Speedbar".value = true;
+              "Show hidden files".value = true;
+              "Sort by".value = "Name";
+              "Sort directories first".value = true;
+              "Sort hidden files last".value = true;
+              "View Style".value = "DetailTree";
+            };
+          };
+        }
+        # krunner
+        { configFile.krunnerrc = { General.FreeFloating.value = true; Plugins.baloosearchEnabled.value = false; }; }
+        # lock screen
+        { configFile.kscreenlockerrc.Daemon.Autolock.value = false; }
+      ];
+    }];
+    nixpkgs.overlays = [(final: prev:
+    {
+      libsForQt5 = prev.libsForQt5.overrideScope (final: prev:
+      {
+        plasma5 = prev.plasma5.overrideScope (final: prev:
+        {
+          xdg-desktop-portal-kde = prev.xdg-desktop-portal-kde.overrideAttrs (prev:
+            { patches = (prev.patches or []) ++ [ ./krfb.patch ]; });
+        });
+        xdg-desktop-portal-kde = final.plasma5.xdg-desktop-portal-kde;
+      });
+    })];
+  };
+}