move some packages to workstation

2026-01-13 08:09:23 +08:00 · 2023-12-10 00:07:36 +08:00
157 changed files with 2754 additions and 5180 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-*.png filter=lfs diff=lfs merge=lfs -text
-*.icm filter=lfs diff=lfs merge=lfs -text
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -3,9 +3,9 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
  - &pc age1ffvr5pqd2lfj24e3fh53s92z6h76fda3du4y4k6r3yjumdwvpfgqzj033a
  - &vps6 age164tyqklwhdm57tfm5u863mdt2xrzrrzac4py8a0j9y6kzqcjy9zsp073t6
  - &vps7 age137x7csalutwvfygvvzpemlsywvdxj3j4z93a50z2sjx03w6zau8q3r5902
-  - &surface age1ck5vzs0xqx0jplmuksrkh45xwmkm2t05m2wyq5k2w2mnkmn79fxs6tvl3l
+  - &yoga age1qrea4twxdhd7fnvlq5v45528c90qy6hp2wa55kghsxzgut6n6fxs7w6u42
+  - &pe age1cahahn9hp265dkhduaec65vugk8fct2vt9ur6y54m4mgmyx4v4fq0etjhv
  - &nas age19lhcwk37jmvn6z0v4dpdfh0k4u23f76twdjknc0p7atktf37rd7s4t4wj3
-  - &xmupc1 age1hnarptkze0ujpp05dqr8uma04cxg9zqcx68qgpks5uf5l6rpk5gqhh8wxg
 creation_rules:
  - path_regex: secrets/pc/.*$
    key_groups:
@@ -27,13 +27,17 @@ creation_rules:
    - age:
      - *chn
      - *nas
-  - path_regex: secrets/surface/.*$
-    key_groups:
-    - age:
-      - *chn
-      - *surface
  - path_regex: secrets/xmupc1/.*$
    key_groups:
    - age:
      - *chn
-      - *xmupc1
+  - path_regex: secrets/yoga/.*$
+    key_groups:
+    - age:
+      - *chn
+      - *yoga
+  - path_regex: secrets/pe/.*$
+    key_groups:
+    - age:
+      - *chn
+      - *pe
--- a/devices/nas/default.nix
+++ b/devices/nas/default.nix
@@ -1,101 +0,0 @@
-inputs:
-{
-  config =
-  {
-    nixos =
-    {
-      system =
-      {
-        fileSystems =
-        {
-          mount =
-          {
-            vfat."/dev/disk/by-uuid/13BC-F0C9" = "/boot/efi";
-            btrfs =
-            {
-              "/dev/disk/by-uuid/0e184f3b-af6c-4f5d-926a-2559f2dc3063"."/boot" = "/boot";
-              "/dev/mapper/nix"."/nix" = "/nix";
-              "/dev/mapper/root1" =
-              {
-                "/nix/rootfs" = "/nix/rootfs";
-                "/nix/persistent" = "/nix/persistent";
-                "/nix/nodatacow" = "/nix/nodatacow";
-                "/nix/rootfs/current" = "/";
-                "/nix/backup" = "/nix/backup";
-              };
-            };
-          };
-          decrypt.manual =
-          {
-            enable = true;
-            devices =
-            {
-              "/dev/disk/by-uuid/5cf1d19d-b4a5-4e67-8e10-f63f0d5bb649".mapper = "root1";
-              "/dev/disk/by-uuid/aa684baf-fd8a-459c-99ba-11eb7636cb0d".mapper = "root2";
-              "/dev/disk/by-uuid/a779198f-cce9-4c3d-a64a-9ec45f6f5495" = { mapper = "nix"; ssd = true; };
-            };
-            delayedMount = [ "/" "/nix" ];
-          };
-          swap = [ "/nix/swap/swap" ];
-          rollingRootfs = { device = "/dev/mapper/root1"; path = "/nix/rootfs"; };
-        };
-        initrd.sshd.enable = true;
-        grub.installDevice = "efi";
-        nixpkgs.march = "silvermont";
-        nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        kernel.patches = [ "cjktty" ];
-        networking.hostname = "nas";
-        gui.preferred = false;
-      };
-      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;
-          serverAddress = "74.211.99.69";
-          serverName = "vps6.xserver.chn.moe";
-          dns.extraInterfaces = [ "docker0" ];
-        };
-        xrdp = { enable = true; hostname = [ "nas.chn.moe" "office.chn.moe" ]; };
-        groupshare.enable = true;
-        smartd.enable = true;
-        beesd =
-        {
-          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; };
-        };
-        nginx = { enable = true; applications.webdav.instances."local.webdav.chn.moe" = {}; };
-        wireguard =
-        {
-          enable = true;
-          peers = [ "vps6" ];
-          publicKey = "xCYRbZEaGloMk7Awr00UR3JcDJy4AzVp4QvGNoyEgFY=";
-          wireguardIp = "192.168.83.4";
-        };
-      };
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
-    };
-  };
-}
--- a/devices/pc/color/TPLCD_161B_Default.icm
+++ b/devices/pc/color/TPLCD_161B_Default.icm
--- a/devices/pc/color/TPLCD_161B_Native.icm
+++ b/devices/pc/color/TPLCD_161B_Native.icm
--- a/devices/pc/color/TPLCD_161B_Native_HDR.icm
+++ b/devices/pc/color/TPLCD_161B_Native_HDR.icm
--- a/devices/pc/color/TPLCD_161B_REC709.icm
+++ b/devices/pc/color/TPLCD_161B_REC709.icm
--- a/devices/pc/color/TPLCD_161B_sRGB.icm
+++ b/devices/pc/color/TPLCD_161B_sRGB.icm
--- a/devices/pc/default.nix
+++ b/devices/pc/default.nix
@@ -1,160 +0,0 @@
-inputs:
-{
-  config =
-  {
-    nixos =
-    {
-      system =
-      {
-        fileSystems =
-        {
-          mount =
-          {
-            vfat."/dev/disk/by-uuid/3F57-0EBE" = "/boot/efi";
-            btrfs =
-            {
-              "/dev/disk/by-uuid/02e426ec-cfa2-4a18-b3a5-57ef04d66614"."/" = "/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/4be45329-a054-4c20-8965-8c5b7ee6b35d" =
-              { mapper = "swap"; ssd = true; before = [ "root" ]; };
-          };
-          swap = [ "/dev/mapper/swap" ];
-          resume = "/dev/mapper/swap";
-          rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
-        };
-        grub =
-        {
-          # TODO: install windows
-          # windowsEntries = { "7317-1DB6" = "Windows"; "7321-FA9C" = "Windows for malware"; };
-          installDevice = "efi";
-        };
-        nix =
-        {
-          marches =
-          [
-            "znver2" "znver3" "znver4"
-            # FXSR SAHF XSAVE
-            "sandybridge"
-            # FXSR PREFETCHW RDRND SAHF
-            "silvermont"
-            # FXSR HLE LZCNT PREFETCHW RDRND SAHF XSAVE
-            "broadwell"
-            # FXSR HLE LZCNT PREFETCHW RDRND SAHF SGX XSAVE
-            "skylake"
-            # AVX-VNNI CLDEMOTE GFNI-SSE HRESET KL LZCNT MOVDIR64B MOVDIRI PCONFIG PREFETCHW PTWRITE RDRND
-            # SERIALIZE SGX WAITPKG WIDEKL XSAVE XSAVEOPT
-            "alderlake"
-          ];
-        };
-        nixpkgs =
-          { march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
-        kernel.patches = [ "cjktty" "lantian" "hibernate-progress" ];
-        networking.hostname = "pc";
-        sysctl.laptop-mode = 5;
-      };
-      hardware =
-      {
-        cpus = [ "amd" ];
-        gpu.type = "nvidia";
-        bluetooth.enable = true;
-        joystick.enable = true;
-        printer.enable = true;
-        sound.enable = true;
-        legion.enable = true;
-      };
-      packages.packageSet = "workstation";
-      virtualization =
-      {
-        waydroid.enable = true;
-        docker.enable = true;
-        kvmHost = { enable = true; gui = true; autoSuspend = [ "win10" "hardconnect" ]; };
-        nspawn = [ "arch" "ubuntu-22.04" "fedora" ];
-      };
-      services =
-      {
-        snapper.enable = true;
-        fontconfig.enable = true;
-        samba =
-        {
-          enable = true;
-          private = true;
-          hostsAllowed = "192.168. 127.";
-          shares =
-          {
-            media.path = "/run/media/chn";
-            home.path = "/home/chn";
-            mnt.path = "/mnt";
-            share.path = "/home/chn/share";
-          };
-        };
-        sshd.enable = true;
-        xray.client =
-        {
-          enable = true;
-          serverAddress = "74.211.99.69";
-          serverName = "vps6.xserver.chn.moe";
-          dns =
-          {
-            extraInterfaces = [ "docker0" ];
-            hosts =
-            {
-              "mirism.one" = "74.211.99.69";
-              "beta.mirism.one" = "74.211.99.69";
-              "ng01.mirism.one" = "74.211.99.69";
-              "debug.mirism.one" = "127.0.0.1";
-              "initrd.vps6.chn.moe" = "74.211.99.69";
-              "nix-store.chn.moe" = "127.0.0.1";
-              "initrd.nas.chn.moe" = "192.168.1.185";
-            };
-          };
-        };
-        firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
-        acme = { enable = true; cert."debug.mirism.one" = {}; };
-        frpClient =
-        {
-          enable = true;
-          serverName = "frp.chn.moe";
-          user = "pc";
-          stcpVisitor."yy.vnc".localPort = 6187;
-        };
-        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; }; };
-        wireguard =
-        {
-          enable = true;
-          peers = [ "vps6" ];
-          publicKey = "l1gFSDCeBxyf/BipXNvoEvVvLqPgdil84nmr5q6+EEw=";
-          wireguardIp = "192.168.83.3";
-        };
-        gamemode = { enable = true; drmDevice = 0; };
-        slurm = { enable = true; cpu = { cores = 16; threads = 2; }; memoryMB = 94208; gpus."geforce" = 1; };
-      };
-      bugs = [ "xmunet" "backlight" "amdpstate" ];
-    };
-    virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; };
-    home-manager.users.chn.config.programs.plasma.startup.autoStartScript.xcalib.text =
-      "${inputs.pkgs.xcalib}/bin/xcalib -d :0 ${./color/TPLCD_161B_Default.icm}";
-    powerManagement.resumeCommands =
-    ''
-      ${inputs.pkgs.kmod}/bin/modprobe -r mt7921e
-      ${inputs.pkgs.kmod}/bin/modprobe mt7921e
-    '';
-    specialisation.hybrid.configuration =
-    {
-      nixos =
-      {
-        hardware.gpu =
-          { type = inputs.lib.mkForce "amd+nvidia"; prime.busId = { amd = "8:0:0"; nvidia = "1:0:0"; }; };
-        services.gamemode.drmDevice = inputs.lib.mkForce 1;
-      };
-      system.nixos.tags = [ "hybrid-graphic" ];
-    };
-  };
-}
--- a/devices/surface/default.nix
+++ b/devices/surface/default.nix
@@ -1,76 +0,0 @@
-inputs:
-{
-  imports = inputs.localLib.mkModules [ inputs.topInputs.nixos-hardware.nixosModules.microsoft-surface-pro-intel ];
-  config =
-  {
-    nixos =
-    {
-      system =
-      {
-        fileSystems =
-        {
-          mount =
-          {
-            vfat."/dev/disk/by-uuid/7179-9C69" = "/boot/efi";
-            btrfs =
-            {
-              "/dev/disk/by-uuid/c6d35075-85fe-4129-aaa8-f436ab85ce43"."/boot" = "/boot";
-              "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
-            };
-          };
-          decrypt.auto =
-          {
-            "/dev/disk/by-uuid/4f7420f9-ea19-4713-b084-2ac8f0a963ac" = { mapper = "root"; ssd = true; };
-            "/dev/disk/by-uuid/88bd9d44-928b-40a2-8f3d-6dcd257c4601" =
-              { mapper = "swap"; ssd = true; before = [ "root" ]; };
-          };
-          swap = [ "/dev/mapper/swap" ];
-          resume = "/dev/mapper/swap";
-          rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
-        };
-        nixpkgs.march = "skylake";
-        grub.installDevice = "efi";
-        nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        kernel.patches = [ "cjktty" "lantian" "surface" ];
-        networking.hostname = "surface";
-      };
-      hardware =
-      {
-        cpus = [ "intel" ];
-        gpu.type = "intel";
-        bluetooth.enable = true;
-        joystick.enable = true;
-        printer.enable = true;
-        sound.enable = true;
-      };
-      packages.packageSet = "desktop-fat";
-      virtualization = { docker.enable = true; waydroid.enable = true; };
-      services =
-      {
-        snapper.enable = true;
-        fontconfig.enable = true;
-        sshd.enable = true;
-        xray.client =
-        {
-          enable = true;
-          serverAddress = "74.211.99.69";
-          serverName = "vps6.xserver.chn.moe";
-          dns.extraInterfaces = [ "docker0" ];
-        };
-        firewall.trustedInterfaces = [ "virbr0" ];
-        wireguard =
-        {
-          enable = true;
-          peers = [ "vps6" ];
-          publicKey = "j7qEeODVMH31afKUQAmKRGLuqg8Bxd0dIPbo17LHqAo=";
-          wireguardIp = "192.168.83.5";
-        };
-        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 512; }; };
-      };
-      bugs = [ "xmunet" ];
-    };
-    boot.kernelParams = [ "intel_iommu=off" ];
-    environment.systemPackages = with inputs.pkgs; [ maliit-keyboard maliit-framework ];
-    powerManagement.resumeCommands = ''${inputs.pkgs.systemd}/bin/systemctl restart iptsd'';
-  };
-}
--- a/devices/vps6/default.nix
+++ b/devices/vps6/default.nix
@@ -1,84 +0,0 @@
-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" = "/"; };
-            };
-          };
-          decrypt.manual =
-          {
-            enable = true;
-            devices."/dev/disk/by-uuid/4f8aca22-9ec6-4fad-b21a-fd9d8d0514e8" = { mapper = "root"; ssd = true; };
-            delayedMount = [ "/" ];
-          };
-          swap = [ "/nix/swap/swap" ];
-          rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
-        };
-        grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
-        nixpkgs.march = "sandybridge";
-        nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        initrd.sshd.enable = true;
-        networking.hostname = "vps6";
-      };
-      packages.packageSet = "server";
-      services =
-      {
-        snapper.enable = false;
-        sshd.enable = true;
-        xray.server = { enable = true; serverName = "vps6.xserver.chn.moe"; };
-        frpServer = { enable = true; serverName = "frp.chn.moe"; };
-        nginx =
-        {
-          streamProxy.map =
-          {
-            "anchor.fm" = { upstream = "anchor.fm:443"; proxyProtocol = false; };
-            "podcasters.spotify.com" = { upstream = "podcasters.spotify.com:443"; proxyProtocol = false; };
-            "xlog.chn.moe" = { upstream = "cname.xlog.app:443"; proxyProtocol = false; };
-          }
-          // (builtins.listToAttrs (builtins.map
-            (site: { name = "${site}.chn.moe"; value.upstream.address = "wireguard.pc.chn.moe"; })
-            [ "nix-store" "xn--qbtm095lrg0bfka60z" ]))
-          // (builtins.listToAttrs (builtins.map
-            (site: { name = "${site}.chn.moe"; value.upstream.address = "wireguard.vps7.chn.moe"; })
-            [
-              "xn--s8w913fdga" "misskey" "synapse" "syncv3.synapse" "matrix" "syncv3.matrix"
-              "send" "kkmeeting" "api" "git" "grafana" "vikunja"
-            ]));
-          applications =
-          {
-            element.instances."element.chn.moe" = {};
-            synapse-admin.instances."synapse-admin.chn.moe" = {};
-            catalog.enable = true;
-            blog.enable = true;
-            main.enable = true;
-          };
-        };
-        coturn.enable = true;
-        httpua.enable = true;
-        mirism.enable = true;
-        fail2ban.enable = true;
-        wireguard =
-        {
-          enable = true;
-          peers = [ "pc" "nas" "vps7" "surface" ];
-          publicKey = "AVOsYUKQQCvo3ctst3vNi8XSVWo1Wh15066aHh+KpF4=";
-          wireguardIp = "192.168.83.1";
-          listenIp = "74.211.99.69";
-          lighthouse = true;
-        };
-        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 64; }; };
-      };
-    };
-  };
-}
--- a/devices/vps7/default.nix
+++ b/devices/vps7/default.nix
@@ -1,79 +0,0 @@
-inputs:
-{
-  config =
-  {
-    nixos =
-    {
-      system =
-      {
-        fileSystems =
-        {
-          mount =
-          {
-            btrfs =
-            {
-              "/dev/disk/by-uuid/e36287f7-7321-45fa-ba1e-d126717a65f0"."/boot" = "/boot";
-              "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
-            };
-          };
-          decrypt.manual =
-          {
-            enable = true;
-            devices."/dev/disk/by-uuid/db48c8de-bcf7-43ae-a977-60c4f390d5c4" = { mapper = "root"; ssd = true; };
-            delayedMount = [ "/" ];
-          };
-          swap = [ "/nix/swap/swap" ];
-          rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
-        };
-        grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
-        nixpkgs.march = "broadwell";
-        nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        initrd.sshd.enable = true;
-        networking.hostname = "vps7";
-        gui.preferred = false;
-      };
-      packages.packageSet = "desktop";
-      services =
-      {
-        snapper.enable = true;
-        fontconfig.enable = true;
-        sshd.enable = true;
-        rsshub.enable = true;
-        wallabag.enable = true;
-        misskey.instances =
-        {
-          misskey.hostname = "xn--s8w913fdga.chn.moe";
-          misskey-old = { port = 9727; redis.port = 3546; meilisearch.enable = false; };
-        };
-        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; }; };
-        photoprism.enable = true;
-        nextcloud.enable = true;
-        freshrss.enable = true;
-        send.enable = true;
-        huginn.enable = true;
-        fz-new-order.enable = true;
-        nginx.applications = { kkmeeting.enable = true; webdav.instances."webdav.chn.moe" = {}; };
-        httpapi.enable = true;
-        gitea.enable = true;
-        grafana.enable = true;
-        fail2ban.enable = true;
-        wireguard =
-        {
-          enable = true;
-          peers = [ "vps6" ];
-          publicKey = "n056ppNxC9oECcW7wEbALnw8GeW7nrMImtexKWYVUBk=";
-          wireguardIp = "192.168.83.2";
-          listenIp = "95.111.228.40";
-        };
-        vikunja.enable = true;
-      };
-    };
-  };
-}
--- a/devices/xmupc1/README.md
+++ b/devices/xmupc1/README.md
@@ -1,122 +0,0 @@
-# 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 计算（但不会报错）。
-
-## 常用命令
-
-提交一个 VASP GPU 任务的例子：
-
-```bash
-sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia-6.4.0 mpirun vasp-std
-```
-
-* `--gpus=1` 指定使用一个 GPU（排到这个任务时哪个空闲就使用哪个）。
-  可以指定具体使用哪个GPU，例如 `--gpus=4090:1`。
-  可以简写为 `-G`。
-* `--ntasks-per-gpu=1` 是一定要写的。
-* `--job-name=` 指定任务的名字。可以简写为 `-J`。也可以不指定。
-* 默认情况下，一个 task 会搭配分配一个 CPU 核（两个线程），一般不用修改。如果一定要修改，用 `--cpus-per-task`。
-
-提交一个 VASP CPU 任务的例子：
-
-```bash
-sbatch --ntasks=2 --cpus-per-task=2 --job-name="my great job" vasp-gnu-6.4.0 mpirun vasp-std
-```
-
-* `--ntasks=2` 指定在 MPI 层面上并行的数量。
-  可以简写为 `-n`。
-* `--cpus-per-task=2` 指定每个 task 使用的 CPU 核的数量，OpenMP 并行的数量等于这个数再乘以 2。
-
-要列出已经提交（包括已经完成、取消、失败）的任务：
-
-```bash
-squeue -t all -l
-```
-
-取消一个任务：
-
-```bash
-# 按任务的 id 取消
-scancel 114514
-# 按任务的名字取消
-scancel -n my_great_job
-# 取消一个用户的所有任务
-scancel -u chn
-```
-
-要将自己已经提交的一个任务优先级提到最高（只是自己已经提交任务的最高，不影响别人的任务）：
-
-```bash
-scontrol top job_id
-```
-
-## sbatch 的更多参数
-
-```bash
-# 提交一个新任务，但是礼让后面的任务（推迟到指定时间再开始排队）
--begin=16:00 --begin=now+1hour
-# 指定工作目录
--chdir=/path/to/your/workdir
-# 指定备注
--comment="my great job"
-# 指定任务的 ddl，算不完就杀掉
--deadline=now+1hour
-# 标准错误输出写到别的文件里
--error=error.log
-# 将一些环境变量传递给任务（=ALL是默认行为）
--export=ALL,MY_ENV_VAR=my_value
-# 不传递现在的环境变量
--export=NONE
-# 打开一个文件作为标准输入
--input=
-# 发生一些事件（任务完成等）时发邮件
--mail-type=NONE,BEGIN,END,FAIL,REQUEUE,ALL --mail-user=chn@chn.moe
-# 要求分配内存（不会真的限制内存使用，只是在分配资源时会考虑）
--mem=20G --mem-per-cpu --mem-per-gpu
-# 输出文件是否覆盖
--open-mode={append|truncate}
-# 指定输出文件
-o, --output=<filename_pattern>
-# 不排队，直接跑（超额分配）
-s, --oversubscribe
-# 包裹一个二进制程序
--wrap=
-```
-
-# ssh
-
-ssh 就是 putty winscp 之类的工具使用的那个协议。
-
-* 地址：office.chn.moe（如果在校外，需要厦大 VPN）
-* 端口：6007
-* 用户名：自己名字的拼音首字母
-* 可以用密码登陆，也可以用证书登陆。
-
-要从本机登陆到学校 hpc 的 jykang 账户，使用下面的命令：
-
-```bash
-ssh jykang
-```
-
-# rdp
-
-就是 windows 那个远程桌面。
-
-* 地址：xmupc1.chn.moe（如果在校外，需要厦大 VPN）
-* 用户名：自己名字的拼音首字母
-* 密码和 ssh 一样。
--- a/devices/xmupc1/default.nix
+++ b/devices/xmupc1/default.nix
@@ -1,113 +0,0 @@
-inputs:
-{
-  config =
-  {
-    nixos =
-    {
-      system =
-      {
-        fileSystems =
-        {
-          mount =
-          {
-            vfat."/dev/disk/by-uuid/467C-02E3" = "/boot/efi";
-            btrfs =
-            {
-              "/dev/disk/by-uuid/2f9060bc-09b5-4348-ad0f-3a43a91d158b" = { "/nix" = "/nix"; "/nix/boot" = "/boot"; };
-              "/dev/disk/by-uuid/a04a1fb0-e4ed-4c91-9846-2f9e716f6e12" =
-              {
-                "/nix/rootfs" = "/nix/rootfs";
-                "/nix/persistent" = "/nix/persistent";
-                "/nix/nodatacow" = "/nix/nodatacow";
-                "/nix/rootfs/current" = "/";
-              };
-            };
-          };
-          swap = [ "/nix/swap/swap" ];
-          rollingRootfs = { device = "/dev/disk/by-uuid/a04a1fb0-e4ed-4c91-9846-2f9e716f6e12"; path = "/nix/rootfs"; };
-        };
-        grub.installDevice = "efi";
-        nixpkgs =
-        {
-          march = "znver3";
-          cuda =
-          {
-            enable = true;
-            capabilities =
-            [
-              # 2080 Ti
-              "7.5"
-              # 3090
-              "8.6"
-              # 4090
-              "8.9"
-            ];
-            forwardCompat = false;
-          };
-        };
-        gui = { preferred = false; autoStart = true; };
-        kernel.patches = [ "cjktty" "lantian" ];
-        networking.hostname = "xmupc1";
-      };
-      hardware =
-      {
-        cpus = [ "amd" ];
-        gpu.type = "nvidia";
-        bluetooth.enable = true;
-        joystick.enable = true;
-        printer.enable = true;
-        sound.enable = true;
-      };
-      packages.packageSet = "workstation";
-      virtualization = { waydroid.enable = true; docker.enable = true; kvmHost = { enable = true; gui = true; }; };
-      services =
-      {
-        snapper.enable = false;
-        fontconfig.enable = true;
-        sshd = { enable = true; passwordAuthentication = true; };
-        xray.client =
-        {
-          enable = true;
-          serverAddress = "74.211.99.69";
-          serverName = "vps6.xserver.chn.moe";
-          dns.extraInterfaces = [ "docker0" ];
-        };
-        firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
-        smartd.enable = true;
-        beesd =
-        {
-          enable = false;
-          instances =
-          {
-            root = { device = "/"; hashTableSizeMB = 16384; threads = 4; };
-            nix = { device = "/nix"; hashTableSizeMB = 512; };
-          };
-        };
-        wireguard =
-        {
-          enable = true;
-          peers = [ "vps6" ];
-          publicKey = "JEY7D4ANfTpevjXNvGDYO6aGwtBGRXsf/iwNwjwDRQk=";
-          wireguardIp = "192.168.83.6";
-        };
-        slurm =
-        {
-          enable = true;
-          cpu = { cores = 16; threads = 2; };
-          memoryMB = 94208;
-          gpus = { "3090" = 1; "4090" = 1; };
-        };
-        xrdp = { enable = true; hostname = [ "xmupc1.chn.moe" ]; };
-        samba =
-        {
-          enable = true;
-          hostsAllowed = "192.168. 127.";
-          shares = { home.path = "/home"; root.path = "/"; };
-        };
-      };
-      bugs = [ "xmunet" "amdpstate" ];
-      users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
-    };
-    services.hardware.bolt.enable = true;
-  };
-}
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
  inputs =
  {
    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable";
    nixpkgs-2305.url = "github:CHN-beta/nixpkgs/nixos-23.05";
    home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; };
    sops-nix =
@@ -13,7 +13,7 @@
      inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; };
    };
    aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs-unstable"; };
+    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; };
    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"; };
@@ -24,15 +24,13 @@
      inputs = { nixpkgs.follows = "nixpkgs"; nix-index-database.follows = "nix-index-database"; };
    };
    impermanence.url = "github:nix-community/impermanence";
-    qchem = { url = "github:Nix-QChem/NixOS-QChem/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; };
+    qchem = { url = "github:Nix-QChem/NixOS-QChem"; inputs.nixpkgs.follows = "nixpkgs"; };
    nixd = { url = "github:nix-community/nixd"; inputs.nixpkgs.follows = "nixpkgs"; };
    napalm = { url = "github:nix-community/napalm"; inputs.nixpkgs.follows = "nixpkgs"; };
    nixpak = { url = "github:nixpak/nixpak"; inputs.nixpkgs.follows = "nixpkgs"; };
    deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; };
    pnpm2nix-nzbr = { url = "github:CHN-beta/pnpm2nix-nzbr"; inputs.nixpkgs.follows = "nixpkgs"; };
-    # oneapi
    lmix = { url = "github:CHN-beta/lmix"; inputs.nixpkgs.follows = "nixpkgs"; };
-    # nvhpc
    dguibert-nur-packages = { url = "github:CHN-beta/dguibert-nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
    plasma-manager =
    {
@@ -40,40 +38,11 @@
      inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
    };
    nix-doom-emacs = { url = "github:nix-community/nix-doom-emacs"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nixos-hardware.url = "github:CHN-beta/nixos-hardware";
-    envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nix-fast-build = { url = "github:/Mic92/nix-fast-build"; inputs.nixpkgs.follows = "nixpkgs"; };
-
-    misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; };
-    rsshub = { url = "github:DIYgod/RSSHub"; flake = false; };
-    zpp-bits = { url = "github:eyalz800/zpp_bits"; flake = false; };
-    citation-style-language = { url = "git+https://github.com/zepinglee/citeproc-lua?submodules=1"; flake = false; };
-    concurrencpp = { url = "github:David-Haim/concurrencpp"; flake = false; };
-    cppcoro = { url = "github:Garcia6l20/cppcoro"; flake = false; };
-    date = { url = "github:HowardHinnant/date"; flake = false; };
-    eigen = { url = "gitlab:libeigen/eigen"; flake = false; };
-    matplotplusplus = { url = "github:alandefreitas/matplotplusplus"; flake = false; };
-    nameof = { url = "github:Neargye/nameof"; flake = false; };
-    nodesoup = { url = "github:olvb/nodesoup"; flake = false; };
-    tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; flake = false; };
-    v-sim = { url = "gitlab:l_sim/v_sim"; flake = false; };
-    win11os-kde = { url = "github:yeyushengfan258/Win11OS-kde"; flake = false; };
-    fluent-kde = { url = "github:vinceliuice/Fluent-kde"; flake = false; };
-    rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; };
-    cascade = { url = "github:CHN-beta/cascade"; flake = false; };
-    blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; 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; };
  };

  outputs = inputs:
    let
      localLib = import ./local/lib inputs.nixpkgs.lib;
-      devices = builtins.attrNames (builtins.readDir ./devices);
    in
    {
      packages.x86_64-linux =
@@ -81,7 +50,7 @@
        default = inputs.nixpkgs.legacyPackages.x86_64-linux.writeText "systems"
          (builtins.concatStringsSep "\n" (builtins.map
            (system: builtins.toString inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel)
-            devices));
+            [ "pc" "vps6" "vps7" "nas" "yoga" "pe" ]));
      }
      // (
        builtins.listToAttrs (builtins.map
@@ -90,32 +59,504 @@
            name = system;
            value = inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel;
          })
-          devices)
+          [ "pc" "vps6" "vps7" "nas" "yoga" "pe" ])
      );
-      # 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;
+          name = system.name;
          value = inputs.nixpkgs.lib.nixosSystem
          {
            system = "x86_64-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; };})];
-              })
-              ./modules
-              ./devices/${system}
-            ];
+            (
+              [
+                (inputs: { config.nixpkgs.overlays = [(final: prev:
+                  { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; }); })]; })
+                ./modules
+              ]
+              ++ system.value
+            );
          };
        })
-        devices);
+        (localLib.attrsToList
+        {
+          pc =
+          [
+            (inputs: { config.nixos =
+            {
+              system =
+              {
+                fileSystems =
+                {
+                  mount =
+                  {
+                    vfat."/dev/disk/by-uuid/3F57-0EBE" = "/boot/efi";
+                    btrfs =
+                    {
+                      "/dev/disk/by-uuid/02e426ec-cfa2-4a18-b3a5-57ef04d66614"."/" = "/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/4be45329-a054-4c20-8965-8c5b7ee6b35d" =
+                      { mapper = "swap"; ssd = true; before = [ "root" ]; };
+                  };
+                  swap = [ "/dev/mapper/swap" ];
+                  resume = "/dev/mapper/swap";
+                  rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
+                };
+                grub =
+                {
+                  windowsEntries = { "7317-1DB6" = "Windows"; "7321-FA9C" = "Windows for malware"; };
+                  installDevice = "efi";
+                };
+                nix =
+                {
+                  marches =
+                  [
+                    "alderlake"
+                    # CX16
+                    "sandybridge"
+                    # CX16 SAHF FXSR
+                    "silvermont"
+                    # RDSEED MWAITX SHA CLZERO CX16 SSE4A ABM CLFLUSHOPT WBNOINVD
+                    "znver2" "znver3"
+                    # CX16 SAHF FXSR HLE RDSEED
+                    "broadwell"
+                  ];
+                  keepOutputs = true;
+                };
+                nixpkgs =
+                  { march = "alderlake"; cuda = { enable = true; capabilities = [ "8.6" ]; forwardCompat = false; }; };
+                gui = { enable = true; preferred = true; };
+                kernel.patches = [ "cjktty" ];
+                impermanence.enable = true;
+                networking.hostname = "pc";
+              };
+              hardware =
+              {
+                cpus = [ "intel" ];
+                gpus = [ "intel" "nvidia" ];
+                bluetooth.enable = true;
+                joystick.enable = true;
+                printer.enable = true;
+                sound.enable = true;
+                prime = { enable = true; mode = "offload"; busId = { intel = "PCI:0:2:0"; nvidia = "PCI:1:0:0"; }; };
+                gamemode.drmDevice = 1;
+              };
+              packages.packageSet = "workstation";
+              virtualization =
+              {
+                waydroid.enable = true;
+                docker.enable = true;
+                kvmHost = { enable = true; gui = true; autoSuspend = [ "win10" "hardconnect" ]; };
+                # kvmGuest.enable = true;
+                nspawn = [ "arch" "ubuntu-22.04" "fedora" ];
+              };
+              services =
+              {
+                snapper.enable = true;
+                fontconfig.enable = true;
+                samba =
+                {
+                  enable = true;
+                  private = true;
+                  hostsAllowed = "192.168. 127.";
+                  shares =
+                  {
+                    media.path = "/run/media/chn";
+                    home.path = "/home/chn";
+                    mnt.path = "/mnt";
+                    share.path = "/home/chn/share";
+                  };
+                };
+                sshd.enable = true;
+                xrayClient =
+                {
+                  enable = true;
+                  serverAddress = "74.211.99.69";
+                  serverName = "vps6.xserver.chn.moe";
+                  dns =
+                  {
+                    extraInterfaces = [ "docker0" ];
+                    hosts =
+                    {
+                      "mirism.one" = "74.211.99.69";
+                      "beta.mirism.one" = "74.211.99.69";
+                      "ng01.mirism.one" = "74.211.99.69";
+                      "debug.mirism.one" = "127.0.0.1";
+                      "initrd.vps6.chn.moe" = "74.211.99.69";
+                      "nix-store.chn.moe" = "127.0.0.1";
+                      "initrd.nas.chn.moe" = "192.168.1.185";
+                    };
+                  };
+                };
+                firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
+                acme = { enable = true; cert."debug.mirism.one" = {}; };
+                frpClient =
+                {
+                  enable = true;
+                  serverName = "frp.chn.moe";
+                  user = "pc";
+                  stcpVisitor."yy.vnc".localPort = 6187;
+                };
+                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 = 2048; }; };
+                wireguard = { enable = true; peers = [ "vps6" ]; };
+              };
+              bugs =
+              [
+                "intel-hdmi" "suspend-hibernate-no-platform" "hibernate-iwlwifi" "suspend-lid-no-wakeup" "xmunet"
+                "suspend-hibernate-waydroid" "embree"
+              ];
+            };})
+          ];
+          vps6 = 
+          [
+            (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" = "/"; };
+                    };
+                  };
+                  decrypt.manual =
+                  {
+                    enable = true;
+                    devices."/dev/disk/by-uuid/4f8aca22-9ec6-4fad-b21a-fd9d8d0514e8" = { mapper = "root"; ssd = true; };
+                    delayedMount = [ "/" ];
+                  };
+                  swap = [ "/nix/swap/swap" ];
+                  rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
+                };
+                grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
+                nixpkgs.march = "sandybridge";
+                nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
+                initrd.sshd.enable = true;
+                impermanence.enable = true;
+                networking.hostname = "vps6";
+              };
+              packages.packageSet = "server";
+              services =
+              {
+                snapper.enable = true;
+                sshd.enable = true;
+                xrayServer = { enable = true; serverName = "vps6.xserver.chn.moe"; };
+                frpServer = { enable = true; serverName = "frp.chn.moe"; };
+                nginx =
+                {
+                  streamProxy.map =
+                  {
+                    "anchor.fm" = { upstream = "anchor.fm:443"; proxyProtocol = false; };
+                    "podcasters.spotify.com" = { upstream = "podcasters.spotify.com:443"; proxyProtocol = false; };
+                    "xlog.chn.moe" = { upstream = "cname.xlog.app:443"; proxyProtocol = false; };
+                  }
+                  // (builtins.listToAttrs (builtins.map
+                    (site: { name = "${site}.chn.moe"; value.upstream.address = "wireguard.pc.chn.moe"; })
+                    [ "nix-store" "xn--qbtm095lrg0bfka60z" ]))
+                  // (builtins.listToAttrs (builtins.map
+                    (site: { name = "${site}.chn.moe"; value.upstream.address = "wireguard.vps7.chn.moe"; })
+                    [ "xn--s8w913fdga" "misskey" "synapse" "send" "kkmeeting" "api" "gitlab" "grafana" ]));
+                  applications =
+                  {
+                    element.instances."element.chn.moe" = {};
+                    synapse-admin.instances."synapse-admin.chn.moe" = {};
+                    catalog.enable = true;
+                    blog.enable = true;
+                  };
+                };
+                coturn.enable = true;
+                httpua.enable = true;
+                mirism.enable = true;
+                fail2ban.enable = true;
+                wireguard = { enable = true; peers = [ "pc" "nas" "vps7" ]; };
+              };
+            };})
+          ];
+          vps7 =
+          [
+            (inputs: { config.nixos =
+            {
+              system =
+              {
+                fileSystems =
+                {
+                  mount =
+                  {
+                    btrfs =
+                    {
+                      "/dev/disk/by-uuid/e36287f7-7321-45fa-ba1e-d126717a65f0"."/boot" = "/boot";
+                      "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+                    };
+                  };
+                  decrypt.manual =
+                  {
+                    enable = true;
+                    devices."/dev/disk/by-uuid/db48c8de-bcf7-43ae-a977-60c4f390d5c4" = { mapper = "root"; ssd = true; };
+                    delayedMount = [ "/" ];
+                  };
+                  swap = [ "/nix/swap/swap" ];
+                  rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
+                };
+                grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
+                nixpkgs.march = "broadwell";
+                nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
+                initrd.sshd.enable = true;
+                impermanence.enable = true;
+                networking.hostname = "vps7";
+                gui.enable = true;
+              };
+              packages.packageSet = "desktop";
+              services =
+              {
+                snapper.enable = true;
+                fontconfig.enable = true;
+                sshd.enable = true;
+                rsshub.enable = true;
+                wallabag.enable = true;
+                misskey.instances =
+                {
+                  misskey.hostname = "xn--s8w913fdga.chn.moe";
+                  misskey-old = { port = 9727; redis.port = 3546; meilisearch.enable = false; };
+                };
+                synapse.enable = true;
+                xrdp = { enable = true; hostname = [ "vps7.chn.moe" ]; };
+                vaultwarden.enable = true;
+                beesd = { enable = true; 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;
+                nginx.applications = { kkmeeting.enable = true; webdav.instances."webdav.chn.moe" = {}; };
+                httpapi.enable = true;
+                mastodon.enable = true;
+                gitlab.enable = true;
+                grafana.enable = true;
+                fail2ban.enable = true;
+                wireguard = { enable = true; peers = [ "vps6" ]; };
+              };
+            };})
+          ];
+          nas =
+          [
+            (inputs: { config.nixos =
+            {
+              system =
+              {
+                fileSystems =
+                {
+                  mount =
+                  {
+                    vfat."/dev/disk/by-uuid/13BC-F0C9" = "/boot/efi";
+                    btrfs =
+                    {
+                      "/dev/disk/by-uuid/0e184f3b-af6c-4f5d-926a-2559f2dc3063"."/boot" = "/boot";
+                      "/dev/mapper/nix"."/nix" = "/nix";
+                      "/dev/mapper/root1" =
+                      {
+                        "/nix/rootfs" = "/nix/rootfs";
+                        "/nix/persistent" = "/nix/persistent";
+                        "/nix/nodatacow" = "/nix/nodatacow";
+                        "/nix/rootfs/current" = "/";
+                        "/nix/backup" = "/nix/backup";
+                      };
+                    };
+                  };
+                  decrypt.manual =
+                  {
+                    enable = true;
+                    devices =
+                    {
+                      "/dev/disk/by-uuid/5cf1d19d-b4a5-4e67-8e10-f63f0d5bb649".mapper = "root1";
+                      "/dev/disk/by-uuid/aa684baf-fd8a-459c-99ba-11eb7636cb0d".mapper = "root2";
+                      "/dev/disk/by-uuid/a779198f-cce9-4c3d-a64a-9ec45f6f5495" = { mapper = "nix"; ssd = true; };
+                    };
+                    delayedMount = [ "/" "/nix" ];
+                  };
+                  swap = [ "/nix/swap/swap" ];
+                  rollingRootfs = { device = "/dev/mapper/root1"; path = "/nix/rootfs"; };
+                };
+                initrd.sshd.enable = true;
+                grub.installDevice = "efi";
+                nixpkgs.march = "silvermont";
+                nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
+                kernel.patches = [ "cjktty" ];
+                impermanence.enable = true;
+                networking.hostname = "nas";
+                gui.enable = true;
+              };
+              hardware = { cpus = [ "intel" ]; gpus = [ "intel" ]; };
+              packages.packageSet = "desktop";
+              services =
+              {
+                snapper.enable = true;
+                fontconfig.enable = true;
+                samba =
+                {
+                  enable = true;
+                  hostsAllowed = "192.168. 127.";
+                  shares = { home.path = "/home"; root.path = "/"; };
+                };
+                sshd = { enable = true; passwordAuthentication = true; };
+                xrayClient =
+                {
+                  enable = true;
+                  serverAddress = "74.211.99.69";
+                  serverName = "vps6.xserver.chn.moe";
+                  dns.extraInterfaces = [ "docker0" ];
+                };
+                xrdp = { enable = true; hostname = [ "nas.chn.moe" "office.chn.moe" ]; };
+                groupshare.enable = true;
+                smartd.enable = true;
+                beesd =
+                {
+                  enable = true;
+                  instances =
+                  {
+                    root = { device = "/"; hashTableSizeMB = 2048; };
+                    nix = { device = "/nix"; hashTableSizeMB = 128; };
+                  };
+                };
+                frpClient =
+                {
+                  enable = true;
+                  serverName = "frp.chn.moe";
+                  user = "nas";
+                  stcp.hpc = { localIp = "hpc.xmu.edu.cn"; localPort = 22; };
+                };
+                nginx = { enable = true; applications.webdav.instances."local.webdav.chn.moe" = {}; };
+                wireguard = { enable = true; peers = [ "vps6" ]; };
+              };
+              users.users = [ "chn" "xll" "zem" "yjq" "yxy" ];
+            };})
+          ];
+          yoga =
+          [
+            (inputs: { config.nixos =
+            {
+              system =
+              {
+                fileSystems =
+                {
+                  mount =
+                  {
+                    vfat."/dev/disk/by-uuid/86B8-CF80" = "/boot/efi";
+                    btrfs =
+                    {
+                      "/dev/disk/by-uuid/e252f81d-b4b3-479f-8664-380a9b73cf83"."/boot" = "/boot";
+                      "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+                    };
+                  };
+                  decrypt.auto."/dev/disk/by-uuid/8186d34e-005c-4461-94c7-1003a5bd86c0" =
+                    { mapper = "root"; ssd = true; };
+                  swap = [ "/nix/swap/swap" ];
+                  rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
+                };
+                nixpkgs.march = "silvermont";
+                gui.enable = true;
+                grub.installDevice = "efi";
+                nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
+                kernel.patches = [ "cjktty" ];
+                impermanence.enable = true;
+                networking.hostname = "yoga";
+              };
+              hardware =
+              {
+                cpus = [ "intel" ];
+                gpus = [ "intel" ];
+                bluetooth.enable = true;
+                joystick.enable = true;
+                printer.enable = true;
+                sound.enable = true;
+                halo-keyboard.enable = true;
+              };
+              packages.packageSet = "desktop-fat";
+              virtualization.docker.enable = true;
+              services =
+              {
+                snapper.enable = true;
+                fontconfig.enable = true;
+                sshd.enable = true;
+                xrayClient =
+                {
+                  enable = true;
+                  serverAddress = "74.211.99.69";
+                  serverName = "vps6.xserver.chn.moe";
+                  dns.extraInterfaces = [ "docker0" ];
+                };
+                firewall.trustedInterfaces = [ "virbr0" ];
+              };
+              bugs = [ "xmunet" ];
+            };})
+          ];
+          pe =
+          [
+            (inputs: { config.nixos =
+            {
+              system =
+              {
+                fileSystems =
+                {
+                  mount =
+                  {
+                    vfat."/dev/disk/by-uuid/86B8-CF80" = "/boot/efi";
+                    btrfs =
+                    {
+                      "/dev/disk/by-uuid/e252f81d-b4b3-479f-8664-380a9b73cf83"."/boot" = "/boot";
+                      "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+                    };
+                  };
+                  swap = [ "/nix/swap/swap" ];
+                  rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
+                };
+                gui.enable = true;
+                grub.installDevice = "efiRemovable";
+                nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
+                kernel.patches = [ "cjktty" ];
+                impermanence.enable = true;
+                networking.hostname = "pe";
+              };
+              hardware =
+              {
+                cpus = [ "intel" "amd" ];
+                gpus = [ "intel" "amd" "nvidia" ];
+                bluetooth.enable = true;
+                joystick.enable = true;
+                printer.enable = true;
+                sound.enable = true;
+              };
+              packages.packageSet = "desktop";
+              services =
+              {
+                fontconfig.enable = true;
+                sshd.enable = true;
+                xrayClient =
+                {
+                  enable = true;
+                  serverAddress = "74.211.99.69";
+                  serverName = "vps6.xserver.chn.moe";
+                  dns.extraInterfaces = [ "docker0" ];
+                };
+              };
+              bugs = [ "xmunet" ];
+            };})
+          ];
+        }));
      # 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
@@ -151,12 +592,10 @@
                inputs.self.nixosConfigurations.${node};
            };
          })
-          [ "vps6" "vps7" "nas" "surface" "xmupc1" ]
-        );
+          [ "vps6" "vps7" "nas" "yoga" ]);
      };
      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; }); };
-      config.archive = false;
    };
 }
--- a/local/lib/default.nix
+++ b/local/lib/default.nix
@@ -1,6 +1,6 @@
 lib:
 {
-  attrsToList = attrs: builtins.map (name: { inherit name; value = attrs.${name}; }) (builtins.attrNames attrs);
+  attrsToList = Attrs: builtins.map ( name: { inherit name; value = Attrs.${name}; } ) ( builtins.attrNames Attrs );
  mkConditional = condition: trueResult: falseResult: let inherit (lib) mkMerge mkIf; in
    mkMerge [ ( mkIf condition trueResult ) ( mkIf (!condition) falseResult ) ];

--- a/local/pkgs/aocc/default.nix
+++ b/local/pkgs/aocc/default.nix
@@ -1 +0,0 @@
-1k9anln9hmdjflrkq4iacrmhma7gfrfj6d0b8ywxys0wfpdvy12v
--- a/local/pkgs/blurred-wallpaper/default.nix
+++ b/local/pkgs/blurred-wallpaper/default.nix
@@ -1,11 +0,0 @@
-{ stdenv, src }: stdenv.mkDerivation
-{
-  name = "blurred-wallpaper";
-  inherit src;
-  phases = [ "installPhase" ];
-  installPhase =
-  ''
-    mkdir -p $out/share/plasma/wallpapers/a2n.blur
-    cp -r $src/* $out/share/plasma/wallpapers/a2n.blur
-  '';
-}
--- a/local/pkgs/citation-style-language/default.nix
+++ b/local/pkgs/citation-style-language/default.nix
@@ -1,14 +1,22 @@
-{ stdenvNoCC, texlive, src }: stdenvNoCC.mkDerivation (finalAttrs:
+{ stdenvNoCC, texlive, fetchFromGitHub }: stdenvNoCC.mkDerivation (finalAttrs: rec
 {
-  name = "citation-style-language";
-  inherit src;
-  passthru =
-  {
+  pname = "citation-style-language";
+  version = "0.4.5";
+  passthru = {
    pkgs = [ finalAttrs.finalPackage ];
    tlDeps = with texlive; [ latex ];
    tlType = "run";
  };

+  src = fetchFromGitHub
+  {
+    owner = "zepinglee";
+    repo = "citeproc-lua";
+    rev = "v${version}";
+    sha256 = "XH+GH+t/10hr4bfaod8F9JPxmBnAQlDmpSvQNDQsslM=";
+    fetchSubmodules = true;
+  };
+
  nativeBuildInputs = [ texlive.combined.scheme-full ];
  dontConfigure = true;
  dontBuild = true;
--- a/local/pkgs/concurrencpp/default.nix
+++ b/local/pkgs/concurrencpp/default.nix
@@ -1,6 +1,13 @@
-{ stdenv, cmake, src }: stdenv.mkDerivation
+{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec
 {
-  name = "concurrencpp";
-  inherit src;
+  pname = "concurrencpp";
+  version = "0.1.7";
+  src = fetchFromGitHub
+  {
+    owner = "David-Haim";
+    repo = "concurrencpp";
+    rev = "v.${version}";
+    sha256 = "4qT29YVjKEWcMrI5R5Ps8aD4grAAgz5VOxANjpp1oTo=";
+  };
  nativeBuildInputs = [ cmake ];
 }
--- a/local/pkgs/cppcoro/default.nix
+++ b/local/pkgs/cppcoro/default.nix
@@ -1,7 +1,13 @@
-{ stdenv, cmake, src }: stdenv.mkDerivation
+{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation
 {
  name = "cppcoro";
-  inherit src;
+  src = fetchFromGitHub
+  {
+    owner = "Garcia6l20";
+    repo = "cppcoro";
+    rev = "e1d53e620b0eee828915ada179cd7ca8e66ca855";
+    sha256 = "luBkf1x5kqXaVbQM01yWRmA5QvrQNZkFVCjRctJdnXc=";
+  };
  nativeBuildInputs = [ cmake ];
  patches = [ ./cppcoro-include-utility.patch ];
 }
--- a/local/pkgs/date/default.nix
+++ b/local/pkgs/date/default.nix
@@ -1,13 +1,18 @@
-{ stdenv, src }: stdenv.mkDerivation
+{ stdenv, fetchFromGitHub }: stdenv.mkDerivation
 {
  name = "date";
-  inherit src;
+  src = fetchFromGitHub
+  {
+    owner = "HowardHinnant";
+    repo = "date";
+    rev = "cc4685a21e4a4fdae707ad1233c61bbaff241f93";
+    sha256 = "KilhBEeLMvHtS76Gu0UhzE8lhS1+sCwQ1UL4pswKXTs=";
+  };
  phases = [ "installPhase" ];
  installPhase =
  ''
    runHook preInstall
    mkdir -p $out
    cp -r $src/{include,src} $out
-    runHook postInstall
  '';
 }
--- a/local/pkgs/default.nix
+++ b/local/pkgs/default.nix
@@ -1,69 +1,48 @@
-{ lib, pkgs, topInputs }: with pkgs; rec
+{ lib, pkgs }: with pkgs; rec
 {
  typora = callPackage ./typora {};
  vesta = callPackage ./vesta {};
-  rsshub = callPackage ./rsshub { src = topInputs.rsshub; };
-  misskey = callPackage ./misskey { nodejs = nodejs_21; src = topInputs.misskey; };
+  oneapi = callPackage ./oneapi {};
+  rsshub = callPackage ./rsshub {};
+  misskey = callPackage ./misskey {};
  mk-meili-mgn = callPackage ./mk-meili-mgn {};
+  # vasp = callPackage ./vasp
+  # {
+  #   stdenv = pkgs.lmix-pkgs.intel21Stdenv;
+  #   intel-mpi = pkgs.lmix-pkgs.intel-oneapi-mpi_2021_9_0;
+  #   ifort = pkgs.lmix-pkgs.intel-oneapi-ifort_2021_9_0;
+  # };
+  vasp = callPackage ./vasp
+  {
+    openmp = llvmPackages.openmp;
+    openmpi = pkgs.openmpi.override { cudaSupport = false; };
+  };
  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; };
+  v_sim = callPackage ./v_sim {};
+  concurrencpp = callPackage ./concurrencpp { stdenv = gcc13Stdenv; };
  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; };
+  nodesoup = callPackage ./nodesoup {};
+  matplotplusplus = callPackage ./matplotplusplus { inherit nodesoup glad; };
+  zpp-bits = callPackage ./zpp-bits {};
+  eigen = callPackage ./eigen {};
+  nameof = callPackage ./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; };
+  tgbot-cpp = callPackage ./tgbot-cpp {};
  biu = callPackage ./biu { inherit concurrencpp tgbot-cpp nameof; stdenv = gcc13Stdenv; };
-  citation-style-language = callPackage ./citation-style-language { src = topInputs.citation-style-language; };
+  citation-style-language = callPackage ./citation-style-language {};
  mirism = callPackage ./mirism
  {
    inherit cppcoro nameof tgbot-cpp date;
    nghttp2 = nghttp2-2305.override { enableAsioLib = true; };
  };
-  cppcoro = callPackage ./cppcoro { src = topInputs.cppcoro; };
-  date = callPackage ./date { src = topInputs.date; };
+  cppcoro = callPackage ./cppcoro {};
+  date = callPackage ./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 =
-  {
-    source = callPackage ./vasp/source.nix {};
-    gnu = callPackage ./vasp/gnu
-    {
-      inherit (llvmPackages) openmp;
-      inherit (unstablePackages) wannier90;
-      hdf5 = hdf5.override { mpiSupport = true; fortranSupport = true; };
-    };
-    nvidia = callPackage ./vasp/nvidia
-    {
-      inherit lmod;
-      nvhpc = nvhpc."24.1";
-      hdf5 = hdf5-nvhpc.override { nvhpc = nvhpc."24.1"; };
-      inherit (unstablePackages) wannier90;
-    };
-    intel = callPackage ./vasp/intel
-    {
-      inherit lmod;
-      oneapi = oneapi."2022.2";
-      hdf5 = hdf5.override { mpiSupport = true; fortranSupport = true; };
-      inherit (unstablePackages) wannier90;
-    };
-  };
-  hdf5-nvhpc = callPackage ./hdf5-nvhpc { inherit lmod; inherit (hdf5) src; nvhpc = nvhpc."24.1"; };
-  oneapi = callPackage ./oneapi {};
-  mumax = callPackage ./mumax { src = topInputs.mumax; };
 }
--- a/local/pkgs/eigen/default.nix
+++ b/local/pkgs/eigen/default.nix
@@ -1,6 +1,12 @@
-{ lib, stdenv, cmake, src }: stdenv.mkDerivation
+{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec
 {
  name = "eigen";
-  inherit src;
+  src = fetchFromGitLab
+  {
+    owner = "libeigen";
+    repo = name;
+    rev = "6d829e766ff1b1ab867d93631163cbc63ed5798f";
+    sha256 = "BXUnizcRPrOyiPpoyYJ4VVOjlG49aj80mgzPKmEYPKU=";
+  };
  nativeBuildInputs = [ cmake ];
 }
--- a/local/pkgs/esbonio/default.nix
+++ b/local/pkgs/esbonio/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec
 {
  pname = "esbonio";
-  version = "0.16.4";
+  version = "0.16.3";
  src = fetchPypi
  {
    inherit pname version;
-    sha256 = "1MBNBLCEBD6HtlxEASc4iZaXYyNdih2MIHoxK84jMdI=";
+    sha256 = "1ggxdzl95fy0zxpyd1pcylhif1x604wk4wy7sv9322hc84b708zx";
  };
  doCheck = false;
 }
--- a/local/pkgs/fluent-kde/default.nix
+++ b/local/pkgs/fluent-kde/default.nix
@@ -1,22 +0,0 @@
-{ lib, stdenv, src }: stdenv.mkDerivation
-{
-  name = "fluent-kde";
-  inherit src;
-  installPhase =
-  ''
-    mkdir -p $out/share/aurorae/themes
-    cp -r $src/aurorae/* $out/share/aurorae/themes
-    mkdir -p $out/share/color-schemes
-    cp -r $src/color-schemes/*.colors $out/share/color-schemes
-    mkdir -p $out/share/Kvantum
-    cp -r $src/Kvantum/Fluent* $out/share/Kvantum
-    mkdir -p $out/share/plasma/desktoptheme
-    cp -r $src/plasma/desktoptheme/* $out/share/plasma/desktoptheme
-    mkdir -p $out/share/plasma/layout-templates
-    cp -r $src/plasma/layout-templates/* $out/share/plasma/layout-templates
-    mkdir -p $out/share/plasma/look-and-feel
-    cp -r $src/plasma/look-and-feel/com.github.vinceliuice.Fluent* $out/share/plasma/look-and-feel
-    mkdir -p $out/share/wallpapers
-    cp -r $src/wallpaper/* $out/share/wallpapers
-  '';
-}
--- a/local/pkgs/hdf5-nvhpc/default.nix
+++ b/local/pkgs/hdf5-nvhpc/default.nix
@@ -1,40 +0,0 @@
-{
-  buildFHSEnv, writeScript, stdenvNoCC,
-  src,
-  nvhpc, lmod, cmake, gfortran,
-  config, nvhpcArch ? config.nvhpcArch or "px"
-}:
-let
-  buildEnv = buildFHSEnv
-  {
-    name = "buildEnv";
-    targetPkgs = pkgs: with pkgs; [ zlib ];
-    extraBwrapArgs = [ "--bind" "$out" "$out" ];
-  };
-  buildScript = writeScript "build"
-  ''
-    . ${lmod}/share/lmod/lmod/init/bash
-    module use ${nvhpc}/share/nvhpc/modulefiles
-    module load nvhpc
-    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=ON ..
-    make -j$NIX_BUILD_CORES
-    make install
-  '';
-in stdenvNoCC.mkDerivation
-{
-  name = "hdf5-nvhpc";
-  inherit src;
-  dontConfigure = true;
-  enableParallelBuilding = true;
-  nativeBuildInputs = [ cmake gfortran ];
-  buildPhase =
-  ''
-    mkdir -p $out
-    ${buildEnv}/bin/buildEnv ${buildScript}
-  '';
-  dontInstall = true;
-  requiredSystemFeatures = [ "nvhpcarch-${nvhpcArch}" ];
-}
--- a/local/pkgs/lmod/default.nix
+++ b/local/pkgs/lmod/default.nix
@@ -1,14 +0,0 @@
-{
-  stdenv, src,
-  tcl,
-  procps, bc, lua
-}:
-stdenv.mkDerivation
-{
-  name = "lmod";
-  inherit src;
-  buildInputs = [ tcl ];
-  nativeBuildInputs = [ procps bc (lua.withPackages (ps: with ps; [ luaposix ])) ];
-  configurePhase = ''./configure --prefix=$out/share'';
-  postUnpack = "patchShebangs .";
-}
--- a/local/pkgs/matplotplusplus/default.nix
+++ b/local/pkgs/matplotplusplus/default.nix
@@ -1,10 +1,17 @@
 {
-  stdenv, src, cmake, pkg-config, substituteAll,
+  stdenv, fetchFromGitHub, cmake, pkg-config, substituteAll,
  gnuplot, libjpeg, libtiff, zlib, libpng, lapack, blas, fftw, opencv, nodesoup, cimg, glfw, libGL, python3, glad
 }: stdenv.mkDerivation
 {
-  name = "matplotplusplus";
-  inherit src;
+  pname = "matplotplusplus";
+  version = "1.2.0";
+  src = fetchFromGitHub
+  {
+    owner = "alandefreitas";
+    repo = "matplotplusplus";
+    rev = "a40344efa9dc5ea0c312e6e9ef4eb7238d98dc12";
+    sha256 = "6/dH/Rl2aAb8b+Ji5LwzkC+GWPOCBnYCrjy0qk8u/+I=";
+  };
  cmakeFlags =
  [
    "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF"
--- a/local/pkgs/mirism/default.nix
+++ b/local/pkgs/mirism/default.nix
@@ -8,7 +8,7 @@
  src = requireFile
  {
    inherit name;
-    sha256 = "0f50pvdafhlmrlbf341mkp9q50v4ld5pbx92d2w1633f18zghbzf";
+    sha256 = "1q3f4q4ln9dz68dfc35jybgv861f7acqiiykkm7jxviz8jdgn8c7";
    hashMode = "recursive";
    message = "Source file not found.";
  };
--- a/local/pkgs/misskey/default.nix
+++ b/local/pkgs/misskey/default.nix
@@ -1,38 +1,95 @@
 {
-  lib, stdenv, mkPnpmPackage, fetchurl, nodejs, writeShellScript, buildFHSEnv,
-  bash, cypress, vips, pkg-config, src
+  lib, stdenv, mkPnpmPackage, fetchFromGitHub, fetchurl, nodejs_20, writeShellScript, buildFHSEnv,
+  bash, cypress, vips, pkg-config
 }:
 let
-  name = "misskey";
+  pname = "misskey";
+  version = "2023.11.1";
+  src = fetchFromGitHub
+  {
+    owner = "CHN-beta";
+    repo = "misskey";
+    rev = "1e5134816cc23600a0448a62b34aadfe573c3bbc";
+    sha256 = "ihkFVTpwEELmxAw4Lw01pWr8j6u2oLpfcw3laVUFCO4=";
+    fetchSubmodules = true;
+  };
  originalPnpmPackage = mkPnpmPackage
  {
-    inherit name src nodejs;
+    inherit pname version src;
+    nodejs = nodejs_20;
    copyPnpmStore = true;
-    extraIntegritySha256."https://github.com/aiscript-dev/aiscript-languageserver/releases/download/0.1.5/aiscript-dev-aiscript-languageserver-0.1.5.tgz" = "1mhnwa8h48bc21f0zv8q93aphiqz9i70r7m4xsa4sd1mlncfgyl7";
  };
  startScript = writeShellScript "misskey"
  ''
-    export PATH=${lib.makeBinPath [ bash nodejs nodejs.pkgs.pnpm nodejs.pkgs.gulp cypress ]}:$PATH
+    export PATH=${lib.makeBinPath [ bash nodejs_20 nodejs_20.pkgs.pnpm nodejs_20.pkgs.gulp cypress ]}:$PATH
    export CYPRESS_RUN_BINARY="${cypress}/bin/Cypress"
    export NODE_ENV=production
    pnpm run migrateandstart
  '';
+  re2 = stdenv.mkDerivation rec
+  {
+    pname = "re2";
+    version = "1.20.8";
+    srcs =
+    [
+      (fetchurl
+      {
+        url = "https://github.com/uhop/node-re2/releases/download/1.20.8/linux-x64-120.br";
+        sha256 = "0f2l658xxc2112mbqpkyfic3vhjgdyafbfi14b6n40skyd6lijcq";
+      })
+      (fetchurl
+      {
+        url = "https://github.com/uhop/node-re2/releases/download/1.20.8/linux-x64-120.gz";
+        sha256 = "1v5n8i16188xpwx1jr8gcc1a99v83hlbh5hldl4i376vh0lwsxlq";
+      })
+      (fetchurl
+      {
+        url = "https://github.com/uhop/node-re2/releases/download/1.20.8/linux-x64-115.br";
+        sha256 = "0cyqmgqk5cwik27wh4ynaf94v4w6p1fsavm07xh8xfmdim2sr9kd";
+      })
+      (fetchurl
+      {
+        url = "https://github.com/uhop/node-re2/releases/download/1.20.8/linux-x64-115.gz";
+        sha256 = "0i3iykw13d5qfd5s6pq6kx6cbd64vfb3w65f9bnj87qz44la84ic";
+      })
+      (fetchurl
+      {
+        url = "https://github.com/uhop/node-re2/releases/download/1.20.8/linux-x64-108.br";
+        sha256 = "1467frfapqhi839r2v0p0wh76si3lihwzwgl9098mj7mwhjfl4lx";
+      })
+      (fetchurl
+      {
+        url = "https://github.com/uhop/node-re2/releases/download/1.20.8/linux-x64-108.gz";
+        sha256 = "0hykpqdrn55x83v1kzz6bdvrp24hgz3rwmwbdfl2saz576krzg1c";
+      })
+    ];
+    phases = [ "installPhase" ];
+    installPhase =
+    ''
+      mkdir -p $out/${version}
+      for i in $srcs
+      do
+        cp $i $out/${version}/''${i#*-}
+      done
+    '';
+  };
 in
  stdenv.mkDerivation rec
  {
-    inherit src name;
+    inherit version src pname;
    buildInputs =
    [
-      bash nodejs nodejs.pkgs.typescript nodejs.pkgs.pnpm nodejs.pkgs.gulp cypress vips pkg-config
+      bash nodejs_20 nodejs_20.pkgs.typescript nodejs_20.pkgs.pnpm nodejs_20.pkgs.gulp cypress vips pkg-config
    ];
    nativeBuildInputs = buildInputs;
    CYPRESS_RUN_BINARY = "${cypress}/bin/Cypress";
    NODE_ENV = "production";
+    RE2_DOWNLOAD_MIRROR = "${re2}";
+    RE2_DOWNLOAD_SKIP_PATH = "true";
    configurePhase =
    ''
      export HOME=$NIX_BUILD_TOP # Some packages need a writable HOME
-      export npm_config_nodedir=${nodejs}
-      pnpm config set reporter append-only
+      export npm_config_nodedir=${nodejs_20}

      runHook preConfigure

@@ -64,6 +121,6 @@ in
    '';
    passthru =
    {
-      inherit originalPnpmPackage startScript;
+      inherit originalPnpmPackage startScript re2;
    };
  }
--- a/local/pkgs/mumax/default.nix
+++ b/local/pkgs/mumax/default.nix
@@ -1,22 +0,0 @@
-{ buildGoModule, cudatoolkit, src, config, cudaCapabilities ? config.cudaCapabilities, gcc, makeWrapper }:
-# TODO: use addDriverRunpath
-buildGoModule
-{
-  name = "mumax";
-  inherit src;
-  vendorHash = null;
-  nativeBuildInputs = [ cudatoolkit gcc makeWrapper ];
-  CUDA_CC = builtins.concatStringsSep " " cudaCapabilities;
-  CPATH = "${cudatoolkit}/include";
-  LIBRARY_PATH = "${cudatoolkit}/lib/stubs";
-  doCheck = false;
-  postInstall =
-  ''
-    rm $out/bin/{doc,test}
-    for i in $out/bin/*; do
-      if [ -f $i ]; then
-        wrapProgram $i --prefix LD_LIBRARY_PATH ":" "/run/opengl-driver/lib:${cudatoolkit}/lib"
-      fi
-    done
-  '';
-}
--- a/local/pkgs/nameof/default.nix
+++ b/local/pkgs/nameof/default.nix
@@ -1,7 +1,14 @@
-{ lib, stdenv, src }: stdenv.mkDerivation
+{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec
 {
-  name = "nameof";
-  inherit src;
+  pname = "nameof";
+  version = "0.10.3";
+  src = fetchFromGitHub
+  {
+    owner = "Neargye";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "eHG0Y/BQGbwTrBHjq9SeSiIXaVqWp7PxIq7vCIECYPk=";
+  };
  phases = [ "installPhase" ];
  installPhase =
  ''
--- a/local/pkgs/nodesoup/default.nix
+++ b/local/pkgs/nodesoup/default.nix
@@ -1,7 +1,13 @@
-{ stdenv, src, cmake, pkg-config, cairo, pcre2, xorg }: stdenv.mkDerivation
+{ stdenv, fetchFromGitHub, cmake, pkg-config, cairo, pcre2, xorg }: stdenv.mkDerivation rec
 {
  name = "nodesoup";
-  inherit src;
+  src = fetchFromGitHub
+  {
+    owner = "olvb";
+    repo = "nodesoup";
+    rev = "3158ad082bb0cd1abee75418b12b35522dbca74f";
+    sha256 = "tFLq6QC3U3uvcuWsdRy2wnwcmAfH2MkI2oMcAiUBHSo=";
+  };
  buildInputs = [ cairo pcre2.dev xorg.libXdmcp.dev ];
  nativeBuildInputs = [ cmake pkg-config ];
 }
--- a/local/pkgs/nvhpc/default.nix
+++ b/local/pkgs/nvhpc/default.nix
@@ -1,42 +0,0 @@
-{
-  stdenvNoCC, fetchurl, buildFHSEnv,
-  gfortran, flock
-}:
-let
-  versions =
-  {
-    "24.1" = "1n0x1x7ywvr3623ylvrjagayn44mbvfas3c3062p7y3asmgjx697";
-    "23.1" = "1xg933f4n1bw39y1x1vrjrbzpx36sbmjgvi332hfck3dbx0n982m";
-  };
-  releaseName = version:
-    let versions = builtins.splitVersion version;
-    in "nvhpc_20${builtins.elemAt versions 0}_${builtins.concatStringsSep "" versions}_Linux_x86_64_cuda_multi";
-  builder = buildFHSEnv
-  {
-    name = "builder";
-    targetPkgs = pkgs: with pkgs; [ coreutils ];
-    extraBwrapArgs = [ "--bind" "$out" "$out" ];
-  };
-in let buildNvhpc = version: stdenvNoCC.mkDerivation
-{
-  pname = "nvhpc";
-  inherit version;
-  src = fetchurl
-  {
-    url = "https://developer.download.nvidia.com/hpc-sdk/${version}/${releaseName version}.tar.gz";
-    sha256 = versions.${version};
-  };
-  dontFixup = true;
-  dontBuild = true;
-  buildInputs = [ gfortran flock ];
-  installPhase =
-  ''
-    export NVHPC_SILENT=true
-    export NVHPC_INSTALL_TYPE=single
-    export NVHPC_INSTALL_DIR=$out/share/nvhpc
-    # $out should exist before bwrap
-    mkdir -p $out
-    ${builder}/bin/builder ./install
-  '';
-};
-in builtins.mapAttrs (version: _: buildNvhpc version) versions
--- a/local/pkgs/oneapi/default.nix
+++ b/local/pkgs/oneapi/default.nix
@@ -1,88 +0,0 @@
-{
-  stdenvNoCC, fetchurl, buildFHSEnv,
-  ncurses
-}:
-let
-  versions =
-  {
-    "2022.2" =
-    {
-      basekit =
-      {
-        id = "18673";
-        version = "2022.2.0.262";
-        sha256 = "03qx6sb58mkhc7iyc8va4y1ihj6l3155dxwmqj8dfw7j2ma7r5f6";
-        components =
-        [
-          "intel.oneapi.lin.dpcpp-ct"
-          "intel.oneapi.lin.dpcpp_dbg"
-          "intel.oneapi.lin.dpl"
-          "intel.oneapi.lin.tbb.devel"
-          "intel.oneapi.lin.ccl.devel"
-          "intel.oneapi.lin.dpcpp-cpp-compiler"
-          "intel.oneapi.lin.dpl"
-          "intel.oneapi.lin.mkl.devel"
-        ];
-      };
-      hpckit =
-      {
-        id = "18679";
-        version = "2022.2.0.191";
-        sha256 = "0swz4w9bn58wwqjkqhjqnkcs8k8ms9nn9s8k7j5w6rzvsa6817d2";
-      };
-    };
-    "2024.0" =
-    {
-      basekit =
-      {
-        id = "163da6e4-56eb-4948-aba3-debcec61c064";
-        version = "2024.0.1.46";
-        sha256 = "1sp1fgjv8xj8qxf8nv4lr1x5cxz7xl5wv4ixmfmcg0gyk28cjq1g";
-      };
-      hpckit =
-      {
-        id = "67c08c98-f311-4068-8b85-15d79c4f277a";
-        version = "2024.0.1.38";
-        sha256 = "06vpdz51w2v4ncgk8k6y2srlfbbdqdmb4v4bdwb67zsg9lmf8fp9";
-      };
-    };
-  };
-  builder = buildFHSEnv
-  {
-    name = "builder";
-    targetPkgs = pkgs: with pkgs; [ coreutils zlib ];
-    extraBwrapArgs = [ "--bind" "$out" "$out" ];
-    runScript = "sh";
-  };
-  componentString = components: if components == null then "--components default" else
-    " --components " + (builtins.concatStringsSep ":" components);
-in let buildOneapi = version: stdenvNoCC.mkDerivation rec
-{
-  pname = "oneapi";
-  inherit version;
-  basekit = fetchurl
-  {
-    url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${versions.${version}.basekit.id}/"
-      + "l_BaseKit_p_${versions.${version}.basekit.version}_offline.sh";
-    sha256 = versions.${version}.basekit.sha256;
-  };
-  hpckit = fetchurl
-  {
-    url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${versions.${version}.hpckit.id}/"
-      + "l_HPCKit_p_${versions.${version}.hpckit.version}_offline.sh";
-    sha256 = versions.${version}.hpckit.sha256;
-  };
-  phases = [ "installPhase" ];
-  nativeBuildInputs = [ ncurses ];
-  installPhase =
-  ''
-    mkdir -p $out
-    ${builder}/bin/builder ${basekit} -a --silent --eula accept --install-dir $out/share/intel \
-      ${componentString versions.${version}.basekit.components or null}
-    ${builder}/bin/builder ${hpckit} -a --silent --eula accept --install-dir $out/share/intel \
-      ${componentString versions.${version}.hpckit.components or null}
-    ${builder}/bin/builder $out/share/intel/modulefiles-setup.sh --output-dir=$out/share/intel/modulefiles \
-      --ignore-latest
-  '';
-};
-in builtins.mapAttrs (version: _: buildOneapi version) versions
--- a/local/pkgs/rsshub/default.nix
+++ b/local/pkgs/rsshub/default.nix
@@ -1,9 +1,16 @@
 {
-  lib, stdenv, mkPnpmPackage, nodejs, writeShellScript,
-  chromium, bash, src
+  lib, stdenv, mkPnpmPackage, fetchFromGitHub, nodejs, writeShellScript,
+  chromium, bash
 }:
 let
  name = "rsshub";
+  src = fetchFromGitHub
+  {
+    owner = "DIYgod";
+    repo = "RSSHub";
+    rev = "38a5b0c193bf77d71c4eea33db6e76bc8b565d0b";
+    hash = "sha256-gJsT9W2fFiy2IG89E5th49DpBHsPMfsdONyzAKDG48c=";
+  };
  originalPnpmPackage = mkPnpmPackage { inherit name src nodejs; };
  nodeModules = originalPnpmPackage.nodeModules.overrideAttrs { PUPPETEER_SKIP_DOWNLOAD = true; };
  rsshub-unwrapped = stdenv.mkDerivation
--- a/local/pkgs/slate/default.nix
+++ b/local/pkgs/slate/default.nix
@@ -1,10 +0,0 @@
-{ stdenv, src }: stdenv.mkDerivation
-{
-  name = "slate";
-  src = "${src}/Slate.tar.gz";
-  installPhase =
-  ''
-    mkdir -p $out/share/yakuake/skins/Slate
-    cp -r * $out/share/yakuake/skins/Slate
-  '';
-}
--- a/local/pkgs/tgbot-cpp/default.nix
+++ b/local/pkgs/tgbot-cpp/default.nix
@@ -1,7 +1,14 @@
-{ stdenv, src, cmake, pkg-config, boost, openssl, zlib, curl }: stdenv.mkDerivation rec
+{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, openssl, zlib, curl }: stdenv.mkDerivation rec
 {
-  name = "tgbot-cpp";
-  inherit src;
+  pname = "tgbot-cpp";
+  version = "1.7.2";
+  src = fetchFromGitHub
+  {
+    owner = "reo7sp";
+    repo = "tgbot-cpp";
+    rev = "v${version}";
+    sha256 = "TKirSxEUqFB1WtzNEfU4EJK3p7V5xcFIvA2+QVX7TlA=";
+  };
  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ boost openssl zlib curl.dev ];
  propagatedBuildInputs = buildInputs;
--- a/local/pkgs/typora/default.nix
+++ b/local/pkgs/typora/default.nix
@@ -3,11 +3,11 @@ let
  typora-dist = stdenv.mkDerivation rec
  {
    pname = "typora-dist";
-    version = "1.8.2-dev";
+    version = "1.7.6";
    src = fetchurl
    {
      url = "https://download.typora.io/linux/typora_${version}_amd64.deb";
-      sha256 = "0abi9m8h8k0228ajag26lxk756a7aqqixg608k85gnkdmibnq6mv";
+      sha256 = "19xgv83zk3mhniswwrb341sr9j4sb9pqy47jamrmkc3w8famxpd3";
    };

    dontFixup = true;
--- a/local/pkgs/v_sim/default.nix
+++ b/local/pkgs/v_sim/default.nix
@@ -1,12 +1,19 @@
 {
-  stdenv, lib, src,
+  stdenv, lib, fetchFromGitLab,
  wrapGAppsHook, autoreconfHook, autoconf, libtool, intltool, gettext, automake, gtk-doc, pkg-config, gfortran, libxslt,
  glib, gtk3, epoxy, libyaml
 }:
 stdenv.mkDerivation
 {
-  name = "v-sim";
-  inherit src;
+  pname = "v_sim";
+  version = "3.8.0_p20230824";
+  src = fetchFromGitLab
+  {
+    owner = "l_sim";
+    repo = "v_sim";
+    rev = "8abc67b56795c19a8e2357d442b556c71d2441cb";
+    sha256 = "KQNd3BGvkZVsfIPVLEEMBptiFQYeCbWGR28ds2Y+w2Y=";
+  };
  buildInputs = [ glib gtk3 epoxy libyaml ];
  nativeBuildInputs =
  [
--- a/local/pkgs/vasp/constr_cell_relax.F
+++ b/local/pkgs/vasp/constr_cell_relax.F
@@ -1,22 +0,0 @@
-SUBROUTINE CONSTR_CELL_RELAX(FCELL)
-  USE prec
-  REAL(q) FCELL(3,3)
-
-  LOGICAL FILFLG
-  INTEGER ICELL(3,3)
-  INQUIRE(FILE='OPTCELL',EXIST=FILFLG)
-  IF (FILFLG) THEN
-      OPEN(67,FILE='OPTCELL',FORM='FORMATTED',STATUS='OLD')
-      DO J=1,3
-        READ(67,"(3I1)") (ICELL(I,J),I=1,3)
-      ENDDO
-      CLOSE(67)
-      DO J=1,3
-      DO I=1,3
-        IF (ICELL(I,J)==0) FCELL(I,J)=0.0
-      ENDDO
-      ENDDO
-  ENDIF
-
-  RETURN
-END SUBROUTINE
--- a/local/pkgs/vasp/default.nix
+++ b/local/pkgs/vasp/default.nix
@@ -0,0 +1,77 @@
+# {
+#   stdenv, requireFile, config, rsync, intel-mpi, ifort,
+#   mkl
+# }:
+# stdenv.mkDerivation rec
+# {
+#   pname = "vasp";
+#   version = "6.4.0";
+#   # nix-store --query --hash $(nix store add-path ./vasp-6.4.0)
+#   src = requireFile
+#   {
+#     name = "${pname}-${version}";
+#     sha256 = "189i1l5q33ynmps93p2mwqf5fx7p4l50sls1krqlv8ls14s3m71f";
+#     hashMode = "recursive";
+#     message = "Source file not found.";
+#   };
+#   VASP_TARGET_CPU = if config ? oneapiArch then "-x${config.oneapiArch}" else "";
+#   MKLROOT = mkl;
+#   makeFlags = "DEPS=1";
+#   enableParallelBuilding = true;
+#   buildInputs = [ mkl intel-mpi ifort ];
+#   nativeBuildInputs = [ rsync ];
+#   configurePhase =
+#   ''
+#     cp arch/makefile.include.intel makefile.include
+#     echo "CPP_OPTIONS += -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj" >> makefile.include
+#     echo "OBJECTS_LIB += getshmem.o" >> makefile.include
+#     mkdir -p bin
+#   '';
+#   installPhase =
+#   ''
+#     mkdir -p $out/bin
+#     for i in std gam ncl; do
+#       cp bin/vasp_$i $out/bin/vasp-cpu-${version}-$i
+#     done
+#   '';
+#   doStrip = false;
+#   doFixup = false;
+# }
+{
+  stdenvNoCC, requireFile, rsync, blas, scalapack, openmpi, openmp, gfortran, gcc, fftwMpi
+}:
+stdenvNoCC.mkDerivation rec
+{
+  pname = "vasp";
+  version = "6.4.0";
+  # nix-store --query --hash $(nix store add-path ./vasp-6.4.0)
+  src = requireFile
+  {
+    name = "${pname}-${version}";
+    sha256 = "189i1l5q33ynmps93p2mwqf5fx7p4l50sls1krqlv8ls14s3m71f";
+    hashMode = "recursive";
+    message = "Source file not found.";
+  };
+  # VASP_TARGET_CPU = if config ? oneapiArch then "-x${config.oneapiArch}" else "";
+  # MKLROOT = mkl;
+  makeFlags = "DEPS=1";
+  enableParallelBuilding = true;
+  buildInputs = [ blas scalapack openmpi openmp gfortran gfortran.cc gcc fftwMpi.dev fftwMpi ];
+  nativeBuildInputs = [ rsync ];
+  FFTW_ROOT = fftwMpi.dev;
+  configurePhase =
+  ''
+    cp ${./makefile.include/${version}-gnu} makefile.include
+    chmod +w makefile.include
+    echo "CPP_OPTIONS += -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj" >> makefile.include
+    echo "OBJECTS_LIB += getshmem.o" >> makefile.include
+    mkdir -p bin
+  '';
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    for i in std gam ncl; do
+      cp bin/vasp_$i $out/bin/vasp-gnu-${version}-$i
+    done
+  '';
+}
--- a/local/pkgs/vasp/gnu/default.nix
+++ b/local/pkgs/vasp/gnu/default.nix
@@ -1,46 +0,0 @@
-{
-  stdenvNoCC, requireFile, writeShellApplication,
-  rsync, blas, scalapack, mpi, openmp, gfortran, gcc, fftwMpi, hdf5, wannier90
-}:
-let
-  sources = import ../source.nix { inherit requireFile; };
-  vasp = version: stdenvNoCC.mkDerivation rec
-  {
-    pname = "vasp-gnu";
-    inherit version;
-    src = sources.${version};
-    configurePhase =
-    ''
-      cp ${./makefile.include-${version}} makefile.include
-      cp ${../constr_cell_relax.F} src/constr_cell_relax.F
-      mkdir -p bin
-    '';
-    enableParallelBuilding = true;
-    makeFlags = "DEPS=1";
-    buildInputs = [ blas scalapack 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;
-    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-${version}";
-    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 ))
-      fi
-      export PATH=$PATH:$PWD
-      exec "$@"
-    '';
-  };
-in builtins.mapAttrs (version: _: startScript version) sources
--- a/local/pkgs/vasp/gnu/makefile.include-6.3.1
+++ b/local/pkgs/vasp/gnu/makefile.include-6.3.1
@@ -1,92 +0,0 @@
-# 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
-
-# BLAS and LAPACK (mandatory)
-# OPENBLAS_ROOT ?= /path/to/your/openblas/installation
-# BLASPACK    = -L$(OPENBLAS_ROOT)/lib -lopenblas
-BLASPACK    = -lblas
-
-# scaLAPACK (mandatory)
-# SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
-# SCALAPACK   = -L$(SCALAPACK_ROOT)/lib -lscalapack
-SCALAPACK = -lscalapack
-
-LLIBS      += $(SCALAPACK) $(BLASPACK)
-
-# FFTW (mandatory)
-FFTW_ROOT  ?= /path/to/your/fftw/installation
-LLIBS      += -L$(FFTW_ROOT)/lib -lfftw3 -lfftw3_omp
-INCS       += -I$(FFTW_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  = g++ -fopenmp -std=c++11 -DFFTLIB_THREADSAFE
-#INCS_FFTLIB = -I./include -I$(FFTW_ROOT)/include
-#LIBS       += fftlib
-#LLIBS      += -ldl
--- a/local/pkgs/vasp/intel/default.nix
+++ b/local/pkgs/vasp/intel/default.nix
@@ -1,71 +0,0 @@
-{
-  buildFHSEnv, writeScript, stdenvNoCC, requireFile, substituteAll, symlinkJoin,
-  config, oneapiArch ? config.oneapiArch or "SSE3",
-  oneapi, gfortran, gcc, glibc, lmod, rsync, which, hdf5, wannier90
-}:
-let
-  versions = import ../source.nix;
-  buildEnv = buildFHSEnv
-  {
-    name = "buildEnv";
-    # make "module load mpi" success
-    targetPkgs = pkgs: with pkgs; [ zlib (writeTextDir "etc/release" "") ];
-  };
-  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 -p bin
-    make DEPS=1 -j$NIX_BUILD_CORES std
-  '';
-  include = version: substituteAll
-  {
-    src = ./makefile.include-${version};
-    inherit oneapiArch;
-    gcc = symlinkJoin { name = "gcc"; paths = [ gfortran gfortran.cc gcc ]; };
-  };
-  vasp = version: stdenvNoCC.mkDerivation rec
-  {
-    pname = "vasp";
-    inherit version;
-    src = requireFile
-    {
-      name = "${pname}-${version}";
-      sha256 = versions.${version};
-      hashMode = "recursive";
-      message = "Source file not found.";
-    };
-    configurePhase =
-    ''
-      cp ${include version} makefile.include
-      cp ${../constr_cell_relax.F} src/constr_cell_relax.F
-    '';
-    enableParallelBuilding = false;
-    buildInputs = [ hdf5 hdf5.dev wannier90 glibc glibc.dev ];
-    nativeBuildInputs = [ gfortran gfortran.cc gcc rsync which ];
-    HDF5_ROOT = hdf5.dev;
-    WANNIER90_ROOT = wannier90;
-    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
-    '';
-  };
-  startScript = version: 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 "$@"
-  '';
-  runEnv = version: buildFHSEnv
-  {
-    name = "vasp-intel-${version}";
-    targetPkgs = pkgs: with pkgs; [ zlib (vasp version) (writeTextDir "etc/release" "") ];
-    runScript = startScript version;
-  };
-in builtins.mapAttrs (version: _: runEnv version) versions
--- a/local/pkgs/vasp/intel/makefile.include-6.3.1
+++ b/local/pkgs/vasp/intel/makefile.include-6.3.1
@@ -1,82 +0,0 @@
-# Default precompiler options
-CPP_OPTIONS = -DHOST=\"LinuxIFC\" \
-              -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         = fpp -f_com=no -free -w0  $*$(FUFFIX) $*$(SUFFIX) $(CPP_OPTIONS)
-
-FC          = I_MPI_FC=ifort mpif90 -qopenmp
-FCL         = I_MPI_FC=ifort mpif90
-
-FREE        = -free -names lowercase
-
-FFLAGS      = -assume byterecl -w
-
-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      = icc
-CFLAGS_LIB  = -O
-FFLAGS_LIB  = -O1
-FREE_LIB    = $(FREE)
-
-OBJECTS_LIB = linpack_double.o getshmem.o
-
-# For the parser library
-CXX_PARS    = icpc
-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 ?= -x@oneapiArch@
-FFLAGS     += $(VASP_TARGET_CPU)
- 
-# Intel MKL for FFTW, BLAS, LAPACK, and scaLAPACK
-# (Note: for Intel Parallel Studio's MKL use -mkl instead of -qmkl)
-FCL        += -qmkl
-MKLROOT    ?= /path/to/your/mkl/installation
-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
-
-# 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_OPTION += -Dsysv
-#FCL         = mpif90 fftlib.o -qmkl
-#CXX_FFTLIB  = icpc -qopenmp -std=c++11 -DFFTLIB_USE_MKL -DFFTLIB_THREADSAFE
-#INCS_FFTLIB = -I./include -I$(MKLROOT)/include/fftw
-#LIBS       += fftlib
--- a/local/pkgs/vasp/intel/makefile.include-6.4.0
+++ b/local/pkgs/vasp/intel/makefile.include-6.4.0
@@ -1,82 +0,0 @@
-# Default precompiler options
-CPP_OPTIONS = -DHOST=\"LinuxIFC\" \
-              -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         = fpp -f_com=no -free -w0  $*$(FUFFIX) $*$(SUFFIX) $(CPP_OPTIONS)
-
-FC          = I_MPI_F90=ifort mpif90 -qopenmp
-FCL         = I_MPI_F90=ifort mpif90
-
-FREE        = -free -names lowercase
-
-FFLAGS      = -assume byterecl -w
-
-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      = icc
-CFLAGS_LIB  = -O
-FFLAGS_LIB  = -O1
-FREE_LIB    = $(FREE)
-
-OBJECTS_LIB = linpack_double.o getshmem.o
-
-# For the parser library
-CXX_PARS    = icpc
-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 ?= -x@oneapiArch@
-FFLAGS     += $(VASP_TARGET_CPU)
- 
-# Intel MKL for FFTW, BLAS, LAPACK, and scaLAPACK
-# (Note: for Intel Parallel Studio's MKL use -mkl instead of -qmkl)
-FCL        += -qmkl
-MKLROOT    ?= /path/to/your/mkl/installation
-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
-
-# 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_OPTION += -Dsysv
-#FCL         = mpif90 fftlib.o -qmkl
-#CXX_FFTLIB  = icpc -qopenmp -std=c++11 -DFFTLIB_USE_MKL -DFFTLIB_THREADSAFE
-#INCS_FFTLIB = -I./include -I$(MKLROOT)/include/fftw
-#LIBS       += fftlib
--- a/local/pkgs/vasp/makefile.include/6.4.0-gnu
+++ b/local/pkgs/vasp/makefile.include/6.4.0-gnu
@@ -8,7 +8,7 @@ CPP_OPTIONS = -DHOST=\"LinuxGNU\" \
              -Duse_bse_te \
              -Dtbdyn \
              -Dfock_dblbuf \
-              -D_OPENMP -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj
+              -D_OPENMP

 CPP         = gcc -E -C -w $*$(FUFFIX) >$*$(SUFFIX) $(CPP_OPTIONS)

@@ -35,7 +35,7 @@ CFLAGS_LIB  = -O
 FFLAGS_LIB  = -O1
 FREE_LIB    = $(FREE)

-OBJECTS_LIB = linpack_double.o getshmem.o
+OBJECTS_LIB = linpack_double.o

 # For the parser library
 CXX_PARS    = g++
@@ -68,20 +68,21 @@ SCALAPACK = -lscalapack
 LLIBS      += $(SCALAPACK) $(BLASPACK)

 # FFTW (mandatory)
-FFTW_ROOT  ?= /path/to/your/fftw/installation
-LLIBS      += -L$(FFTW_ROOT)/lib -lfftw3 -lfftw3_omp
+# FFTW_ROOT  ?= /path/to/your/fftw/installation
+# LLIBS      += -L$(FFTW_ROOT)/lib -lfftw3 -lfftw3_omp
+LLIBS      += -lfftw3 -lfftw3_omp
 INCS       += -I$(FFTW_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
+#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
+#CPP_OPTIONS    += -DVASP2WANNIER90
+#WANNIER90_ROOT ?= /path/to/your/wannier90/installation
+#LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier

 # For the fftlib library (recommended)
 CPP_OPTIONS+= -Dsysv
--- a/local/pkgs/vasp/nvidia/default.nix
+++ b/local/pkgs/vasp/nvidia/default.nix
@@ -1,71 +0,0 @@
-{
-  buildFHSEnv, writeScript, stdenvNoCC, requireFile, substituteAll,
-  config, cudaCapabilities ? config.cudaCapabilities, nvhpcArch ? config.nvhpcArch or "px",
-  nvhpc, lmod, mkl, gfortran, rsync, which, hdf5, wannier90
-}:
-let
-  sources = import ../source.nix { inherit requireFile; };
-  buildEnv = buildFHSEnv
-  {
-    name = "buildEnv";
-    targetPkgs = pkgs: with pkgs; [ zlib ];
-  };
-  buildScript = writeScript "build"
-  ''
-    . ${lmod}/share/lmod/lmod/init/bash
-    module use ${nvhpc}/share/nvhpc/modulefiles
-    module load nvhpc
-    mkdir -p bin
-    make DEPS=1 -j$NIX_BUILD_CORES
-  '';
-  include = version: substituteAll
-  {
-    src = ./makefile.include-${version};
-    cudaCapabilities = builtins.concatStringsSep "," (builtins.map
-      (cap: "cc${builtins.replaceStrings ["."] [""] cap}")
-      cudaCapabilities);
-    inherit nvhpcArch;
-  };
-  vasp = version: stdenvNoCC.mkDerivation rec
-  {
-    pname = "vasp";
-    inherit version;
-    src = sources.${version};
-    configurePhase =
-    ''
-      cp ${include version} makefile.include
-      cp ${../constr_cell_relax.F} src/constr_cell_relax.F
-    '';
-    enableParallelBuilding = true;
-    buildInputs = [ mkl hdf5 wannier90 ];
-    nativeBuildInputs = [ gfortran rsync which ];
-    MKLROOT = "${mkl}";
-    HDF5_ROOT = "${hdf5}";
-    WANNIER90_ROOT = "${wannier90}";
-    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
-    '';
-    requiredSystemFeatures = [ "nvhpcarch-${nvhpcArch}" ];
-  };
-  startScript = version: 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 ))
-    fi
-    exec "$@"
-  '';
-  runEnv = version: buildFHSEnv
-  {
-    name = "vasp-nvidia-${version}";
-    targetPkgs = pkgs: with pkgs; [ zlib (vasp version) ];
-    runScript = startScript version;
-  };
-in builtins.mapAttrs (version: _: runEnv version) sources
--- a/local/pkgs/vasp/nvidia/makefile.include-6.3.1
+++ b/local/pkgs/vasp/nvidia/makefile.include-6.3.1
@@ -1,109 +0,0 @@
-# Default precompiler options
-CPP_OPTIONS = -DHOST=\"LinuxNV\" \
-              -DMPI -DMPI_BLOCK=8000 -Duse_collective \
-              -DscaLAPACK \
-              -DCACHE_SIZE=4000 \
-              -Davoidalloc \
-              -Dvasp6 \
-              -Duse_bse_te \
-              -Dtbdyn \
-              -Dqd_emulate \
-              -Dfock_dblbuf \
-              -D_OPENMP \
-              -D_OPENACC \
-              -DUSENCCL -DUSENCCLP2P -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj
-
-CPP         = nvfortran -Mpreprocess -Mfree -Mextend -E $(CPP_OPTIONS) $*$(FUFFIX)  > $*$(SUFFIX)
-
-# N.B.: you might need to change the cuda-version here
-#       to one that comes with your NVIDIA-HPC SDK
-FC          = mpif90 -acc -gpu=@cudaCapabilities@ -mp
-FCL         = mpif90 -acc -gpu=@cudaCapabilities@ -mp -c++libs
-
-FREE        = -Mfree
-
-FFLAGS      = -Mbackslash -Mlarge_arrays
-
-OFLAG       = -fast
-
-DEBUG       = -Mfree -O0 -traceback
-
-OBJECTS     = fftmpiw.o fftmpi_map.o fftw3d.o fft3dlib.o
-
-LLIBS       = -cudalib=cublas,cusolver,cufft,nccl -cuda
-
-# Redefine the standard list of O1 and O2 objects
-SOURCE_O1  := pade_fit.o
-SOURCE_O2  := pead.o
-
-# For what used to be vasp.5.lib
-CPP_LIB     = $(CPP)
-FC_LIB      = nvfortran
-CC_LIB      = nvc -w
-CFLAGS_LIB  = -O
-FFLAGS_LIB  = -O1 -Mfixed
-FREE_LIB    = $(FREE)
-
-OBJECTS_LIB = linpack_double.o getshmem.o
-
-# For the parser library
-CXX_PARS    = nvc++ --no_warnings
-
-##
-## 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 ?= -tp=@nvhpcArch@
-FFLAGS     += $(VASP_TARGET_CPU)
-
-# Specify your NV HPC-SDK installation (mandatory)
-#... first try to set it automatically
-NVROOT      =$(shell which nvfortran | awk -F /compilers/bin/nvfortran '{ print $$1 }')
-
-# If the above fails, then NVROOT needs to be set manually
-#NVHPC      ?= /opt/nvidia/hpc_sdk
-#NVVERSION   = 21.11
-#NVROOT      = $(NVHPC)/Linux_x86_64/$(NVVERSION)
-
-## Improves performance when using NV HPC-SDK >=21.11 and CUDA >11.2
-#OFLAG_IN   = -fast -Mwarperf
-#SOURCE_IN  := nonlr.o
-
-# Software emulation of quadruple precsion (mandatory)
-QD         ?= $(NVROOT)/compilers/extras/qd
-LLIBS      += -L$(QD)/lib -lqdmod -lqd
-INCS       += -I$(QD)/include/qd
-
-# Intel MKL for FFTW, BLAS, LAPACK, and scaLAPACK
-MKLROOT    ?= /path/to/your/mkl/installation
-LLIBS_MKL   = -Mmkl -L$(MKLROOT)/lib -lmkl_scalapack_lp64 -lmkl_blacs_openmpi_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_MKL   = -L$(SCALAPACK_ROOT)/lib -lscalapack -Mmkl
-
-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 for the OpenACC GPU port, especially in combination with MKL's FFTs)
-#CPP_OPTIONS+= -Dsysv
-#FCL        += fftlib.o
-#CXX_FFTLIB  = nvc++ -mp --no_warnings -std=c++11 -DFFTLIB_USE_MKL -DFFTLIB_THREADSAFE
-#INCS_FFTLIB = -I./include -I$(MKLROOT)/include/fftw
-#LIBS       += fftlib
-#LLIBS      += -ldl
--- a/local/pkgs/vasp/nvidia/makefile.include-6.4.0
+++ b/local/pkgs/vasp/nvidia/makefile.include-6.4.0
@@ -1,109 +0,0 @@
-# Default precompiler options
-CPP_OPTIONS = -DHOST=\"LinuxNV\" \
-              -DMPI -DMPI_INPLACE -DMPI_BLOCK=8000 -Duse_collective \
-              -DscaLAPACK \
-              -DCACHE_SIZE=4000 \
-              -Davoidalloc \
-              -Dvasp6 \
-              -Duse_bse_te \
-              -Dtbdyn \
-              -Dqd_emulate \
-              -Dfock_dblbuf \
-              -D_OPENMP \
-              -D_OPENACC \
-              -DUSENCCL -DUSENCCLP2P -Duse_shmem -Dshmem_bcast_buffer -Dshmem_rproj
-
-CPP         = nvfortran -Mpreprocess -Mfree -Mextend -E $(CPP_OPTIONS) $*$(FUFFIX)  > $*$(SUFFIX)
-
-# N.B.: you might need to change the cuda-version here
-#       to one that comes with your NVIDIA-HPC SDK
-FC          = mpif90 -acc -gpu=@cudaCapabilities@ -mp
-FCL         = mpif90 -acc -gpu=@cudaCapabilities@ -mp -c++libs
-
-FREE        = -Mfree
-
-FFLAGS      = -Mbackslash -Mlarge_arrays
-
-OFLAG       = -fast
-
-DEBUG       = -Mfree -O0 -traceback
-
-OBJECTS     = fftmpiw.o fftmpi_map.o fftw3d.o fft3dlib.o
-
-LLIBS       = -cudalib=cublas,cusolver,cufft,nccl -cuda
-
-# Redefine the standard list of O1 and O2 objects
-SOURCE_O1  := pade_fit.o minimax_dependence.o
-SOURCE_O2  := pead.o
-
-# For what used to be vasp.5.lib
-CPP_LIB     = $(CPP)
-FC_LIB      = nvfortran
-CC_LIB      = nvc -w
-CFLAGS_LIB  = -O
-FFLAGS_LIB  = -O1 -Mfixed
-FREE_LIB    = $(FREE)
-
-OBJECTS_LIB = linpack_double.o getshmem.o
-
-# For the parser library
-CXX_PARS    = nvc++ --no_warnings
-
-##
-## 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 ?= -tp=@nvhpcArch@
-FFLAGS     += $(VASP_TARGET_CPU)
-
-# Specify your NV HPC-SDK installation (mandatory)
-#... first try to set it automatically
-NVROOT      =$(shell which nvfortran | awk -F /compilers/bin/nvfortran '{ print $$1 }')
-
-# If the above fails, then NVROOT needs to be set manually
-#NVHPC      ?= /opt/nvidia/hpc_sdk
-#NVVERSION   = 21.11
-#NVROOT      = $(NVHPC)/Linux_x86_64/$(NVVERSION)
-
-## Improves performance when using NV HPC-SDK >=21.11 and CUDA >11.2
-#OFLAG_IN   = -fast -Mwarperf
-#SOURCE_IN  := nonlr.o
-
-# Software emulation of quadruple precsion (mandatory)
-QD         ?= $(NVROOT)/compilers/extras/qd
-LLIBS      += -L$(QD)/lib -lqdmod -lqd
-INCS       += -I$(QD)/include/qd
-
-# Intel MKL for FFTW, BLAS, LAPACK, and scaLAPACK
-MKLROOT    ?= /path/to/your/mkl/installation
-LLIBS_MKL   = -Mmkl -L$(MKLROOT)/lib -lmkl_scalapack_lp64 -lmkl_blacs_openmpi_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_MKL   = -L$(SCALAPACK_ROOT)/lib -lscalapack -Mmkl
-
-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 for the OpenACC GPU port, especially in combination with MKL's FFTs)
-#CPP_OPTIONS+= -Dsysv
-#FCL        += fftlib.o
-#CXX_FFTLIB  = nvc++ -mp --no_warnings -std=c++11 -DFFTLIB_USE_MKL -DFFTLIB_THREADSAFE
-#INCS_FFTLIB = -I./include -I$(MKLROOT)/include/fftw
-#LIBS       += fftlib
-#LLIBS      += -ldl
--- a/local/pkgs/vasp/source.nix
+++ b/local/pkgs/vasp/source.nix
@@ -1,16 +0,0 @@
-{ requireFile }:
-let
-  hashes =
-  {
-    # nix-store --query --hash $(nix store add-path ./vasp-6.4.0)
-    "6.3.1" = "1xdr5kjxz6v2li73cbx1ls5b1lnm6z16jaa4fpln7d3arnnr1mgx";
-    "6.4.0" = "189i1l5q33ynmps93p2mwqf5fx7p4l50sls1krqlv8ls14s3m71f";
-  };
-  sources = version: sha256: requireFile
-  {
-    name = "vasp-${version}";
-    inherit sha256;
-    hashMode = "recursive";
-    message = "Source file not found.";
-  };
-in builtins.mapAttrs sources hashes
--- a/local/pkgs/win11os-kde/default.nix
+++ b/local/pkgs/win11os-kde/default.nix
@@ -1,20 +0,0 @@
-{ lib, stdenv, src }: stdenv.mkDerivation
-{
-  name = "win11os-kde";
-  inherit src;
-  installPhase =
-  ''
-    mkdir -p $out/share/aurorae/themes
-    cp -r $src/aurorae/* $out/share/aurorae/themes
-    mkdir -p $out/share/color-schemes
-    cp -r $src/color-schemes/*.colors $out/share/color-schemes
-    mkdir -p $out/share/Kvantum
-    cp -r $src/Kvantum/* $out/share/Kvantum
-    mkdir -p $out/share/plasma/desktoptheme
-    cp -r $src/plasma/desktoptheme/* $out/share/plasma/desktoptheme
-    mkdir -p $out/share/plasma/look-and-feel
-    cp -r $src/plasma/look-and-feel/* $out/share/plasma/look-and-feel
-    mkdir -p $out/share/wallpapers
-    cp -r $src/wallpaper/* $out/share/wallpapers
-  '';
-}
--- a/local/pkgs/zpp-bits/default.nix
+++ b/local/pkgs/zpp-bits/default.nix
@@ -1,7 +1,14 @@
-{ stdenv, src }: stdenv.mkDerivation
+{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec
 {
-  inherit src;
-  name = "zpp-bits";
+  pname = "zpp-bits";
+  version = "4.4.19";
+  src = fetchFromGitHub
+  {
+    owner = "eyalz800";
+    repo = "zpp_bits";
+    rev = "v${version}";
+    sha256 = "ejIwrvCFALuBQbQhTfzjBb11oMR/akKnboB60GWbjlQ=";
+  };
  phases = [ "installPhase" ];
  installPhase =
  ''
--- a/modules/bugs/default.nix
+++ b/modules/bugs/default.nix
@@ -5,6 +5,8 @@ inputs:
    inherit (inputs.lib) mkMerge mkIf mkOption types;
    bugs =
    {
+      # intel i915 hdmi
+      intel-hdmi.boot.kernelPatches = [{ name = "intel-hdmi"; patch = ./intel-hdmi.patch; }];
      # suspend & hibernate do not use platform
      suspend-hibernate-no-platform.systemd.sleep.extraConfig =
      ''
@@ -45,10 +47,6 @@ inputs:
            then
              echo LID0 > /proc/acpi/wakeup
            fi
-            if ${cat} /proc/acpi/wakeup | ${grep} XHCI | ${grep} -q enabled
-            then
-              echo XHCI > /proc/acpi/wakeup
-            fi
          '';
        wantedBy = [ "multi-user.target" ];
      };
@@ -78,9 +76,8 @@ inputs:
          };
        };
      firefox.programs.firefox.enable = inputs.lib.mkForce false;
-      power.boot.kernelParams = [ "cpufreq.default_governor=powersave" ];
-      backlight.boot.kernelParams = [ "nvidia.NVreg_RegistryDwords=EnableBrightnessControl=1" ];
-      amdpstate.boot.kernelParams = [ "amd_pstate=active" ];
+      embree.nixpkgs.overlays =
+        [(final: prev: { embree = prev.embree.override { stdenv = final.genericPackages.stdenv; }; })];
    };
  in
    {
--- a/modules/bugs/intel-hdmi.patch
+++ b/modules/bugs/intel-hdmi.patch
@@ -0,0 +1,14 @@
+diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
+index 55544d484318..d6f257f8fd14 100644
+--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
+@@ -2708,7 +2708,7 @@ static void parse_ddi_port(struct intel_bios_encoder_data *devdata)
+ 	if (i915->display.vbt.ports[port]) {
+ 		drm_dbg_kms(&i915->drm,
+ 			    "More than one child device for port %c in VBT, using the first.\n",
+ 			    port_name(port));
+-		return;
+		// return;
+ 	}
+ 
+ 	sanitize_device_type(devdata, port);
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -31,13 +31,11 @@ inputs:
            {
              nix-vscode-extensions = topInputs.nix-vscode-extensions.extensions."${prev.system}";
              nur-xddxdd = topInputs.nur-xddxdd.overlays.default final prev;
-              nur-linyinfeng = (topInputs.nur-linyinfeng.overlays.default final prev).linyinfeng;
              deploy-rs =
                { inherit (prev) deploy-rs; inherit ((topInputs.deploy-rs.overlay final prev).deploy-rs) lib; };
              # needed by mirism
              nghttp2-2305 =
                inputs.pkgs.callPackage "${inputs.topInputs.nixpkgs-2305}/pkgs/development/libraries/nghttp2" {};
-              firefox-addons = (import "${topInputs.rycee}" { inherit (prev) pkgs; }).firefox-addons;
            })
          ];
          home-manager.sharedModules =
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -1,6 +1,5 @@
 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; };
@@ -8,6 +7,14 @@ inputs:
    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 = []; };
+    gpus = mkOption { type = types.listOf (types.enum [ "intel" "nvidia" "amd" ]); default = []; };
+    prime =
+    {
+      enable = mkOption { type = types.bool; default = false; };
+      mode = mkOption { type = types.enum [ "offload" "sync" ]; default = "offload"; };
+      busId = mkOption { type = types.attrsOf types.str; default = {}; };
+    };
+    gamemode.drmDevice = mkOption { type = types.int; default = 0; };
    halo-keyboard.enable = mkOption { type = types.bool; default = false; };
  };
  config =
@@ -74,6 +81,73 @@ inputs:
              concatLists (map (cpu: modules.${cpu}) hardware.cpus);
        }
      )
+      # gpus
+      (
+        mkIf (hardware.gpus != [])
+        {
+          boot.initrd.availableKernelModules =
+            let
+              modules =
+              {
+                intel = [ "i915" ];
+                nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" "nvidia_uvm" ];
+                amd = [ "amdgpu" ];
+              };
+            in
+              concatLists (map (gpu: modules.${gpu}) hardware.gpus);
+          hardware =
+          {
+            opengl =
+            {
+              enable = true;
+              driSupport = true;
+              extraPackages =
+                with inputs.pkgs;
+                let
+                  packages =
+                  {
+                    intel = [ intel-compute-runtime intel-media-driver libvdpau-va-gl ]; # intel-vaapi-driver
+                    nvidia = [ vaapiVdpau ];
+                    amd = [];
+                  };
+                in
+                  concatLists (map (gpu: packages.${gpu}) hardware.gpus);
+              driSupport32Bit = true;
+            };
+            nvidia.nvidiaSettings = builtins.elem "nvidia" hardware.gpus;
+          };
+        }
+      )
+      (mkIf (builtins.elem "intel" hardware.gpus) { services.xserver.deviceSection = ''Driver "modesetting"''; })
+      # prime
+      (
+        mkIf hardware.prime.enable
+        {
+          hardware.nvidia = mkMerge
+          [
+            (
+              mkIf (hardware.prime.mode == "offload")
+              {
+                prime.offload = { enable = true; enableOffloadCmd = true; };
+                powerManagement = { finegrained = true; enable = true; };
+              }
+            )
+            (
+              mkIf (hardware.prime.mode == "sync")
+              {
+                prime = { sync.enable = true; };
+                # prime.forceFullCompositionPipeline = true;
+              }
+            )
+            {
+              prime = listToAttrs
+                (map (gpu: { inherit (gpu) value; name = "${gpu.name}BusId"; }) (attrsToList hardware.prime.busId));
+            }
+            
+          ];
+        }
+      )
+      { programs.gamemode.settings.gpu.gpu_device = "${toString hardware.gamemode.drmDevice}"; }
      # halo-keyboard
      (mkIf hardware.halo-keyboard.enable
      (
@@ -89,13 +163,23 @@ inputs:
            {
              Type = "simple";
              WorkingDirectory = "/etc/touch_keyboard";
+              # ExecStartPre = let sh = "${inputs.pkgs.bash}/bin/sh"; in
+              # [
+              #   ''-${sh} -c "echo 0 > /sys/class/pwm/pwmchip1/export"''
+              #   ''${sh} -c "echo 0 > /sys/class/pwm/pwmchip1/pwm0/enable"''
+              #   ''${sh} -c "echo 1 > /sys/class/pwm/pwmchip1/pwm0/enable"''
+              # ];
              ExecStart = "${keyboard}/bin/touch_keyboard_handler";
            };
-            yogabook-modes-handler.serviceConfig =
+            yogabook-modes-handler =
            {
-              Type = "simple";
-              ExecStart = "${support}/bin/yogabook-modes-handler";
-              StandardOutput = "journal";
+              wantedBy = [ "default.target" ];
+              serviceConfig =
+              {
+                Type = "simple";
+                ExecStart = "${support}/bin/yogabook-modes-handler";
+                StandardOutput = "journal";
+              };
            };
            monitor-sensor =
            {
@@ -108,38 +192,6 @@ inputs:
            };
          };
          environment.etc."touch_keyboard".source = "${keyboard}/etc/touch_keyboard";
-          boot.initrd =
-          {
-            services.udev.packages = [ keyboard support ];
-            systemd =
-            {
-              extraBin =
-              {
-                touch_keyboard_handler = "${keyboard}/bin/touch_keyboard_handler";
-                yogabook-modes-handler = "${support}/bin/yogabook-modes-handler";
-              };
-              services =
-              {
-                touch-keyboard-handler =
-                {
-                  serviceConfig =
-                  {
-                    Type = "simple";
-                    WorkingDirectory = "/etc/touch_keyboard";
-                    ExecStart = "${keyboard}/bin/touch_keyboard_handler";
-                  };
-                };
-                yogabook-modes-handler.serviceConfig =
-                {
-                  Type = "simple";
-                  ExecStart = "${support}/bin/yogabook-modes-handler";
-                  StandardOutput = "journal";
-                };
-              };
-
-            };
-            extraFiles."/etc/touch_keyboard".source = "${keyboard}/etc/touch_keyboard";
-          };
        }
      ))
    ];
--- a/modules/hardware/gpu.nix
+++ b/modules/hardware/gpu.nix
@@ -1,87 +0,0 @@
-inputs:
-{
-  options.nixos.hardware.gpu = let inherit (inputs.lib) mkOption types; in
-  {
-    type = mkOption
-    {
-      type = types.nullOr (types.enum
-      [
-        # single gpu
-        "intel" "nvidia" "amd"
-        # hibrid gpu: use nvidia prime offload mode
-        "intel+nvidia" "amd+nvidia"
-      ]);
-      default = null;
-    };
-    dynamicBoost = mkOption { type = types.bool; default = false; };
-    prime.busId = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
-  };
-  config = let inherit (inputs.config.nixos.hardware) gpu; in inputs.lib.mkIf (gpu.type != null) (inputs.lib.mkMerge
-  [
-    # generic settings
-    (
-      let gpus = inputs.lib.strings.splitString "+" gpu.type; in
-      {
-        boot.initrd.availableKernelModules =
-          let modules =
-          {
-            intel = [ "i915" ];
-            nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" ]; # nvidia-uvm should not be loaded
-            amd = [ "amdgpu" ];
-          };
-          in builtins.concatLists (builtins.map (gpu: modules.${gpu}) gpus);
-        hardware =
-        {
-          opengl =
-          {
-            enable = true;
-            driSupport = true;
-            driSupport32Bit = true;
-            extraPackages =
-              let packages = with inputs.pkgs;
-              {
-                intel = [ intel-vaapi-driver libvdpau-va-gl intel-media-driver ];
-                nvidia = [ vaapiVdpau ];
-                amd = [ amdvlk rocmPackages.clr rocmPackages.clr.icd ];
-              };
-              in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
-            extraPackages32 =
-              let packages = { intel = []; nvidia = []; amd = [ inputs.pkgs.driversi686Linux.amdvlk ]; };
-              in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
-          };
-          nvidia = inputs.lib.mkIf (builtins.elem "nvidia" gpus)
-          {
-            modesetting.enable = true;
-            powerManagement.enable = true;
-            dynamicBoost.enable = inputs.lib.mkIf gpu.dynamicBoost true;
-            nvidiaSettings = true;
-            forceFullCompositionPipeline = true;
-            # package = inputs.config.boot.kernelPackages.nvidiaPackages.production;
-            prime.allowExternalGpu = true;
-          };
-        };
-        boot =
-        {
-          kernelParams = inputs.lib.mkIf (builtins.elem "amd" gpus)
-            [ "radeon.cik_support=0" "amdgpu.cik_support=1" "radeon.si_support=0" "amdgpu.si_support=1" "iommu=pt" ];
-          blacklistedKernelModules = [ "nouveau" ];
-        };
-        environment.variables.VDPAU_DRIVER = inputs.lib.mkIf (builtins.elem "intel" gpus) "va_gl";
-        services.xserver.videoDrivers =
-          let driver = { intel = "modesetting"; amd = "amdgpu"; nvidia = "nvidia"; };
-          in builtins.map (gpu: driver.${gpu}) gpus;
-      }
-    )
-    # nvidia prime offload
-    (
-      inputs.lib.mkIf (inputs.lib.strings.hasSuffix "+nvidia" gpu.type) { hardware.nvidia =
-      {
-        prime = { offload = { enable = true; enableOffloadCmd = true; }; }
-          // builtins.listToAttrs (builtins.map
-            (gpu: { name = "${if gpu.name == "amd" then "amdgpu" else gpu.name}BusId"; value = "PCI:${gpu.value}"; })
-            (inputs.localLib.attrsToList gpu.prime.busId));
-        powerManagement.finegrained = true;
-      };}
-    )
-  ]);
-}
--- a/modules/hardware/legion.nix
+++ b/modules/hardware/legion.nix
@@ -1,16 +0,0 @@
-inputs:
-{
-  options.nixos.hardware.legion = let inherit (inputs.lib) mkOption types; in
-  {
-    enable = mkOption { type = types.bool; default = false; };
-  };
-  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 ];
-    };
-}
--- a/modules/packages/desktop-fat/chromium.nix
+++ b/modules/packages/desktop-fat/chromium.nix
@@ -3,9 +3,8 @@ inputs:
  config =
    let
      inherit (inputs.lib) mkIf;
-    in mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
+    in mkIf (builtins.elem "desktop-fat" inputs.config.nixos.packages._packageSets)
    {
-      programs.chromium = { enable = true; extraOpts.PasswordManagerEnabled = false; };
      nixos.users.sharedModules =
      [{
        config.programs.chromium =
--- a/modules/packages/desktop-fat/default.nix
+++ b/modules/packages/desktop-fat/default.nix
@@ -1,6 +1,9 @@
 inputs:
 {
-  imports = inputs.localLib.mkModules [ ./steam.nix ];
+  imports = inputs.localLib.mkModules
+  [
+    ./chromium.nix
+  ];
  config =
    let
      inherit (inputs.lib) mkIf;
@@ -13,7 +16,7 @@ inputs:
          _packages =
          [
            # system management
-            etcher btrfs-assistant snapper-gui libsForQt5.qtstyleplugin-kvantum ventoy-full cpu-x
+            etcher btrfs-assistant snapper-gui libsForQt5.qtstyleplugin-kvantum
            # password and key management
            yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden
            # download
@@ -21,29 +24,24 @@ inputs:
            # development
            scrcpy weston cage openbox krita
            # media
-            spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio
-            waifu2x-converter-cpp inkscape blender
+            spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc
            # editor
-            typora
+            localPackages.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
+            deploy-rs.deploy-rs nixpkgs-fmt
            # instant messager
-            element-desktop telegram-desktop discord fluffychat zoom-us signal-desktop slack nur-linyinfeng.wemeet
+            element-desktop telegram-desktop discord # native
            # 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; })
-            # math, physics and chemistry
-            octaveFull root ovito localPackages.vesta localPackages.vaspkit localPackages.v-sim
+            crow-translate zotero pandoc ydict
          ] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
        };
      };
-      programs.kdeconnect.enable = true;
+      programs = { steam.enable = true; kdeconnect.enable = true; };
    };
 }
--- a/modules/packages/desktop-fat/doom.d/config.el
+++ b/modules/packages/desktop-fat/doom.d/config.el
--- a/modules/packages/desktop-fat/doom.d/init.el
+++ b/modules/packages/desktop-fat/doom.d/init.el
--- a/modules/packages/desktop-fat/doom.d/packages.el
+++ b/modules/packages/desktop-fat/doom.d/packages.el
--- a/modules/packages/desktop-fat/steam.nix
+++ b/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
-            '';
-          });
-        });
-      };
-    };
-}
--- a/modules/packages/desktop/default.nix
+++ b/modules/packages/desktop/default.nix
@@ -1,6 +1,6 @@
 inputs:
 {
-  imports = inputs.localLib.mkModules [ ./vscode.nix ./firefox.nix ./chromium.nix ./plasma ];
+  imports = inputs.localLib.mkModules [ ./vscode.nix ];
  config =
    let
      inherit (inputs.lib) mkIf;
@@ -11,35 +11,30 @@ inputs:
        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
+          gparted wl-clipboard-x11 kio-fuse
+          wayland-utils clinfo glxinfo vulkan-tools dracut
          # 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
+          tela-circle-icon-theme
        ];
+        users.sharedModules =
+        [{
+          config.home.file.".config/baloofilerc".text =
+          ''
+            [Basic Settings]
+            Indexing-Enabled=false
+          '';
+        }];
      };
      programs =
      {
        adb.enable = true;
        wireshark = { enable = true; package = inputs.pkgs.wireshark; };
+        firefox = { enable = true; languagePacks = [ "zh-CN" "en-US" ]; };
        vim.package = inputs.pkgs.vim-full;
-        yubikey-touch-detector.enable = true;
      };
      nixpkgs.config.packageOverrides = pkgs: 
      {
--- a/modules/packages/desktop/firefox.nix
+++ b/modules/packages/desktop/firefox.nix
@@ -1,58 +0,0 @@
-inputs:
-{
-  config = inputs.lib.mkIf (builtins.elem "desktop" inputs.config.nixos.packages._packageSets)
-  {
-    nixos.users.sharedModules = [{ config =
-    {
-      programs.firefox =
-      {
-        enable = true;
-        # TODO: switch to 24.05
-        # nativeMessagingHosts = [ inputs.pkgs.plasma-browser-integration ];
-        package = inputs.pkgs.firefox.override { nativeMessagingHosts = [ inputs.pkgs.plasma-browser-integration ]; };
-        policies.DefaultDownloadDirectory = "\${home}/Downloads";
-        profiles.default =
-        {
-          extensions = with inputs.pkgs.firefox-addons;
-          [
-            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
-              {
-                pname = "zotero-connector";
-                version = "5.0.114";
-                addonId = "zotero@chnm.gmu.edu";
-                url = "https://download.zotero.org/connector/firefox/release/Zotero_Connector-5.0.114.xpi";
-                sha256 = "1g9d991m4vfj5x6r86sw754bx7r4qi8g5ddlqp7rcw6wrgydhrhw";
-                meta = {};
-              }
-            )
-          ];
-          search = { default = "Google"; force = true; };
-          userChrome = builtins.readFile "${inputs.topInputs.lepton}/userChrome.css";
-          userContent = builtins.readFile "${inputs.topInputs.lepton}/userContent.css";
-          extraConfig = builtins.readFile "${inputs.topInputs.lepton}/user.js";
-          settings =
-          {
-            # general
-            "browser.search.region" = "CN";
-            "intl.locale.requested" = "zh-CN,en-US";
-            "browser.aboutConfig.showWarning" = false;
-            "browser.bookmarks.showMobileBookmarks" = true;
-            "browser.download.panel.shown" = true;
-            "browser.download.useDownloadDir" = true;
-            "browser.newtab.extensionControlled" = true;
-            "browser.toolbars.bookmarks.visibility" = "never";
-            # allow to apply userChrome.css
-            "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-          };
-        };
-      };
-      home.file.".mozilla/firefox/profiles.ini".force = true;
-    };}];
-    # still enable global firefox, to install language packs
-    programs.firefox = { enable = true; languagePacks = [ "zh-CN" "en-US" ]; };
-  };
-}
--- a/modules/packages/desktop/plasma/default.nix
+++ b/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; }
-    ];
-  }];
-}
--- a/modules/packages/desktop/plasma/konsole.nix
+++ b/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));
-  };
-}
--- a/modules/packages/desktop/vscode.nix
+++ b/modules/packages/desktop/vscode.nix
@@ -13,7 +13,7 @@ inputs:
          {
            vscodeExtensions = with nix-vscode-extensions.vscode-marketplace;
              (with equinusocio; [ vsc-community-material-theme vsc-material-theme-icons ])
-              ++ (with github; [ copilot copilot-chat github-vscode-theme ])
+              ++ (with github; [ copilot copilot-chat copilot-labs github-vscode-theme ])
              ++ (with intellsmi; [ comment-translate deepl-translate ])
              ++ (with ms-python; [ isort python vscode-pylance ])
              ++ (with ms-toolsai;
@@ -44,8 +44,6 @@ inputs:
                lextudio.restructuredtext trond-snekvik.simple-rst
                # markdown
                shd101wyy.markdown-preview-enhanced
-                # vasp
-                mystery.vasp-support
              ];
          }
        )];
--- a/modules/packages/server/default.nix
+++ b/modules/packages/server/default.nix
@@ -3,8 +3,6 @@ inputs:
  imports = inputs.localLib.mkModules
  [
    ./ssh
-    ./zsh
-    ./gpg.nix
  ];
  config =
    let
@@ -17,7 +15,7 @@ inputs:
      {
        packages = with inputs.pkgs;
        {
-          _packages =
+          _packages = 
          [
            # shell
            ksh
@@ -25,7 +23,7 @@ inputs:
            beep dos2unix gnugrep pv tmux screen parallel tldr cowsay jq zellij neofetch ipfetch localPackages.pslist
            fastfetch reptyr
            # lsxx
-            pciutils usbutils lshw util-linux lsof dmidecode
+            pciutils usbutils lshw util-linux lsof
            # top
            iotop iftop htop btop powertop s-tui
            # editor
@@ -37,7 +35,7 @@ inputs:
            # compress
            pigz rar upx unzip zip lzip p7zip
            # file system management
-            sshfs e2fsprogs adb-sync duperemove compsize exfatprogs
+            sshfs e2fsprogs adb-sync duperemove compsize
            # disk management
            smartmontools hdparm
            # encryption and authentication
@@ -45,22 +43,74 @@ inputs:
            # networking
            ipset iptables iproute2 dig nettools traceroute tcping-go whois tcpdump nmap inetutils wireguard-tools
            # nix tools
-            nix-output-monitor nix-tree ssh-to-age (callPackage "${inputs.topInputs.nix-fast-build}" {})
+            nix-output-monitor nix-tree ssh-to-age
            # office
-            todo-txt-cli pdfgrep
+            todo-txt-cli
            # development
-            gdb try inputs.topInputs.plasma-manager.packages.x86_64-linux.rc2nix hexo-cli
+            gdb try inputs.topInputs.plasma-manager.packages.x86_64-linux.rc2nix
          ] ++ (with inputs.config.boot.kernelPackages; [ cpupower usbip ]);
-          _pythonPackages = [(pythonPackages: with pythonPackages;
-          [
-            openai python-telegram-bot fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2
-            certifi charset-normalizer idna orjson psycopg2 inquirerpy requests tqdm pydbus
-          ])];
        };
        users.sharedModules = [(home-inputs:
        {
          config.programs =
          {
+            zsh =
+            {
+              enable = true;
+              initExtraBeforeCompInit =
+              ''
+                # p10k instant prompt
+                P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh"
+                [[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT"
+                HYPHEN_INSENSITIVE="true"
+                export PATH=~/bin:$PATH
+                function br
+                {
+                  local cmd cmd_file code
+                  cmd_file=$(mktemp)
+                  if broot --outcmd "$cmd_file" "$@"; then
+                    cmd=$(<"$cmd_file")
+                    command rm -f "$cmd_file"
+                    eval "$cmd"
+                  else
+                    code=$?
+                    command rm -f "$cmd_file"
+                    return "$code"
+                  fi
+                }
+                alias todo="todo.sh"
+              '';
+              plugins =
+              [
+                {
+                  file = "powerlevel10k.zsh-theme";
+                  name = "powerlevel10k";
+                  src = "${inputs.pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
+                }
+                {
+                  file = "p10k.zsh";
+                  name = "powerlevel10k-config";
+                  src = ./p10k-config;
+                }
+                {
+                  name = "zsh-lsd";
+                  src = inputs.pkgs.fetchFromGitHub
+                  {
+                    owner = "z-shell";
+                    repo = "zsh-lsd";
+                    rev = "029a9cb0a9b39c9eb6c5b5100dd9182813332250";
+                    sha256 = "sha256-oWjWnhiimlGBMaZlZB+OM47jd9hporKlPNwCx6524Rk=";
+                  };
+                }
+              ];
+              history =
+              {
+                path = "${home-inputs.config.xdg.dataHome}/zsh/zsh_history";
+                extended = true;
+                save = 100000000;
+                size = 100000000;
+              };
+            };
            direnv = { enable = true; nix-direnv.enable = true; };
            git =
            {
@@ -113,7 +163,21 @@ inputs:
      {
        nix-index-database.comma.enable = true;
        nix-index.enable = true;
-        command-not-found.enable = false;
+        zsh =
+        {
+          enable = true;
+          syntaxHighlighting.enable = true;
+          autosuggestions.enable = true;
+          enableCompletion = true;
+          ohMyZsh =
+          {
+            enable = true;
+            plugins = [ "git" "colored-man-pages" "extract" "history-substring-search" "autojump" ];
+            customPkgs = with inputs.pkgs; [ zsh-nix-shell ];
+          };
+        };
+        command-not-found.enable = true;
+        gnupg.agent = { enable = true; enableSSHSupport = true; };
        autojump.enable = true;
        git =
        {
--- a/modules/packages/server/gpg.nix
+++ b/modules/packages/server/gpg.nix
@@ -1,10 +0,0 @@
-inputs:
-{
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-    in mkIf (builtins.elem "server" inputs.config.nixos.packages._packageSets)
-    {
-      programs.gnupg.agent = { enable = true; pinentryFlavor = "tty"; };
-    };
-}
--- a/modules/packages/server/zsh/p10k-config/p10k.zsh
+++ b/modules/packages/server/zsh/p10k-config/p10k.zsh
--- a/modules/packages/server/ssh/default.nix
+++ b/modules/packages/server/ssh/default.nix
@@ -14,7 +14,11 @@ inputs:
            vps6 =
            {
              ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO5ZcvyRyOnUCuRtqrM/Qf+AdUe3a5bhbnfyhw2FSLDZ";
-              hostnames = [ "vps6.chn.moe" "wireguard.vps6.chn.moe" "74.211.99.69" "192.168.83.1" ];
+              hostnames =
+              [
+                "vps6.chn.moe" "internal.vps6.chn.moe" "wireguard.vps6.chn.moe"
+                "74.211.99.69" "192.168.82.1" "192.168.83.1"
+              ];
            };
            "initrd.vps6" =
            {
@@ -24,7 +28,11 @@ inputs:
            vps7 =
            {
              ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5XkdilejDAlg5hZZD0oq69k8fQpe9hIJylTo/aLRgY";
-              hostnames = [ "vps7.chn.moe" "wireguard.vps7.chn.moe" "ssh.git.chn.moe" "95.111.228.40" "192.168.83.2" ];
+              hostnames =
+              [
+                "vps7.chn.moe" "internal.vps7.chn.moe" "wireguard.vps7.chn.moe"
+                "95.111.228.40" "192.168.82.2" "192.168.83.2"
+              ];
            };
            "initrd.vps7" =
            {
@@ -34,22 +42,21 @@ inputs:
            nas =
            {
              ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIktNbEcDMKlibXg54u7QOLt0755qB/P4vfjwca8xY6V";
-              hostnames = [ "wireguard.nas.chn.moe" "[office.chn.moe]:5440" "192.168.1.185" "192.168.83.4" ];
+              hostnames =
+              [
+                "internal.nas.chn.moe" "wireguard.nas.chn.moe" "[office.chn.moe]:5440"
+                "192.168.1.185" "192.168.82.4" "192.168.83.4"
+              ];
            };
            "initrd.nas" =
            {
              ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAoMu0HEaFQsnlJL0L6isnkNZdRq0OiDXyaX3+fl3NjT";
              hostnames = [ "initrd.nas.chn.moe" "[office.chn.moe]:5440" "192.168.1.185" ];
            };
-            surface =
-            {
-              ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFdm3DcfHdcLP0oSpVrWwIZ/b9lZuakBSPwCFz2BdTJ7";
-              hostnames = [ "192.168.1.166" "wireguard.surface.chn.moe" "192.168.83.5" ];
-            };
            pc =
            {
              ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSfREi19OSwQnhdsE8wiNwGSFFJwNGN0M5gN+sdrrLJ";
-              hostnames = [ "wireguard.pc.chn.moe" "192.168.83.3" ];
+              hostnames = [ "internal.pc.chn.moe" "wireguard.pc.chn.moe" "192.168.82.3" "192.168.83.3" ];
            };
            hpc =
            {
@@ -101,16 +108,8 @@ inputs:
            else []
          ))
          (attrsToList servers)));
-      programs.ssh =
-      {
-        startAgent = true;
-        enableAskPassword = true;
-        askPassword = "${inputs.pkgs.systemd}/bin/systemd-ask-password";
-        extraConfig = "AddKeysToAgent yes";
-      };
-      environment.sessionVariables.SSH_ASKPASS_REQUIRE = "prefer";
      nixos.users.sharedModules =
-      [(hmInputs: {
+      [{
        config.programs.ssh =
        {
          enable = true;
@@ -121,7 +120,10 @@ inputs:
          (
            (builtins.map
              (host: { name = host; value = { inherit host; hostname = "${host}.chn.moe"; }; })
-              [ "vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.pc" "wireguard.nas" "wireguard.surface" ])
+              [
+                "vps6" "internal.vps6" "wireguard.vps6" "vps7" "internal.vps7" "wireguard.vps7"
+                "internal.pc" "wireguard.pc" "internal.nas" "wireguard.nas"
+              ])
            ++ (builtins.map
              (host:
              {
@@ -135,30 +137,12 @@ inputs:
                  {
                    PubkeyAcceptedAlgorithms = "+ssh-rsa";
                    HostkeyAlgorithms = "+ssh-rsa";
-                    SetEnv =
-                      let
-                        usernameMap =
-                        {
-                          chn = "linwei/chn";
-                          xll = "linwei/Xll";
-                          yjq = "linwei/yjq";
-                          gb = "kangjunyong/gongbin";
-                        };
-                        cdString =
-                          if host == "jykang" && (usernameMap ? ${hmInputs.config.home.username}) then
-                            ":chn_cd:${usernameMap.${hmInputs.config.home.username}}"
-                          else "";
-                      in "TERM=chn_unset_ls_colors${cdString}:xterm-256color";
+                    SetEnv = "TERM=chn_unset_ls_colors:xterm-256color";
                    # in .bash_profile:
                    # if [[ $TERM == chn_unset_ls_colors* ]]; then
                    #   export TERM=${TERM#*:}
                    #   export CHN_LS_USE_COLOR=1
                    # fi
-                    # if [[ $TERM == chn_cd* ]]; then
-                    #   export TERM=${TERM#*:}
-                    #   cd ~/${TERM%%:*}
-                    #   export TERM=${TERM#*:}
-                    # fi
                    # in .bashrc
                    # [ -n "$CHN_LS_USE_COLOR" ] && alias ls="ls --color=auto"
                  };
@@ -169,10 +153,8 @@ inputs:
          // {
            xmupc1 = { host = "xmupc1"; hostname = "office.chn.moe"; port = 6007; };
            nas = { host = "nas"; hostname = "office.chn.moe"; port = 5440; };
-            surface = { host = "surface"; hostname = "192.168.1.166"; };
-            gitea = { host = "gitea"; hostname = "ssh.git.chn.moe"; };
          };
        };
-      })];
+      }];
    };
 }
--- a/modules/packages/server/ssh/surface_rsa.pub
+++ b/modules/packages/server/ssh/surface_rsa.pub
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJAyDl52UVGFPTV/rXFERrXAMY5qZ3g+tpg9HOGdw86G4Nr8Xp/cTxZjF4kSfIkSrGblAV9Lm4US0fW3pGOQu5qQrSAENxqHxdlEyzt7izyF2CklDUeTjs3KHOIZMvSli4z014NPcswBbjwB9Lyrw0fCQ9P1vYkrUHEzL2SMxdack1EQPcMF4MxblDqc+eQhdMCkKE8T1Cb1ZqxeLVMPn9CwjG18JoxL+/xs+MjcsSXYWcoqYTfgfhguMbh0D4Eo32MHS/IzRSxnOHJxhG5xYePcyBlb/CxQuYA+RTqKNE85j7GcL2oEmeZ1b++/9qFT9grwVh+UOBRO2xiMzKDF24nXPJ+eLyd6Z/3swGT4rTVDnrXV5eZUkWLHN093IdLJCTtPVrKV9OxEKr5sU2W0edpirNrlGq7/MYkJX9EbQctDFA69XfQkZlGK9xGutqSgEaVlY54fS0Due+NDrNBPfMKJ9MTmFDOY+NYn05El2rMD39OKbGbCR5ASwSSBlcQeE=
--- a/modules/packages/server/zsh/default.nix
+++ b/modules/packages/server/zsh/default.nix
@@ -1,83 +0,0 @@
-inputs:
-{
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-    in mkIf (builtins.elem "server" inputs.config.nixos.packages._packageSets)
-    {
-      nixos.users.sharedModules = [(home-inputs: { config.programs =
-      {
-        zsh =
-        {
-          enable = true;
-          initExtraBeforeCompInit =
-          ''
-            # p10k instant prompt
-            P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh"
-            [[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT"
-            HYPHEN_INSENSITIVE="true"
-            export PATH=~/bin:$PATH
-            function br
-            {
-              local cmd cmd_file code
-              cmd_file=$(mktemp)
-              if broot --outcmd "$cmd_file" "$@"; then
-                cmd=$(<"$cmd_file")
-                command rm -f "$cmd_file"
-                eval "$cmd"
-              else
-                code=$?
-                command rm -f "$cmd_file"
-                return "$code"
-              fi
-            }
-            alias todo="todo.sh"
-          '';
-          plugins =
-          [
-            {
-              file = "powerlevel10k.zsh-theme";
-              name = "powerlevel10k";
-              src = "${inputs.pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
-            }
-            {
-              file = "p10k.zsh";
-              name = "powerlevel10k-config";
-              src = ./p10k-config;
-            }
-            {
-              name = "zsh-lsd";
-              src = inputs.pkgs.fetchFromGitHub
-              {
-                owner = "z-shell";
-                repo = "zsh-lsd";
-                rev = "65bb5ac49190beda263aae552a9369127961632d";
-                hash = "sha256-JSNsfpgiqWhtmGQkC3B0R1Y1QnDKp9n0Zaqzjhwt7Xk=";
-              };
-            }
-          ];
-          history =
-          {
-            path = "${home-inputs.config.xdg.dataHome}/zsh/zsh_history";
-            extended = true;
-            save = 100000000;
-            size = 100000000;
-          };
-        };
-        # set bash history file path, avoid overwriting zsh history
-        bash = { enable = true; historyFile =  "${home-inputs.config.xdg.dataHome}/bash/bash_history"; };
-      };})];
-      programs.zsh =
-      {
-        enable = true;
-        syntaxHighlighting.enable = true;
-        autosuggestions.enable = true;
-        enableCompletion = true;
-        ohMyZsh =
-        {
-          enable = true;
-          plugins = [ "git" "colored-man-pages" "extract" "history-substring-search" "autojump" ];
-        };
-      };
-    };
-}
--- a/modules/packages/workstation/default.nix
+++ b/modules/packages/workstation/default.nix
@@ -14,21 +14,27 @@ inputs:
            # password and key management
            electrum jabref
            # system management
-            wl-mirror nvtop
+            wl-mirror
            # nix tools
-            nix-template nil nix-alien pnpm-lock-export bundix
+            nix-template appimage-run nil nixd nix-alien nix-serve node2nix nix-prefetch-github prefetch-npm-deps
+            nix-prefetch-docker pnpm-lock-export bundix
            # instant messager
-            qq nur-xddxdd.wechat-uos cinny-desktop nheko
+            zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack inputs.config.nur.repos.linyinfeng.wemeet
+            cinny-desktop
+            # office
+            libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview
+            (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
            # development
            jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify aircrack-ng
            # media
-            nur-xddxdd.svp
+            nur-xddxdd.svp obs-studio waifu2x-converter-cpp inkscape blender
            # virtualization
            wineWowPackages.stagingFull virt-viewer bottles # wine64
            # text editor
            appflowy notion-app-enhanced joplin-desktop standardnotes logseq
            # math, physics and chemistry
-            mathematica paraview jmol mpi # qchem.quantum-espresso
+            mathematica octaveFull root ovito paraview localPackages.vesta qchem.quantum-espresso
+            localPackages.vasp localPackages.vaspkit jmol localPackages.v_sim
            # encryption and password management
            john crunch hashcat
            # container and vm
@@ -37,14 +43,13 @@ inputs:
            microsoft-edge
            # news
            rssguard newsflash newsboat
-            yuzu-early-access
-          ]
-          ++ (builtins.concatLists (builtins.map
-            (compiler: builtins.map (version: localPackages.vasp.${compiler}.${version}) [ "6.3.1" "6.4.0" ])
-            [ "gnu" "nvidia" ]));
+          ];
          _pythonPackages = [(pythonPackages: with pythonPackages;
          [
-            phonopy tensorflow keras scipy scikit-learn jupyterlab autograd # localPackages.pix2tex
+            phonopy tensorflow keras openai scipy scikit-learn jupyterlab autograd
+            # localPackages.pix2tex
+            inquirerpy requests python-telegram-bot tqdm fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2
+            certifi charset-normalizer idna orjson psycopg2 localPackages.eigengdb
          ])];
          _prebuildPackages =
          [
@@ -71,6 +76,29 @@ inputs:
        anime-game-launcher = { enable = true; package = inputs.pkgs.anime-game-launcher; };
        honkers-railway-launcher = { enable = true; package = inputs.pkgs.honkers-railway-launcher; };
        nix-ld.enable = true;
+        gamemode =
+        {
+          enable = true;
+          settings =
+          {
+            general.renice = 10;
+            gpu =
+            {
+              apply_gpu_optimisations = "accept-responsibility";
+              nv_powermizer_mode = 1;
+            };
+            custom = let notify-send = "${inputs.pkgs.libnotify}/bin/notify-send"; in
+            {
+              start = "${notify-send} 'GameMode started'";
+              end = "${notify-send} 'GameMode ended'";
+            };
+          };
+        };
+        chromium =
+        {
+          enable = true;
+          extraOpts.PasswordManagerEnabled = false;
+        };
      };
    };
 }
--- a/modules/services/akkoma.nix
+++ b/modules/services/akkoma.nix
@@ -1,51 +0,0 @@
-inputs:
-{
-  options.nixos.services.akkoma = let inherit (inputs.lib) mkOption types; in
-  {
-    enable = mkOption { type = types.bool; default = false; };
-    hostname = mkOption { type = types.str; default = "akkoma.chn.moe"; };
-  };
-  config =
-    let
-      inherit (inputs.config.nixos.services) akkoma;
-      inherit (inputs.lib) mkIf;
-    in mkIf akkoma.enable
-    {
-      services.akkoma =
-      {
-        enable = true;
-        config.":pleroma" =
-        {
-          "Pleroma.Web.Endpoint".url.host = akkoma.hostname;
-          "Pleroma.Repo" =
-          {
-            adapter = (inputs.pkgs.formats.elixirConf { }).lib.mkRaw "Ecto.Adapters.Postgres";
-            hostname = "127.0.0.1";
-            username = "akkoma";
-            password._secret = inputs.config.sops.secrets."akkoma/db".path;
-            database = "akkoma";
-          };
-          ":instance" =
-          {
-            name = "艹";
-            email = "grass@grass.squre";
-            description = "艹艹艹艹艹";
-          };
-        };
-      };
-      nixos.services =
-      {
-        nginx =
-        {
-          enable = true;
-          https."${akkoma.hostname}" =
-          {
-            global.tlsCert = "/var/lib/akkoma";
-            location."/".proxy = { upstream = "http://127.0.0.1:4000"; websocket = true; };
-          };
-        };
-        postgresql.instances.akkoma = {};
-      };
-      sops.secrets."akkoma/db" = { owner = "akkoma"; key = "postgresql/akkoma"; };
-    };
-}
--- a/modules/services/beesd.nix
+++ b/modules/services/beesd.nix
@@ -8,14 +8,8 @@ inputs:
      type = types.attrsOf (types.oneOf
      [
        types.nonEmptyStr
-        (types.submodule
-        {
-          options =
-          {
-            device = mkOption { type = types.nonEmptyStr; };
-            hashTableSizeMB = mkOption { type = types.ints.unsigned; default = 1024; };
-            threads = mkOption { type = types.ints.unsigned; default = 1; };
-          };})
+        (types.submodule { options =
+          { device = mkOption { type = types.nonEmptyStr; }; hashTableSizeMB = mkOption { type = types.int; }; };})
      ]);
      default = {};
    };
@@ -36,7 +30,7 @@ inputs:
            {
              spec = instance.value.device or instance.value;
              hashTableSizeMB = instance.value.hashTableSizeMB or 1024;
-              extraOptions = [ "--thread-count" "${toString instance.value.threads or 1}" "--scan-mode" "3" ];
+              extraOptions = [ "--thread-count" "1" "--scan-mode" "3" ];
            };
          })
          (attrsToList beesd.instances));
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -35,14 +35,10 @@ inputs:
    ./httpapi.nix
    ./mirism.nix
    ./mastodon.nix
-    ./gitea.nix
+    ./gitlab.nix
    ./grafana.nix
    ./fail2ban.nix
    ./wireguard.nix
-    ./akkoma.nix
-    ./gamemode.nix
-    ./vikunja.nix
-    ./slurm.nix
  ];
  options.nixos.services = let inherit (inputs.lib) mkOption types; in
  {
--- a/modules/services/fontconfig.nix
+++ b/modules/services/fontconfig.nix
@@ -14,18 +14,14 @@ inputs:
      {
        fontDir.enable = true;
        packages = with inputs.pkgs;
-        [
-          noto-fonts source-han-sans source-han-serif source-code-pro hack-font jetbrains-mono nerdfonts hack-font inter
-          noto-fonts-color-emoji roboto sarasa-gothic source-han-mono wqy_microhei wqy_zenhei
-        ];
+          [ noto-fonts source-han-sans source-han-serif source-code-pro hack-font jetbrains-mono nerdfonts ];
        fontconfig.defaultFonts =
        {
          emoji = [ "Noto Color Emoji" ];
-          monospace = [ "Hack" "Source Han Mono SC" ];
-          sansSerif = [ "Inter" "Liberation Sans" "Source Han Sans SC" ];
-          serif = [ "Liberation Serif" "Source Han Serif SC" ];
+          monospace = [ "Noto Sans Mono CJK SC" "Sarasa Mono SC" "DejaVu Sans Mono"];
+          sansSerif = [ "Noto Sans CJK SC" "Source Han Sans SC" "DejaVu Sans" ];
+          serif = [ "Noto Serif CJK SC" "Source Han Serif SC" "DejaVu Serif" ];
        };
      };
-      nixos.users.sharedModules = [{ config.xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true; }];
    };
 }
--- a/modules/services/frp.nix
+++ b/modules/services/frp.nix
@@ -113,7 +113,6 @@ inputs:
                    type = "stcp";
                    transport.useCompression = true;
                    secretKey = inputs.config.sops.placeholder."frp/stcp/${stcp.name}";
-                    allowUsers = [ "*" ];
                    inherit (stcp.value) localIp localPort;
                  })
                  (attrsToList frpClient.stcp));
--- a/modules/services/fz-new-order/default.nix
+++ b/modules/services/fz-new-order/default.nix
@@ -76,11 +76,6 @@ inputs:
              in "${binary}/bin/fz-new-order";
          };
        };
-        tmpfiles.rules =
-        [
-          "d /var/lib/fz-new-order 0700 fz-new-order fz-new-order"
-          "Z /var/lib/fz-new-order - fz-new-order fz-new-order"
-        ];
      };
      sops = let userNum = 6; configNum = 2; in
      {
--- a/modules/services/gamemode.nix
+++ b/modules/services/gamemode.nix
@@ -1,30 +0,0 @@
-inputs:
-{
-  options.nixos.services.gamemode = let inherit (inputs.lib) mkOption types; in
-  {
-    enable = mkOption { type = types.bool; default = false; };
-    drmDevice = mkOption { type = types.int; };
-  };
-  config = let inherit (inputs.config.nixos.services) gamemode; in inputs.lib.mkIf gamemode.enable
-  {
-    programs.gamemode =
-    {
-      enable = true;
-      settings =
-      {
-        general.renice = 10;
-        gpu =
-        {
-          apply_gpu_optimisations = "accept-responsibility";
-          nv_powermizer_mode = 1;
-          gpu_device = builtins.toString gamemode.drmDevice;
-        };
-        custom = let notify-send = "${inputs.pkgs.libnotify}/bin/notify-send"; in
-        {
-          start = "${notify-send} 'GameMode started'";
-          end = "${notify-send} 'GameMode ended'";
-        };
-      };
-    };
-  };
-}
--- a/modules/services/gitea.nix
+++ b/modules/services/gitea.nix
@@ -1,54 +0,0 @@
-inputs:
-{
-  options.nixos.services.gitea = let inherit (inputs.lib) mkOption types; in
-  {
-    enable = mkOption { type = types.bool; default = false; };
-    hostname = mkOption { type = types.str; default = "git.chn.moe"; };
-  };
-  config =
-    let
-      inherit (inputs.config.nixos.services) gitea;
-      inherit (inputs.lib) mkIf;
-    in mkIf gitea.enable
-    {
-      services.gitea =
-      {
-        enable = true;
-        lfs.enable = true;
-        mailerPasswordFile = inputs.config.sops.secrets."gitea/mail".path;
-        database =
-          { createDatabase = false; type = "postgres"; passwordFile = inputs.config.sops.secrets."gitea/db".path; };
-        settings =
-        {
-          session.COOKIE_SECURE = true;
-          server =
-          {
-            ROOT_URL = "https://${gitea.hostname}";
-            DOMAIN = gitea.hostname;
-            HTTP_PORT = 3002;
-            SSH_DOMAIN = "ssh.${gitea.hostname}";
-          };
-          mailer =
-          {
-            ENABLED = true;
-            FROM = "bot@chn.moe";
-            PROTOCOL = "smtps";
-            SMTP_ADDR = "mail.chn.moe";
-            SMTP_PORT = 465;
-            USER = "bot@chn.moe";
-          };
-        };
-      };
-      nixos.services =
-      {
-        nginx = { enable = true; https."${gitea.hostname}".location."/".proxy.upstream = "http://127.0.0.1:3002"; };
-        postgresql.instances.gitea = {};
-      };
-      sops.secrets =
-      {
-        "gitea/mail" = { owner = "gitea"; key = "mail/bot"; };
-        "gitea/db" = { owner = "gitea"; key = "postgresql/gitea"; };
-        "mail/bot" = {};
-      };
-    };
-}
--- a/modules/services/gitlab.nix
+++ b/modules/services/gitlab.nix
@@ -0,0 +1,72 @@
+inputs:
+{
+  options.nixos.services.gitlab = let inherit (inputs.lib) mkOption types; in
+  {
+    enable = mkOption { type = types.bool; default = false; };
+    hostname = mkOption { type = types.str; default = "gitlab.chn.moe"; };
+  };
+  config =
+    let
+      inherit (inputs.config.nixos.services) gitlab;
+      inherit (inputs.lib) mkIf;
+    in mkIf gitlab.enable
+    {
+      services.gitlab =
+      {
+        enable = true;
+        host = gitlab.hostname;
+        port = 443;
+        https = true;
+        smtp =
+        {
+          enable = true;
+          address = "mail.chn.moe";
+          username = "bot@chn.moe";
+          passwordFile = inputs.config.sops.secrets."gitlab/mail".path;
+          tls = true;
+          enableStartTLSAuto = false;
+          port = 465;
+          domain = gitlab.hostname;
+          authentication = "login";
+        };
+        extraConfig.gitlab.email_from = "bot@chn.moe";
+        secrets =
+        {
+          secretFile = inputs.config.sops.secrets."gitlab/secret".path;
+          otpFile = inputs.config.sops.secrets."gitlab/otp".path;
+          jwsFile = inputs.config.sops.secrets."gitlab/jws".path;
+          dbFile = inputs.config.sops.secrets."gitlab/dbFile".path;
+        };
+        initialRootPasswordFile = inputs.config.sops.secrets."gitlab/root".path;
+        initialRootEmail = "bot@chn.moe";
+        databasePasswordFile = inputs.config.sops.secrets."gitlab/db".path;
+        databaseHost = "127.0.0.1";
+      };
+      nixos.services =
+      {
+        nginx =
+        {
+          enable = true;
+          https."${gitlab.hostname}".location."/".proxy.upstream = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+        };
+        postgresql.instances.gitlab = {};
+      };
+      sops.secrets = let owner = inputs.config.services.gitlab.user; in
+      {
+        "gitlab/mail" = { owner = owner; key = "mail/bot"; };
+        "gitlab/secret".owner = owner;
+        "gitlab/otp".owner = owner;
+        "gitlab/jws" =
+        {
+          owner = owner;
+          sopsFile =
+            "${inputs.topInputs.self}/secrets/${inputs.config.nixos.system.networking.hostname}/gitlab/jws.bin";
+          format = "binary";
+        };
+        "gitlab/dbFile".owner = owner;
+        "gitlab/root".owner = owner;
+        "gitlab/db" = { owner = owner; key = "postgresql/gitlab"; };
+        "mail/bot" = {};
+      };
+    };
+}
--- a/modules/services/groupshare.nix
+++ b/modules/services/groupshare.nix
@@ -20,7 +20,7 @@ inputs:
          (user:
          [
            "d /var/lib/groupshare/${user} 2750 ${user} groupshare"
-            "Z /var/lib/groupshare/${user} - ${user} groupshare"
+            "Z /var/lib/groupshare/${user} 2750 ${user} groupshare"
            ("A /var/lib/groupshare/${user} - - - - "
              # d 指 default, 即目录下新创建的文件和目录的权限
              # 大写 X 指仅给目录执行权限
--- a/modules/services/httpapi.nix
+++ b/modules/services/httpapi.nix
@@ -40,6 +40,6 @@ inputs:
        };
        secrets."httpapi/token" = {};
      };
-      systemd.tmpfiles.rules = [ "d /srv/api 0700 nginx nginx" "Z /srv/api - nginx nginx" ];
+      systemd.tmpfiles.rules = let perm = "/srv/api 0700 nginx nginx"; in [ "d ${perm}" "Z ${perm}" ];
    };
 }
--- a/modules/services/meilisearch.nix
+++ b/modules/services/meilisearch.nix
@@ -78,9 +78,9 @@ inputs:
            let
              user = instance.value.user;
              group = inputs.config.users.users.${instance.value.user}.group;
-              dir = "/var/lib/meilisearch/${instance.name}";
+              perm = "/var/lib/meilisearch/${instance.name} 0700 ${user} ${group}";
            in
-              [ "d ${dir} 0700 ${user} ${group}" "Z ${dir} - ${user} ${group}" ])
+              [ "d ${perm}" "Z ${perm}" ])
          (attrsToList meilisearch.instances));
      };
      sops =
--- a/modules/services/mirism.nix
+++ b/modules/services/mirism.nix
@@ -32,15 +32,13 @@ inputs:
                User = inputs.config.users.users.mirism.name;
                Group = inputs.config.users.users.mirism.group;
                ExecStart = "${inputs.pkgs.localPackages.mirism}/bin/${instance}";
-                RuntimeMaxSec = "1d";
-                Restart = "always";
              };
            };
          })
          [ "ng01" "beta" ]);
        tmpfiles.rules = concatLists (map
-          (dir: [ "d /srv/${dir}mirism 0700 nginx nginx" "Z /srv/${dir}mirism - nginx nginx" ])
-          [ "" "entry." ]);
+          (perm: [ "d ${perm}" "Z ${perm}" ])
+          (map (dir: "/srv/${dir}mirism 0700 nginx nginx") [ "" "entry." ]));
      };
      nixos.services =
      {
--- a/modules/services/misskey.nix
+++ b/modules/services/misskey.nix
@@ -48,8 +48,9 @@ inputs:
              Restart = "always";
            };
          };
-          tmpfiles.rules = let dir = "/var/lib/misskey/${instance.name}/files"; owner = "misskey-${instance.name}"; in
-            [ "d ${dir} 0700 ${owner} ${owner}" "Z ${dir} - ${owner} ${owner}" ];
+          tmpfiles.rules =
+            let perm = "/var/lib/misskey/${instance.name}/files 0700 misskey-${instance.name} misskey-${instance.name}";
+            in [ "d ${perm}" "Z ${perm}" ];
        })
        (attrsToList misskey.instances));
      fileSystems = mkMerge (map
@@ -89,7 +90,7 @@ inputs:
                  user: misskey_${replaceStrings [ "-" ] [ "_" ] instance.name}
                  pass: ${placeholder."postgresql/misskey_${replaceStrings [ "-" ] [ "_" ] instance.name}"}
                  extra:
-                    statement_timeout: 600000
+                    statement_timeout: 60000
                dbReplications: false
                redis:
                  host: 127.0.0.1
--- a/modules/services/nginx/applications/blog.nix
+++ b/modules/services/nginx/applications/blog.nix
@@ -12,6 +12,6 @@ inputs:
    {
      nixos.services.nginx.https."blog.chn.moe".location."/".static =
        { root = "/srv/blog"; index = [ "index.html" ]; };
-      systemd.tmpfiles.rules = [ "d /srv/blog 0700 nginx nginx" "Z /srv/blog - nginx nginx" ];
+      systemd.tmpfiles.rules = let perm = "/srv/blog 0700 nginx nginx"; in [ "d ${perm}" "Z ${perm}" ];
    };
 }
--- a/modules/services/nginx/applications/catalog.nix
+++ b/modules/services/nginx/applications/catalog.nix
@@ -12,6 +12,6 @@ inputs:
    {
      nixos.services.nginx.https."catalog.chn.moe".location."/".static =
        { root = "/srv/catalog"; index = [ "index.html" ]; };
-      systemd.tmpfiles.rules = [ "d /srv/catalog 0700 nginx nginx" "Z /srv/catalog - nginx nginx" ];
+      systemd.tmpfiles.rules = let perm = "/srv/catalog 0700 nginx nginx"; in [ "d ${perm}" "Z ${perm}" ];
    };
 }
--- a/modules/services/nginx/applications/default.nix
+++ b/modules/services/nginx/applications/default.nix
@@ -8,6 +8,5 @@ inputs:
    ./webdav.nix
    ./blog.nix
    ./catalog.nix
-    ./main.nix
  ];
 }
--- a/modules/services/nginx/applications/element.nix
+++ b/modules/services/nginx/applications/element.nix
@@ -5,7 +5,7 @@ inputs:
    type = types.attrsOf (types.submodule (submoduleInputs: { options =
    {
      hostname = mkOption { type = types.nonEmptyStr; default = submoduleInputs.config._module.args.name; };
-      defaultServer = mkOption { type = types.nullOr types.nonEmptyStr; default = "matrix.chn.moe"; };
+      defaultServer = mkOption { type = types.nullOr types.nonEmptyStr; default = "element.chn.moe"; };
    };}));
    default = {};
  };
--- a/modules/services/nginx/applications/kkmeeting.nix
+++ b/modules/services/nginx/applications/kkmeeting.nix
@@ -13,6 +13,6 @@ inputs:
    {
      nixos.services.nginx.https.${kkmeeting.hostname}.location."/".static =
        { root = "/srv/kkmeeting"; index = "auto"; charset = "utf-8"; };
-      systemd.tmpfiles.rules = [ "d /srv/kkmeeting 0700 nginx nginx" "Z /srv/kkmeeting - nginx nginx" ];
+      systemd.tmpfiles.rules = let perm = "/srv/kkmeeting 0700 nginx nginx"; in [ "d ${perm}" "Z ${perm}" ];
    };
 }
--- a/modules/services/nginx/applications/main.nix
+++ b/modules/services/nginx/applications/main.nix
@@ -1,23 +0,0 @@
-inputs:
-{
-  options.nixos.services.nginx.applications.main = let inherit (inputs.lib) mkOption types; in
-  {
-    enable = mkOption { type = types.bool; default = false; };
-  };
-  config =
-    let
-      inherit (inputs.config.nixos.services.nginx.applications) main;
-      inherit (inputs.lib) mkIf;
-    in mkIf main.enable
-    {
-      nixos.services.nginx.https."chn.moe".location =
-      {
-        "/".return.return = "302 https://xn--s8w913fdga.chn.moe/@chn";
-        "/.well-known/matrix/server".proxy =
-        {
-          setHeaders.Host = "matrix.chn.moe";
-          upstream = "https://matrix.chn.moe";
-        };
-      };
-    };
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`1k9anln9hmdjflrkq4iacrmhma7gfrfj6d0b8ywxys0wfpdvy12v`
				`@@ -1 +0,0 @@`
				ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJAyDl52UVGFPTV/rXFERrXAMY5qZ3g+tpg9HOGdw86G4Nr8Xp/cTxZjF4kSfIkSrGblAV9Lm4US0fW3pGOQu5qQrSAENxqHxdlEyzt7izyF2CklDUeTjs3KHOIZMvSli4z014NPcswBbjwB9Lyrw0fCQ9P1vYkrUHEzL2SMxdack1EQPcMF4MxblDqc+eQhdMCkKE8T1Cb1ZqxeLVMPn9CwjG18JoxL+/xs+MjcsSXYWcoqYTfgfhguMbh0D4Eo32MHS/IzRSxnOHJxhG5xYePcyBlb/CxQuYA+RTqKNE85j7GcL2oEmeZ1b++/9qFT9grwVh+UOBRO2xiMzKDF24nXPJ+eLyd6Z/3swGT4rTVDnrXV5eZUkWLHN093IdLJCTtPVrKV9OxEKr5sU2W0edpirNrlGq7/MYkJX9EbQctDFA69XfQkZlGK9xGutqSgEaVlY54fS0Due+NDrNBPfMKJ9MTmFDOY+NYn05El2rMD39OKbGbCR5ASwSSBlcQeE=