system.initrd: remove ip=dhcp kernel parameter

This reverts commit fdbf027236.

.envrc

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

.gitattributes

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

.gitignore

@@ -1,5 +1,5 @@
 result
-result-man
+result-*
 outputs
 .direnv
 build

.sops.yaml

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

blog/.gitignore

@@ -0,0 +1,4 @@
+/themes
+/public
+/.hugo_build.lock
+/resources/_gen

blog/archetypes/default.md

@@ -0,0 +1,5 @@
++++
+title = '{{ replace .File.ContentBaseName "-" " " | title }}'
+date = {{ .Date }}
+draft = true
++++

blog/content/_index.md

@@ -0,0 +1,6 @@
+---
+title: Introduction
+type: docs
+---
+
+这里是主页

blog/content/docs/example/_index.md

@@ -0,0 +1,7 @@
+---
+weight: 1
+bookFlatSection: true
+title: "Example Site"
+---
+
+{{< callout emoji="​:building_construction:" >}} 施工中 {{< /callout >}}

blog/content/posts/_index.md

@@ -0,0 +1,5 @@
+---
+title: Blog
+---
+
+我得在这里写点什么

blog/content/posts/helloworld.md

@@ -0,0 +1,49 @@
+---
+title: Helloworld
+date: 2024-08-24T20:13:59+08:00
+draft: false
+summary: 为什么不问问神奇海螺呢？
+math: true
+---
+
+# 一级标题
+
+## 二级标题
+
+### 三级标题
+
+hello world!
+
+* 无序列表1
+* 无序列表2
+* 无序列表3
+
+1. 有序列表1
+2. 有序列表2
+3. 有序列表3
+
+> 这是一个引用
+> 写了两行
+
+如果段与段之间
+没有空行
+会怎样？
+
+```c++
+#include <iostream>
+using namespace std;
+int main() {
+    cout << "Hello, World!" << endl;
+    return 0;
+}
+```
+
+这是一个行内代码`printf("Hello, World!\n");`，和行内公式 $E=mc^2$。
+
+$$
+\int_{-\infty}^{+\infty} e^{-x^2} \dd x = \sqrt{\pi}
+$$
+
+**这是粗体文本**，*这是斜体文本*。
+
+[这是一个链接](https://www.example.com)

blog/default.nix

@@ -0,0 +1,13 @@
+{ stdenv, hextra, hugo }: stdenv.mkDerivation
+{
+  name = "blog";
+  src = ./.;
+  nativeBuildInputs = [ hugo ];
+  configurePhase =
+  ''
+    mkdir themes
+    ln -s ${hextra} themes/hextra
+  '';
+  buildPhase = "hugo";
+  installPhase = "cp -r public $out";
+}

blog/hugo.yaml

@@ -0,0 +1,144 @@
+baseURL: https://blog.chn.moe/
+theme: hextra
+
+enableRobotsTXT: true
+enableGitInfo: false
+enableEmoji: true
+hasCJKLanguage: true
+
+# services:
+#   googleAnalytics:
+#     ID: G-MEASUREMENT_ID
+
+outputs:
+  home: [ html ]
+  page: [ html ]
+  section: [ html, rss ]
+
+defaultContentLanguage: zh-cn
+languages:
+  zh-cn:
+    languageName: 简体中文
+    languageCode: zh-CN
+    weight: 1
+    title: My New Hugo Site
+  en:
+    languageName: English
+    weight: 2
+    title: My New Hugo Site
+    contentDir: content/en
+
+# Needed for mermaid/katex shortcodes
+markup:
+  goldmark:
+    renderer:
+      unsafe: true
+  highlight:
+    noClasses: false
+
+enableInlineShortcodes: true
+
+menu:
+  main:
+    - identifier: documentation
+      name: Documentation
+      pageRef: /docs
+      weight: 1
+    - identifier: blog
+      name: Blog
+      pageRef: /blog
+      weight: 2
+    - identifier: about
+      name: About
+      pageRef: /about
+      weight: 3
+    - name: Search
+      weight: 4
+      params:
+        type: search
+    - name: GitHub
+      weight: 5
+      url: "https://github.com/imfing/hextra"
+      params:
+        icon: github
+  sidebar:
+    - identifier: more
+      name: More
+      params:
+        type: separator
+      weight: 1
+    - identifier: about
+      name: "About"
+      pageRef: "/about"
+      weight: 2
+    - identifier: hugoDocs
+      name: "Hugo Docs ↗"
+      url: "https://gohugo.io/documentation/"
+      weight: 3
+
+params:
+  description: Modern, responsive, batteries-included Hugo theme for creating beautiful static websites.
+  navbar:
+    displayTitle: true
+    displayLogo: true
+    logo:
+      path: images/logo.svg
+      dark: images/logo-dark.svg
+      # width: 40
+      # height: 20
+      # link: /
+    width: wide
+  page:
+    # full (100%), wide (90rem), normal (1280px)
+    width: normal
+  theme:
+    # light | dark | system
+    default: system
+    displayToggle: true
+  footer:
+    enable: true
+    displayCopyright: true
+    displayPoweredBy: true
+    width: normal
+  displayUpdatedDate: true
+  dateFormat: "January 2, 2006"
+  search:
+    enable: true
+    type: flexsearch
+    flexsearch:
+      # index page by: content | summary | heading | title
+      index: content
+      # full | forward | reverse | strict
+      # https://github.com/nextapps-de/flexsearch/#tokenizer-prefix-search
+      tokenize: forward
+  editURL:
+    enable: true
+    base: "https://github.com/imfing/hextra/edit/main/exampleSite/content"
+  blog:
+    list:
+      displayTags: true
+      # date | lastmod | publishDate | title | weight
+      sortBy: date
+      sortOrder: desc # or "asc"
+  highlight:
+    copy:
+      enable: true
+      # hover | always
+      display: hover
+  comments:
+    # TODO: enable cusdis
+    enable: false
+    type: giscus
+    # https://giscus.app/
+    giscus:
+      repo: imfing/hextra
+      repoId: R_kgDOJ9fJag
+      category: General
+      categoryId: DIC_kwDOJ9fJas4CY7gW
+      # mapping: pathname
+      # strict: 0
+      # reactionsEnabled: 1
+      # emitMetadata: 0
+      # inputPosition: top
+      # lang: en
+  math: true

devices/jykang.xmuhpc/.bash_logout

@@ -0,0 +1,3 @@
+if [ -z "${CHN_DEBUG-}" ]; then
+  hpcstat logout
+fi

devices/jykang.xmuhpc/.bash_profile

@@ -0,0 +1,3 @@
+if [ -f ~/.bashrc ]; then
+	. ~/.bashrc
+fi

devices/jykang.xmuhpc/.bashrc

@@ -0,0 +1,42 @@
+# This is really FOLLISH but it works
+if [ -z "${BASHRC_SOURCED-}" ]; then
+	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
+	if [[ $TERM == hpcstat_subaccount* ]]; then
+		export TERM=${TERM#*:}
+		export HPCSTAT_SUBACCOUNT=${TERM%%:*}
+		export TERM=${TERM#*:}
+	fi
+	if [[ $TERM == chn_debug* ]]; then
+		export TERM=${TERM#*:}
+		export CHN_DEBUG=1
+	fi
+
+	export HPCSTAT_DATADIR=$HOME/linwei/chn/software/hpcstat/var/lib/hpcstat
+	export HPCSTAT_SHAREDIR=$HOME/linwei/chn/software/hpcstat/share/hpcstat
+	export HPCSTAT_SSH_BINDIR=$HOME/linwei/chn/software/hpcstat/bin
+	export HPCSTAT_DUC_BINDIR=$HOME/linwei/chn/software/hpcstat/bin
+	export HPCSTAT_BSUB=/opt/ibm/lsfsuite/lsf/10.1/linux2.6-glibc2.3-x86_64/bin/bsub
+	${HPCSTAT_SSH_BINDIR}/hpcstat login
+	if [ "$?" -ne 0 ]; then
+		exit 1
+	fi
+fi
+
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+if [ -z "${BASHRC_SOURCED-}" ]; then
+	export PATH=$HPCSTAT_SSH_BINDIR:$PATH:$HOME/bin:$HOME/linwei/chn/software/scripts
+	export BASHRC_SOURCED=1
+fi
+
+[ -n "$CHN_LS_USE_COLOR" ] && alias ls="ls --color=auto"

devices/jykang.xmuhpc/.ssh/authorized_keys

@@ -0,0 +1,17 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXlhoouWG+arWJz02vBP/lxpG2tUjx8jhGBnDeNyMu0OtGcnHMAWcb3YDP0A2XJIVFBCCZMM2REwnSNbHRSCl1mTdRbelfjA+7Jqn1wnrDXkAOG3S8WYXryPGpvavu6lgW7p+dIhGiTLWwRbFH+epFTn1hZ3A1UofVIWTOPdoOnx6k7DpQtIVMWiIXLg0jIkOZiTMr3jKfzLMBAqQ1xbCV2tVwbEY02yxxyxIznbpSPReyn1RDLWyqqLRd/oqGPzzhEXNGNAZWnSoItkYq9Bxh2AvMBihiTir3FEVPDgDLtS5LUpM93PV1yTr6JyCPAod9UAxpfBYzHKse0KCQFoZH chn@chn-PC
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDWAfyfDFctbzJTiuK9IPw3yFLqt7vqd/T0/HoZfH/bzLZ8GVeod2oz6kjm3ns0IG94HO5vGMEmQfbK1ZKT2TqA7ve+3wG9seiwfh8xh7Xhl2AnaF0pjHEXnw+w8mTzxCv9qRhsgfHuuBVhH6PguHvk66GKjvNaxTJhlKAyNogOI3jLnw7ODFScldHbJlMYl1pBHV/G/Zeuq0qnA/pkeiFdvlsZUVGD0cCfuoHm8FCfEzv6pfkhVJUH0v5rof8GiT9eg7ntG49Gei1lkH5NosbY8f6fEKNSoOc0dm5g2FaI3D7LJixwQ6rMiJwmPb6A4oHmcJQKokU8uhROQorYLgV7RtrnHu2cHMRW6SiAUvpmvaPPcxn8CbfuSOGDhYRKxNJNtWRK08Urtq9tYD+Fpze4QoZXxN35uvsi3lMA55PK0AsTm/aVGslzHUUzgWtDxcI2pLAm9rFpCRPCY+UC1Xp5vjZoqZXwhJ81qZ7VXWTM2voxCrKAlu+Zg2FaQD5szOU= gb@xmupc1
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJ/jzUQ6QuAjnAryvpWk7TReS6pnHxhEXY9RonojKkurhfYSQO/IlxDMDq23TFXcgu8iZG4cS6MADgx/KNZD/MjuN9YNCIEGvMwzWvB0oM25BC6Vf3iKDmhH06rZKH6/g5GN+HWoCN4yE/+MhIpegFO3+YMpveXwEESlyoIjPvcW+RwmlNJevrHd83ETYDQ4AybWyJo6en5tz2ngr22HaK4MtxgrqnIN/KorY+nrzTNa7VBC7BaZc1tA5FLwUeCXtuzp2ibfrxoGUAiDig4FW09ijCk3Y77y7aNVI2nw5y28nCV5rgVMh5fejtNVqIqku7p+8qgjxvY6veATG0lYgZgw2ldnDGDNbEGxcCnKKmCgZMxok8zTRsniZ91KuHkcl2L7xUo7kdQYzBRwZyQ53eW+yPoqUya4yn272rscBEUMyZzmegfr1SXMqw/8zn+MZdr1KXEvrbfjX+2QL52GY3bfYUf3KFje+Sp88k688bRH0vrxj9BCOS7ovbyfe9BEU= xll@xmupc1
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCtnVhZQsJfbs2w9hFZkx4qDhIs++7no+6r5TifP3Dq7epJYd2QYx4dI66XxTNhKxZjN6a4Xn5nFlYLtQJXOvzBLC8IBf1W5GCH0k/jqzzskS0/Ix/70HzcBwJk8ihWDkyON5Ki1BRCx34RNxth1BIxWyc5QT+lou+D92x8iAu/uOvmcAL3Ua0OlZwxw03hLp/PpS4ZnUqFjc2JVtarY7eQu/i3RwOZUaK6nT2EL8RObzk4xnieqsU5PWwA3voVjetqZaDQ+P7dimQXz/FaucroKxCNyTiy1oG4fdQpm2UDrH6ZfPvdQLYrtet6FQabXOxhV7MuR3jYtxZjs1kDVZIseIZ6IwjetaUoMxvIouRfYjOSIEo9Ek9o0+Yhku4r0uWmPDrymWugU1raMmlRxSUwdlzW+C7mQwtGbs/MG4MN4GWkM6id5DKlY2vYKUfrTzmhY1swCtzKq20fjvyX8qhJdcytgVlOrBZnPje6Qd55sI0RjdgJrBsxT2SYquez7U8= yjq@xmupc1
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDn1pfGen7kjPTHsbb8AgrUJWOeFPHK5S4M97Lcj3tvdcjZi2SXN6PwHQfh8/xGhZbTLPz/40S9O9/Dn30xkUTfnONirKt790jp7VEbOtPnjQPOd/KRNWlS3VV0BELuq5p633Mi13rP6JZtdKmU2uSkvvaUBfCppy3JaWv/B7HLJ48f8IzkdiT1px3dN1eQ4SFoHOiVG0ci5TGG6wfMdoAAnM9R1aXI4gDxnYjLYujpaNZ4hBOta/6ZK/PV0JufoXdIAZjubgk1Hv04XHXLR2Z0UhRM6x7UrZIOdM/LlnKmcVk408ZKEj/9m1xRyDsNoZ24CF++cmnwfBHrp9I5nvDI7xOTdZlOhzkiiPM3f4i6s2Qjdv4vpZ6AeE3Qt1LVQyAr67b4UMjHuYqSi2KgyCO6My2Ov2eRoS74EKcb8ejJv3O+XInmYUgDgTgDFT3CgQgK2DG45HiV6nOkaE/6iKx2JSOiYZTFc7TRcePfXF9JQD7dXFde6qm3EbIVyJIpCJ8= zem@xmupc1
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCW2fx1Sim7X2i/e/RBPEl1q/XbV7wa9pmZfnRINHIv24MCUgtNZ5GHEEW7dvzrQBeRj3I7CAyK8fbuhv/l8HuDtjxJJ1fmcBp9UG5vfpb/UTxayJxHBRrwokp2JL7HKVviI6d8FcNa/T0CMoUNYXnel6dE3B78k9Q0dDxlOGS1MzgsP3Pn66lm0ww9FRAVHe+KkhFmwyQ1VHUxHgK4QjCIt7+9+PJE7fK0aVWBsR309pui7Pbm6mgd4d6mwiBeVvxsNGnI4DsO1hz4N2GapuQy19PDiG7A4H41Z5RYQnv/3XTy4TBXOFQm77v6pyGkCmG6BGnRdvMB6C0hWPJvudbsA/BNp4ApL7/CrwTdLp1z6ToAOLvKrUQAM+hcbJimnFVMXqz7iSYg99XTnzue7ncecp19XiaDJbM47bGXcT4nTO5XaiMYi2xGAHIrij5GIuFF5ymKYSp5ejb1VucMdKlaaAmS10+wdUcuT7tzX/IuVr5aqg2dsxT5aJCRhZ1k2V0= xly@xmuhpc
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMRpyIU8ZuYTa0LvsVHmJZ1FA7Lbp4PObjkwo+UcpCP8 wp@xmupc1
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGRZp8xp9hVO7e/6eflQsnFZj853IRVywc97cTevnWbg hjp@xmupc1
+
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCmJoiGO5YD3lbbIOJ99Al2xxm6QS9q+dTCTtlALjYI5f9ICGZJT8PEGlV9BBNCRQdgb3i2LBzQi90Tq1oG6/PcTV3Mto2TawLz5+2+ym29eIq1QIhVTLmZskK815FpawWqxY6+xpGU3vP1WjrFBbhGtl+CCaN+P2TWNkrR8FjG2144hdAlFfEEqfQC+TXbsyJCYoExuxGDJo8ae0JGbz9w1A1UbjnHwKnoxvirTFEbw9IHJIcTdUwuQKOrwydboCOqeaHt74+BnnCOZhpYqMDacrknHITN4GfFFzbs6FsE8NAwFk6yvkNXXzoe60iveNXtCIYuWjG517LQgHAC5BdaPgqzYNg+eqSul72e+jjRs+KDioNqvprw+TcBBO1lXZ2VQFyWyAdV2Foyaz3Wk5qYlOpX/9JLEp6H3cU0XCFR25FdXmjQ4oXN1QEe+2akV8MQ9cWhFhDcbY8Q1EiMWpBVC1xbt4FwE8VCTByZOZsQ0wPVe/vkjANOo+brS3tsR18= 00@xmuhpc
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxcIWDQxVyIRqCGR4uWtrh4tLc025+q6du2GVsox8IzmBFkjNY8Au5GIMP5BKRstxFdg3f/wam8krckUN9rv5+OHB9U8HGz77Xs0FktqRVNMaDPdptePZQJ9A9eW3kkFDfQnORJtiVcEWfUBS3pi0QFOHylnG27YyC/Vjx9tjvtJWKsQEVTFJbFHPdi+G7lHTpqIGx+/a2JN9O6uVujXXYvjSVXsd+CWB9VMZMvYCIz2Ecb6RqR3brj4FhRRl8zyCj+J4ACYFdGWL98fTab2uPHbpVeKrefFFA43JOD/4zwBx/uw7MAQAq0GunTV3FpBfIAQHWgftf2fSlbz20oPjCwdYn9ZuGJOBUroryex7AKZmnSYM3biLHcctQfZtxqVPEU3W/62MUsI/kZb9RcF24JRksMoS2XWTiv2HFf5ijQGLXXOjqiTlGncwiKf65DwkDBsSxzgbXk5Uo86viq6UITFXPx/RytU+SUiN4Wb7wcBTjt/+tyQd1uqc7+3DCDXk= 01@xmuhpc
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDkT/P4MnzxBh8sRi0oQ88duNpY/ejFtptGqUQJVobj23vbu7ju6x/yuXqnHFOLi/IOZgNl5oBhRlJekRL+FWMIwpPBA6MnbVNkHXvwu5kLXVTt0O9dhJfDiPPbYcNjOhw4o8aZMc0oEyz8xZgkPoIehHQda+K5vRhFnYCRgn2X92VY/dW1QqPJKEfN47Tsp00w8wyKixEvuJe8OBEoKDpiZYzbXJKuoKhCdMp0uMHMCojYuYP9rGZO6bHl7Q6cYotGx1jH2pe30Ujtm3Xbm44H1mhXr1K/lhcHfojSge8POqii+eaXSCzqRlXaWyvrL9JLaaRD7GfWDaRWSKDfN8Ha4mnUvRtObRMSLOnr2QOTLJw9QPnlDDxCd1q7yluKraccYnTQQP5JuBwkRqjuJTatd9b18Z14HffmXZNR7asT1sJXK1rWKeLTrZwqxpkuwLAnbr60PVwfMHZeZ6FVPXGZ4wQb22lFHvaZZCEJf+9QDXpDn5L59FlaBYO2Xwojj3s= 02@xmuhpc
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOF3LfnQiI8wpsXGn87bt7rbUZcgsdaOSOswk4Vf4dBautEdQZc0q+UDB2TlR2K8L7SPyywpl5z67euN5QRJLEwg8flTybiJp3EKDctYEM22sa36ONcSIJ/iHSdCkwtPXkBYreh9e+MAHfTroIKK5zM/P1QIN3NrknIXpWjLDF73ejrxE+EXRK6jbuWfo+5dnLnDoUFt1e+pYLZos5KRRB94Qt5I79D/cAg3hG+Zl2FCCOpn1hIdLo/kWJTKUPe61oUaIxriV6nCXp/pU1BHlM43hGowiHa4bVZIs8Eo4r7OI9thhSuS2BKSifibBKIicZtntSlS/I3xa5am28YLmrOiEXRsjPom7trO8qIhPfYOc/yFDg1gcpLxyNroCPooPBzPxUqrTT96Q4fDDTaqfyuVxQFxbYoFAqQs8/lw6WcGJ4fGC5JPsPiwoSdQy/B7gCfQcFjPXp1NH8Sx+xMLCmxRqdKSyeiEwoyB0tZ6ngaI73HFhCPX1/rLx3xv0zd/8= 03@xmuhpc
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC96jp6qFrWt4651Arg+Ua6AU3CjftZuounKLlZ8s268Lo9Cba+nmoOGRNzefqr+f6/7KmFKd9+jqS3ZnKFQbzRFVzzHHIT7tSlgxFRw+yb553/vgm7z6d0HGd3B7XjpIpR7DrM/unnXtiT/WuX+UIKKQ1S4kHp4fTJxZuwzYgNWDsT7O/5H7nBoRVuUSG/achCzTq5V5WfNjvrGZypCmcCw5MTH3Iab4qQ7fhRK46e/OpgSMmsY1ZuEynIwVtimW4G10MUWZdawN4LHBNsCDBmBu0H1DYBb9AUW5IuifAyFPPlTOPtuzpEganaMwotcXiAwhfPQg1c0TfbB4ZJPow612dzxcflHAJyFy2LXbiG0rF48h0GpW5gY92QkeMQcbybKOS5yVlXynNNg0nL1bx+reu7Fy4jurc0facTaqzpSiyXsBLSOva+DZrxl2MBDLEdykkQMNIY69GeeC2XIN4tbfGDYU8VVtwnXJUkmeHAge5ypI1kkPhYRDxPDspym9M= 04@xmuhpc
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9FmT0i2j9JsnyeVrEZP8gaWHnc5NnhJgb1sP8MP/pjx/GMEkms2LQvZYNw8MQvGA6HH/O2acy5NIdD69QkRlALXZlWpUQco8JDuJe7+2xkTMGPOAqB5YLMHRpFGHUmDMuSFGSg2YyLXaWXoWmib5xAvTL95xAcdNgp5xqWvO2N55edDeVOY5cTmIE2vC0nm5JSjMEMcIuqL8yJ3AweN4JkD8CVVy3po8f+krKsaYB+f21MqqSnCQ/cpKlWHuMN9k85hP/FB1E7gBXW/MuZ1uOm4IzjBhj8tYVN0UY7Mo2/9PhFqoBKGr6vs7Nx1mXBJ/A1lIKvW+ROvQ9ADpOfww6kPuHbX16gQ55JG7zneWeiP5pVaI4YZ4O1vAvARw/SaSFhRdpymPs5r+wdIDV9gGoqORrYqoPBz7Q02V71W+EV7WFAgxiJozO0vZwD9JJ2zivyIJfcVtIOMIvEhfsha7Hviut4JIOyoaEHjIZYsmvYHEeEBA4pTUHIUZlZj/St7U= 05@xmuhpc
+
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJRWge2+B1Et03n/B4ALBcAnjvtWPPmcFAoIlLP8oFkB hpcstat

devices/jykang.xmuhpc/.vaspkit

@@ -0,0 +1,165 @@
+# cp how_to_set_environment_variables ~/.vaspkit and modify the ~/.vaspkit file based on the settings in your supercomputer!
+# All environment variables are case sensitive.
+VASP5                         =     .TRUE.                         # .TRUE. or .FALSE.; Set .FALSE. if you are using vasp.4.x
+LDA_PATH                      =     /data/gpfs01/jykang/linwei/chn/software/vaspkit-1.4.1/POTCAR/PAW_LDA
+PBE_PATH                      =     /data/gpfs01/jykang/linwei/chn/software/vaspkit-1.4.1/POTCAR/PAW_PBE
+GGA_PATH                      =     /data/gpfs01/jykang/linwei/chn/software/vaspkit-1.4.1/POTCAR/PAW_PW91
+VASPKIT_UTILITIES_PATH        =     /data/gpfs01/jykang/linwei/chn/software/vaspkit-1.4.1/utilities
+PYTHON_BIN                    =     /data/gpfs01/jykang/linwei/chn/software/scripts/chn_python3.sh
+POTCAR_TYPE                   =      PBE                           #  PBE, PW91 or LDA; Set PBE if you want to make PBE-POTCAR file
+GW_POTCAR                     =     .FALSE.                        # .TRUE. or .FALSE.; For example, H_GW, O_GW will be chose when POTCAR_GW set to .TRUE.
+RECOMMENDED_POTCAR            =     .TRUE.                         # .TRUE. or .FALSE.; The recommended PAW potential will be chose when RECOMMENDED_POTCAR set to .TRUE.
+SET_FERMI_ENERGY_ZERO         =     .TRUE.                         # .TRUE. or .FALSE.; The Fermi Energy will be set to zero eV when SET_FERMI_ENERGY_ZERO set to .TRUE.
+SET_MINI_INCAR                =     .FALSE.                        # .TRUE. or .FALSE.; A simplified INCAR will be written when MINI_INCAR set to .TRUE.
+USER_DEFINED_INCAR            =     .FALSE.                        # .TRUE. or .FALSE.; whether to use embedded INCAR templates or user defined INCAR templates
+WRITE_SELECTIVE_DYNAMICS      =     .FALSE.                        # .TRUE. or .FALSE.; the selective dymanics set will be forced to write when SET_SELECTIVE_DYNAMICS_MODE set to .TRUE.
+GET_DOS_FROM_HYBRID_BAND      =     .FASLE.                        # .TRUE. or .FALSE.; whether to calculate DOS using optimized tetrahedron method in the hybrid band strucutre calculations
+ADVANCED_USER                 =     .TRUE.                         # .TRUE. or .FALSE.; Please fill in your settings in the block 'USER_DEFINED' if you want vaspkit to integrate your own scripts in the 'UTILITIES' file.
+SET_INCAR_WRITE_MODE          =      OVERRIDE                      #  OVERRIDE, APPEND, BACK-UP-OLD,BACK-UP-NEW;  "Customize INCAR File"  whether to override existing or appending existing INCAR/backup existing INCAR to INCAR.old && write into INCAR/write into INCAR.new
+APPLY_SCISSOR_CORRECTION      =     .FALSE.                        # .TRUE. or .FALSE.; whether to rigidly shift of the conduction band with respect to the valence band of nonmagnetic semiconductors to matches with that of the experimental, HSE or GW value (default: .FALSE)
+APPLY_PHS_CORRECTION          =     .FALSE.                        # .TRUE. or .FALSE.; whether to make PHS correction during linear optical calculations. More details are given in Comput. Mater. Sci. 172 (2020) 109315 
+NORMALIZE_ORBITAL_WEIGHTS     =     .FALSE.                        # .TRUE. or .FALSE.; whether to normalize orbital-projected weights in each state (default: .FALSE.)
+REORIENTATE_LATTICE_VECTORS   =     .FALSE.                        # .TRUE. or .FALSE.; reorientate lattice vectors when build supercell or heterojunction or not (default: .FALSE.) 
+GET_IRREDUCIBLE_KPOINTS       =     .TRUE.                         # .TRUE. or .FALSE.; Control whether to generate k-points in the symmetry-irreducible wedge of the Brillouin Zone (default: .TRUE.)
+FACTOR_ENCUT2NPWS             =      0.262465831d0                 # Adjust the final decimal place (or one beyond that) of this parameter if you encounter an error message saying that “Error: the calculated NPWS is not equal to the read NPWS”. 
+SYMMETRY_TOLERANCE            =      1E-5                          # Tolerance in Cartesian coordinates to find crystal symmetry, compatibility with SYMPREC (default: 1E-5)
+LATTICE_TOLERANCE             =      0.2                           # Float lattice tolerance for the lattice vectors (default: 0.2 angstrom) 
+ANGLE_TOLERANCE               =      0.2                           # Float angle tolerance for the lattice vectors in degrees (default: 0.2 degree) 
+EMIN                          =     -20.0                          # Minimum energy for evaluation of DOS (default: -20.0 eV)
+EMAX                          =      20.0                          # Maximum energy for evaluation of DOS (default:  20.0 eV)
+SIGMA                         =      0.2                           # The width of the smearing to calculate DOS from eigenvalue (default: 0.2 eV)
+NEDOS                         =      2001                          # Number of grid points in DOS (default: 2001)
+GAMMA_CENTERED                =     .TRUE.                         # .TRUE. or .FALSE. (default: .TRUE.).
+VACUUM_THICKNESS              =      15.0                          # The thickness of vacuum to build slab or 2D materials (default: 10 angstrom)
+CENTER_SLAB                   =     .TRUE.                         # Center the slab in the z direction; (default: .TRUE.)
+                                 
+# New added in Version 1.3.0       
+MAX_ATOM_NUMBER               =      10000                         # The maximum number of atoms to screen heterostructures (default: 10000)
+MIN_ATOM_NUMBER               =      1                             # The minimum number of atoms to screen heterostructures (default: 1)
+MIN_LATTICE_ANGLE             =      0.0                           # The minimum lattice angle to screen heterostructures (default: 0.0)
+MAX_LATTICE_ANGLE             =      180.0                         # The maximum lattice angle to screen heterostructures (default: 180.0)
+GET_INTERPOLATED_DATA         =     .FALSE.                        # .TRUE. or .FALSE.; Whether to interpolate the grid data of charge/spin density, potential, band structure, etc. (default: .FALSE.)
+INTERPOLATION_SPACING         =      0.04                          # Determines the number of interpolation grids, in unit of A in real-space or 1/A in reciprocal space (default: 0.04)
+INTERPOLATION_METHOD          =     'cubic'                        # 'linear', 'cubic' (3rd order-spline interpolation), quartic (4th order-spline interpolation), or FFT available only for 2D and 3D grids (default method: 'cubic')
+AUTO_SUBMIT_JOB               =     .FALSE.                        # .TRUE. or .FALSE. (default: .FASLE.). Whether to auto-submit vaspkit or vasp job or not.   
+SUBMIT_JOB_COMMAND            =     'qsub job.sh'                  # The command line to submit job
+AUTO_PLOT                     =     .TRUE.                        # TRUE. or .FALSE. (default: .FASLE.). Whether to auto-plot data graphs in the post-processing.
+
+# New added in Version 1.4.1
+REDUCE_FERMISURFACE_FILE      =     .FALSE.                        # TRUE. or .FALSE. (default: .FASLE.). Whether to write only the bands which cross the Fermi energy.
+WEIGHT_THRESHOLD              =      0.00                          # Threshold value of spectra weight in the band structure unfolding.
+
+# New added in Version 1.5.0
+CENTER_DEFECT_POSITION        =     .TRUE.                         # Move the position of defect to the center of the supercell; (default value: .TRUE.)                              
+VACUUM_THICKNES               =     10                             # Vacuum thickness (default value: 10 Angstrom).                     
+UNWRAP_TRAJECTORIES           =     .TRUE.                         # Unwrap MD trajectories or not; (default value: .TRUE.)  
+
+#USER_DEFINED                 
+#Synopsis:The first parameter is the command-id,starting with 'u'; the second is the interpreter, like 'python/bash/perl'(Please left it blank if you are using an executive binary); the third is the name of a script or an executive binary; the fourth one is a switch, if any extra argv is needed, please set if .TRUE. ; the last on is the description, MUST use '_' as delimiter.
+#           id      interpreter      script          argv       description
+#Example1  'u1        python      get_entropy.py    .TRUE.      get_entropy'
+#Example2  'u2                      hello.exe       .FALSE.     ls         '
+                              
+u1        python      get_entropy.py    .TRUE.      get_entropy_for_adsorbate
+u2        python      bader2pqr.py      .FALSE.     bader2pqr
+#END_USER_DEFINED             
+                              
+#+------------------------------------------------------------------------------------------------------------------+
+#| Customize VASP job script                                                                                        |
+#| Must copy the block from #BEGIN_CUSTOMIZE_JOB_SCRIPT to #END_CUSTOMIZE_JOB_SCRIPT                                |             
+#+------------------------------------------------------------------------------------------------------------------+
+#BEGIN_CUSTOMIZE_JOB_SCRIPT   
+#PBS -N name                  
+#PBS -o out                   
+#PBS -e err                   
+#PBS -l nodes=2:ppn=4         
+#PBS -r y                     
+cd $PBS_O_WORKDIR             
+mpirun -np 8 vasp_std > vasp-out
+#END_CUSTOMIZE_JOB_SCRIPT     
+#+------------------------------------------------------------------------------------------------------------------+
+                              
+#BEGIN_CUSTOMIZE_PLOT         
+#+------------------------------------------------------------------------------------------------------------------+
+#| WARNNING! The character-type values of plot variables are case sensitive and must be enclosed in single quotes.  |
+#+------------------------------------------------------------------------------------------------------------------+
+# https://matplotlib.org/3.3.3/tutorials/introductory/customizing.html
+# https://matplotlib.org/tutorials/text/text_props.html
+# https://github.com/rougier/matplotlib-cheatsheet                             
+# Advanced Features of VASPKIT Pro version
+figure_format                 =     'pdf'                          # string type (default: 'jpg'). Options: 'png', 'pdf', 'eps', 'jpg', etc.
+figure_height                 =      4.0                           # float type (default: 4.0). The height of the figure.
+figure_width                  =      5.0                           # float type (default: 5.0). The width of the figure.
+dpi                           =      400                           # integer type (default: 400). The resolution of the figure in dots-per-inch.
+set_tight_layout              =     .FALSE.                        # .TRUE. or .FALSE (default: .FALSE.). Automatically adjust the padding between and around subplots. 
+                                                                
+# Global settings             =                                    
+figure_style                  =     'default'                      # string type (default: 'default'). Options: 'default', 'classic', 'grayscale', 'seaborn', 'bmh', 'seaborn-notebook', etc.
+font_family                   =     'arial'                        # string type (default: 'arial'). Options: 'fantasy','arial','sans-serif', 'monospace', 'cursive', 'serif', etc.
+global_fontsize               =      12.0                          # float type (default: 15.0).
+label_fontsize                =      12.0                          # float type (default: 15.0).
+number_format                 =      '%.3f'                        # string type (default: 15.0).
+                                                                 
+# Legend-related settings     =                                    
+show_legend                   =     .TRUE.                         # .TRUE. or .FALSE (default: .TRUE.).
+legend_location               =     'best'                         # string type (default: 'best'). Options: 'best', 'upper right', 'upper left', 'lower left', 'lower right', 'right', 'center left', 'center right', 'lower center', 'upper center', 'center', etc.
+legend_fontsize               =      12.0                          # float type (default: 14.0).
+                              =                                    
+# Line-related settings       =                                    
+line_colors                   =     ['b', 'g', 'r', 'm']           # string type (default: 'blue'). Options: 'red', 'green', 'cyan', '#4c005c', etc.
+line_styles                   =     ['-', '-', '-', '-']           # string type (default: '-'). Options: '-' or solid, '--' or 'dashed', '-.' or 'dashdot', etc.
+line_widths                   =     [1.5, 1.5, 1.5]                # float type (default: 1.5).
+line_alpha                    =     [1.0, 1.0, 1.0]                # float type (default: 1.0). 0.0< alpha <=1.0, adjust the transparency of each line (by default, alpha=1.0)
+fill_areas                    =     .FALSE.                        # .TRUE. or .FALSE (default: .FLASE.). Fill the area between two horizontal curves.
+
+# Marker-related settings     =     
+#marker_colors                =     ['blue', 'cyan', 'red', 'magenta', 'orange', 'lawngreen', 'deeppink', 'brown', 'dodgerblue']
+marker_symbols                =     ['o','o','o']                  # string type (default: 'o'). Options: 'o': Circle, 'x': Cross, '+': Plus sign, 'D': Filled diamond, 's': Square, '^': Triangle, etc.
+marker_colors                 =     ['#0db14b', '#4c005c', '#d93b2b','#0075dc', '#740aff', '#993f00', '#4c005c', '#426600']
+marker_sizes                  =     [60, 60.0, 60.0]               # float type (default: 10.0).
+marker_scale                  =     1.0                            # float type (default: 1.0). marker_sizes = marker_sizes * marker_scale        
+marker_alpha                  =     [0.8, 0.7, 0.6, 0.5, 0.4]      # float type (default: 1.0). 0.0< alpha <=1.0), adjust the transparency of markers (by default, alpha=1.0)
+                                   
+# Tick-related settings       =     
+#x_label                      =     'Wave vector'                  # string type (No default value).
+#y_label                      =     'Energy (eV)'                  # string type (No default value).
+#z_label                      =     'k$_x$ ($\\mathrm{\\AA}$)'     # string type (No default value).
+#x_limits                     =     [-8.0, 8.0]                    # float type [xmin, xmax] (No default value).
+#y_limits                     =     [-8.0, 8.0]                    # float type [ymin, ymax] (No default value).
+#z_limits                     =     [-8.0, 8.0]                    # float type [zmin, zmax] (No default value).
+#x_major_locator              =      2.0                           # float type (No default value).
+#y_major_locator              =      2.0                           # float type (No default value).
+#z_major_locator              =      2.0                           # float type (No default value).
+#x_minor_locator              =      1.0                           # float type (No default value).
+#y_minor_locator              =      1.0                           # float type (No default value).
+#z_minor_locator              =      1.0                           # float type (No default value).
+                                                                   
+# contour-related settings                                         
+colormap                      =     'RdBu'                         # string typ (default: 'jet'). Options: 'jet', 'hsv', 'viridis', 'gray', etc.
+contour_levels                =      5                             # integer type (default: 5).
+contour_limits                =     [0.0, 0.5]                     # float type (No default value).
+display_colorbar              =     .FLASE.                        # .TRUE. or .FALSE (default: .FLASE.).
+display_level_value           =     .FLASE.                        # .TRUE. or .FALSE (default: .FLASE.).
+display_contour               =     .FLASE.                        # .TRUE. or .FALSE (default: .FLASE.).  
+colorbar_shrink               =      0.5                           # float type (default: 0.4).
+colorbar_orientation          =     'vertical'                     # 'horizontal' or 'vertical' (default: 'horizontal')
+                                                                   
+# 3D-plot related settings                                         
+elevation                     =     12.0                           # float type (default: 12).
+azimuth                       =     24.0                           # float type (default: 23).
+display_coordinate_axes       =    .TRUE.                          # .TRUE. or .FALSE (default: .TRUE.).
+display_brillouin_zone        =    .TRUE.                          # .TRUE. or .FALSE (default: .TRUE.).
+axis_length                   =    [1.0, 1.0, 1.0]                 # Determine the length of each axis
+box_linewidth                 =     1.0                            # Specify the transparency level for the lines of the box or Brillouin zone  
+box_linealpha                 =     1.0                            # Evaluate the line width of the box or Brillouin zone
+                                                                   
+# XKCD sketch-style related settings                               
+xkcd_style                    =    .FALSE.                         # .TRUE. or .FALSE (default: .FLASE.). Turn on xkcd sketch-style drawing mode or not. 
+xkcd_scale                    =     1                              # float type (default: 1.0). The amplitude of the wiggle perpendicular to the source line (default: 1).  
+xkcd_length                   =     100                            # float type (default: 100.0). The length of the wiggle along the line (default: 100). 
+xkcd_randomness               =     2                              # float type (default: 2.0). The scale factor by which the length is shrunken or expanded (default: 2).
+
+# band structure related settings
+disconnecte_band_paths        =   .TRUE.                           # .TRUE. or .FALSE (default: .TRUE.). Turn on disconnected band paths drawing mode or not.
+
+#END_CUSTOMIZE_PLOT

devices/jykang.xmuhpc/linwei/chn/software/hpcstat/bin/bsub

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+hpcstat submitjob "$@"

devices/nas/default.nix

@@ -10,12 +10,11 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/13BC-F0C9" = "/boot/efi";
+            vfat."/dev/disk/by-uuid/627D-1FAA" = "/boot";
             btrfs =
             {
-              "/dev/disk/by-uuid/0e184f3b-af6c-4f5d-926a-2559f2dc3063"."/boot" = "/boot";
               "/dev/mapper/nix"."/nix" = "/nix";
-              "/dev/mapper/root1" =
+              "/dev/mapper/root3" =
               {
                 "/nix/rootfs" = "/nix/rootfs";
                 "/nix/persistent" = "/nix/persistent";
@@ -30,53 +29,32 @@ inputs:
             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/a47f06e1-dc90-40a4-89ea-7c74226a5449".mapper = "root3";
+              "/dev/disk/by-uuid/b3408fb5-68de-405b-9587-5e6fbd459ea2".mapper = "root4";
               "/dev/disk/by-uuid/a779198f-cce9-4c3d-a64a-9ec45f6f5495" = { mapper = "nix"; ssd = true; };
             };
             delayedMount = [ "/" "/nix" ];
           };
           swap = [ "/nix/swap/swap" ];
-          rollingRootfs.waitDevices = [ "/dev/mapper/root2" ];
+          rollingRootfs.waitDevices = [ "/dev/mapper/root4" ];
         };
         initrd.sshd.enable = true;
-        grub.installDevice = "efi";
         nixpkgs.march = "silvermont";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        kernel.patches = [ "cjktty" "lantian" ];
         networking = { hostname = "nas"; networkd = {}; };
-        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 = {};
-        xray.client.dae.wanInterface = [ "enp3s0" ];
-        xrdp = { enable = true; hostname = [ "nas.chn.moe" "office.chn.moe" ]; };
-        groupshare = {};
+        xray.client = { enable = true; dnsmasq.hosts."git.nas.chn.moe" = "127.0.0.1"; };
         smartd.enable = true;
         beesd.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;
@@ -85,7 +63,6 @@ inputs:
           wireguardIp = "192.168.83.4";
         };
       };
-      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
   };
 }

devices/nas/secrets.yaml

@@ -1,20 +1,7 @@
 xray-client:
     uuid: ENC[AES256_GCM,data:97aX07G5FPumdWcDxnYOs6fRgljXWuwyNXGg1d7zdbUUfNnb,iv:+wAC/DZXsg+evYFA4DMfLw5Ut3ExQl1RgZ/2AsNQDpo=,tag:ebD77muITHof+FQMydWobg==,type:str]
 acme:
-    cloudflare.ini: ENC[AES256_GCM,data:/LpP1qoVS+CG+5ska6vtmagHNrhcgr5e1QRzDdbdCYGnDB8Nca/GmIogzHCXsogQY/rwGTCZoXLKKEGToYiThwk=,iv:R++I0ued2wrVsmM/vYvBVMOp9M7HyZIfDOVOlg7GALE=,tag:gYchPuh8MHk3EEnGb9g4WA==,type:str]
-users:
-    xll: ENC[AES256_GCM,data:XLSsz6fZ23PPaJS1Y5C3FAOks3wzb2f+Pv8TgyKrDBfMeoLk1M37A00OGJ2wsYxkuR0JV6Uoh+hhRpTUjOQnmLfQrBxPxxP8DA==,iv:jxEZX/flxxduM1sdrYfGHfMtFMYduMg0Lr6hY1pkAPg=,tag:CYy0y1e2S2Txz1OSh+XDHA==,type:str]
-    zem: ENC[AES256_GCM,data:VCVLfGO9a06XhAOBciFf1u7A5jaQikAt2wZf+dCAi1BglXpM6Hof1yAunadYOwLOBFgGlP19kX53CBBlZtaqZFL2GRDzXP0woQ==,iv:AFYtHCCkzNrllN/fjQ8GKYs2TyV3uj3BsU5n1tBQAmM=,tag:5dP7c5N4yG2NS4T+Vg0Zpg==,type:str]
-    yjq: ENC[AES256_GCM,data:yn6eGrySCxlRsFioaE2p1qlTHkIGC9l64+edjuDvt232xc+iFeD03EYfuulyr0GxYFwnlAwtaJnyMi5eOrSd1W6HeV3Canzdbw==,iv:qTc6vA8uQza8CB+BvffEN9GqHkiwNM4h9RkqQR14ylk=,tag:UZ2GYCJLjcWLuVXlscLviw==,type:str]
-    gb: ENC[AES256_GCM,data:jIR3EVdATYUgWmW4J8RdURJRmDBC84t0S/c2EzWwtFMtjgKlqg52fIfQ66i7RnIYRAoF+s4Ex0aLSejWgzQ69NA/AF0AIS7Y/Q==,iv:mvTCTP0E74QlvM8TcY4o49G5kNGs5HFx3YUrj6mCrwM=,tag:LXfIOyAB10XuHA6Cg7LBeQ==,type:str]
-frp:
-    token: ENC[AES256_GCM,data:zYRZoWa3Llv0NiPXtSfhWUn+wt4uIcw8Wa+QBTzn7gLk6UVIA4FD7FLABBKoFbwg62Fo79Nn,iv:YZdOYkJf6BN76Z68nCtetKElJkqKiYmcx6UmLoIXSdo=,tag:5sC2vt3Z21KhgOU9mrfXhg==,type:str]
-    stcp:
-        hpc: ENC[AES256_GCM,data:lkpM4nzt8ymQ+5eV,iv:LvSShCSN8w0VsJYjICG9NWCMiw7NSPpoSZ+I2t7uILs=,tag:LLry5z4KpPdnN75x8dANqg==,type:str]
-nginx:
-    detectAuth:
-        chn: ENC[AES256_GCM,data:44vsExbVhO3gnD4Gme92eQ==,iv:LyDvZebs1sDL1/hZQiZdHoPBm4hXtBy56jR73zSH6Aw=,tag:w5xPHnK9XOSS0+97q8b5gQ==,type:str]
-    maxmind-license: ENC[AES256_GCM,data:JbAnFQiDcJGwvb89sG2ro77nwwOWcDnqVcA902jwb2zzZci7PpXROw==,iv:eifkWK0oN73Ekn3oWzy6XbYK2GU+4tlnLPJ+96WOWJY=,tag:35ulsshxtUfOsSQOLgAt0g==,type:str]
+    token: ENC[AES256_GCM,data:OrYgBRU1VPpkpDzYMFHINfPSHsXEKABdZOcgiAiBJKcreBoaSVHUvg==,iv:XIeZPJhzmUi5ZHKBCYN5UA9HWH1K+26SvcIWVrHAYDA=,tag:3F93syLBZjcHwnRRkUEjlw==,type:str]
 wireguard:
     privateKey: ENC[AES256_GCM,data:VPlB4wSbWqSYw3rYRwfAMa39xrPcPZfz7sV2Cq3rmOhifnUPwggxnA+51do=,iv:utnyrB6Yfe5O94Oq4HDVFm/lQ9ZBoyvUT68r2G2PdwA=,tag:snm01vA+z2yKK8d2i5i2ig==,type:str]
 sops:
@@ -41,8 +28,8 @@ sops:
             by9Rd0U0bzNiK21BQTNxN1RuQ09DQVkKJmSlzV5ppEkZFljsS17ZWmoI++fz4tJh
             kTdoAStG1zsKASHyZTsmdm3RBDO3qV1KhQC2gC7d4EiwNZngxOOZJg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-07T12:35:21Z"
-    mac: ENC[AES256_GCM,data:bR4PPHaGX6VCRP+Ze96sccnwYxnZkfpmJp6iMBzr+W3JRd0VjTEwTH8aNn1WIsNFXco+BCmwroJR07oKYnbusBYgiEeHnkhXvyAELETs7BitH8JrUtSsGs2wJDfkU9fWf6BNT7oHGpP69Tyrl+8v+Q8jyLV8kW8+c7uJPyT2ACQ=,iv:Hl2eX7TV6lgWjUim0m4r44Ji0c9QDH+qzpDyBOTeVp4=,tag:6xkFMQMwEP7IhpXEB4o+hQ==,type:str]
+    lastmodified: "2024-07-24T05:14:57Z"
+    mac: ENC[AES256_GCM,data:9xKBuoVeotcZfiqsKg+iXxOc5BV9kGVvR5f9Anu6DauBceYIBxgeVCDU3dRUPz67MkOK/n2w9+gLchQxUyK8G4ECRTESL+GKpZslNVThb2j6vswLXNBHqsQCoQBlYOiKw5ZM1gpdYJPni8qpsdGvTwc5JkW+FH6v1BdZWaUhc3U=,iv:SyLiMXsQhS+8FFlSMXiD9ETD+mIsz6mePXnJzBODK5g=,tag:YpiU58lJ5Nb78EMyEmJdbw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/pc/default.nix

@@ -10,29 +10,20 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/E58F-416A" = "/boot/efi";
-            btrfs =
-            {
-              "/dev/disk/by-uuid/066be4fd-8617-4fe1-9654-c133c2996d33"."/" = "/boot";
-              "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
-            };
+            vfat."/dev/disk/by-uuid/7A60-4232" = "/boot";
+            btrfs."/dev/mapper/root1" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
           };
           decrypt.auto =
           {
-            "/dev/disk/by-uuid/4c73288c-bcd8-4a7e-b683-693f9eed2d81" = { mapper = "root"; ssd = true; };
+            "/dev/disk/by-uuid/4c73288c-bcd8-4a7e-b683-693f9eed2d81" = { mapper = "root1"; ssd = true; };
             "/dev/disk/by-uuid/4be45329-a054-4c20-8965-8c5b7ee6b35d" =
-              { mapper = "swap"; ssd = true; before = [ "root" ]; };
+              { mapper = "swap"; ssd = true; before = [ "root1" ]; };
           };
           swap = [ "/dev/mapper/swap" ];
           resume = "/dev/mapper/swap";
           rollingRootfs = {};
         };
-        grub =
-        {
-          # TODO: install windows
-          # windowsEntries = { "7317-1DB6" = "Windows"; "7321-FA9C" = "Windows for malware"; };
-          installDevice = "efi";
-        };
+        grub.windowsEntries."7AF0-D2F2" = "Windows";
         nix =
         {
           marches =
@@ -51,31 +42,41 @@ inputs:
             "alderlake"
           ];
           remote.master = { enable = true; hosts = [ "xmupc1" "xmupc2" ]; };
+          githubToken.enable = true;
         };
         nixpkgs =
           { march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
-        kernel = { varient = "cachyos"; patches = [ "cjktty" "hibernate-progress" ]; };
+        kernel =
+        {
+          variant = "xanmod-latest";
+          patches = [ "hibernate-progress" "amdgpu" ];
+          modules.modprobeConfig =
+            [ "options iwlwifi power_save=0" "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ];
+        };
         networking.hostname = "pc";
         sysctl.laptop-mode = 5;
+        gui.enable = true;
       };
       hardware =
       {
         cpus = [ "amd" ];
-        gpu = { type = "amd+nvidia"; prime.busId = { amd = "8:0:0"; nvidia = "1:0:0"; }; dynamicBoost = true; };
+        gpu =
+        {
+          type = "amd+nvidia";
+          nvidia = { prime.busId = { amd = "5:0:0"; nvidia = "1:0:0"; }; dynamicBoost = true; driver = "latest"; };
+        };
         legion = {};
       };
-      packages.packageSet = "workstation";
       virtualization =
       {
         waydroid.enable = true;
         docker.enable = true;
-        kvmHost = { enable = true; gui = true; autoSuspend = [ "win10" "hardconnect" ]; };
+        kvmHost = { enable = true; gui = true; };
         nspawn = [ "arch" "ubuntu-22.04" "fedora" ];
       };
       services =
       {
         snapper.enable = true;
-        fontconfig.enable = true;
         samba =
         {
           enable = true;
@@ -92,10 +93,19 @@ inputs:
         sshd = {};
         xray.client =
         {
-          dnsmasq.hosts = builtins.listToAttrs (builtins.map
-            (name: { inherit name; value = "74.211.99.69"; })
-            [ "mirism.one" "beta.mirism.one" "ng01.mirism.one" "initrd.vps6.chn.moe" ]);
-          dae.wanInterface = [ "wlp4s0" "enp5s0" ];
+          enable = true;
+          dnsmasq.hosts = builtins.listToAttrs
+          (
+            (builtins.map
+              (name: { inherit name; value = "74.211.99.69"; })
+              [ "mirism.one" "beta.mirism.one" "ng01.mirism.one" "initrd.vps6.chn.moe" ])
+            ++ (builtins.map
+              (name: { inherit name; value = "0.0.0.0"; })
+              [
+                "log-upload.mihoyo.com" "uspider.yuanshen.com" "ys-log-upload.mihoyo.com"
+                "dispatchcnglobal.yuanshen.com"
+              ])
+          );
         };
         firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
         acme.cert."debug.mirism.one" = {};
@@ -118,18 +128,50 @@ inputs:
           wireguardIp = "192.168.83.3";
         };
         gamemode = { enable = true; drmDevice = 1; };
-        slurm = { enable = true; cpu = { cores = 16; threads = 2; }; memoryMB = 90112; gpus."4060" = 1; };
-        xrdp =
+        slurm =
         {
           enable = true;
-          hostname = [ "pc.chn.moe" ];
+          cpu = { cores = 16; threads = 2; mpiThreads = 2; openmpThreads = 4; };
+          memoryMB = 90112;
+          gpus."4060" = 1;
         };
+        ollama = {};
       };
-      bugs = [ "xmunet" "backlight" "amdpstate" "suspend-hibernate-no-platform" ];
+      bugs = [ "xmunet" "backlight" "amdpstate" ];
     };
+    boot =
+    {
+      kernelParams = [ "acpi_osi=!" ''acpi_osi="Windows 2015"'' ];
+      loader.grub =
+      {
+        extraFiles =
+        {
+          "DisplayEngine.efi" = ./bios/DisplayEngine.efi;
+          "SetupBrowser.efi" = ./bios/SetupBrowser.efi;
+          "UiApp.efi" = ./bios/UiApp.efi;
+          "EFI/Boot/Bootx64.efi" = ./bios/Bootx64.efi;
+        };
+        extraEntries = 
+        ''
+          menuentry 'Advanced UEFI Firmware Settings' {
+            insmod fat
+            insmod chain
+            chainloader @bootRoot@/EFI/Boot/Bootx64.efi
+          }
+        '';
+      };
+    };
+    # 禁止鼠标等在睡眠时唤醒
+    services.udev.extraRules = ''ACTION=="add", ATTR{power/wakeup}="disabled"'';
     networking.extraHosts = "74.211.99.69 mirism.one beta.mirism.one ng01.mirism.one";
     services.colord.enable = true;
-    virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; };
+    environment.persistence."/nix/archive" =
+    {
+      hideMounts = true;
+      users.chn.directories = builtins.map
+        (dir: { directory = "repo/${dir}"; user = "chn"; group = "chn"; mode = "0755"; })
+        [ "BPD-paper" "kurumi-asmr" "BPD-paper-old" "SiC-20240705" ];
+    };
     specialisation =
     {
       nvidia.configuration =
@@ -141,36 +183,6 @@ inputs:
         };
         system.nixos.tags = [ "nvidia" ];
       };
-      hybrid-sync.configuration =
-      {
-        nixos.hardware.gpu.prime.mode = "sync";
-        system.nixos.tags = [ "hybrid-sync" ];
-      };
-      amd.configuration =
-      {
-        nixos.hardware.gpu = { type = inputs.lib.mkForce "amd"; dynamicBoost = inputs.lib.mkForce false; };
-        boot =
-        {
-          extraModprobeConfig =
-          ''
-            blacklist nouveau
-            options nouveau modeset=0
-          '';
-          blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_modeset" ];
-        };
-        services.udev.extraRules =
-        ''
-          # Remove NVIDIA USB xHCI Host Controller devices, if present
-          ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
-          # Remove NVIDIA USB Type-C UCSI devices, if present
-          ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
-          # Remove NVIDIA Audio devices, if present
-          ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
-          # Remove NVIDIA VGA/3D controller devices
-          ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
-        '';
-        system.nixos.tags = [ "amd" ];
-      };
     };
   };
 }

devices/pc/secrets/default.yaml

@@ -1,7 +1,7 @@
 xray-client:
     uuid: ENC[AES256_GCM,data:XU7/GZ8cJmDwNsrQfoFHrquZT5QkjvTPZfnghX3BLyvPLlrX,iv:e/BQkZ5ydWD4P/qT9OUloB8/cXImfkG3YZnuIeNLoTc=,tag:EW3ZBzGnyIrUfcMeJqm4aA==,type:str]
 acme:
-    cloudflare.ini: ENC[AES256_GCM,data:hPNpTclYvRbcbFO6aR9PNyHt3kDUmjeUgg4NPsr+c/yxKPundoiziNYBRfF7/axlw8Hu32jf/cDlcWaEmqCBQJY=,iv:bdGCD/a6AnGQhiFNyZ+fD1f/rILsEcPXC2qRDsAO4n8=,tag:MLZak9uSqsg/0Ldx2Wgb6A==,type:str]
+    token: ENC[AES256_GCM,data:e+ZPOwOobbShxm5zZqmIeM4cmP4JQT8kDQ0goKsSwpIKmJAzi8WutQ==,iv:ZKOzKa98yWTM2LkC4+rzA6rTW4afm3oAG4nc/2vk7Bg=,tag:Qctw1sk1SC/a6Xv5Fju8EA==,type:str]
 frp:
     token: ENC[AES256_GCM,data:0mE8/cWqHKNquCIiqgbjcNhipKk7KEfbZ+qRYbu+iZr7AH9QjfYZQiMJNp4Aa3JWwBLYAnpf,iv:ID4cc8Tn0H9b1CimXlPamMlhlAkafhRApDHo/CCQ4BE=,tag:BUuU/BCj16R7FlKlpubawA==,type:str]
     stcp:
@@ -14,14 +14,14 @@ postgresql:
     misskey_misskey: ENC[AES256_GCM,data:MSDbQffk/WjZ6EYiwVuUMdhdv9VE59ZM7t4XldOKRO0=,iv:J/x9t4Pk5zi7Av9fbzxgAbbtbEUZttSx/JGRmmgmvE4=,tag:CwFR9K++T7YqYR932z3IAg==,type:str]
 redis:
     misskey-misskey: ENC[AES256_GCM,data:vcvQ/hs/F3BZd1sfvWwfEeB8vVoqdnprxobcmL6xsmg=,iv:S32yrjrjj56HbxTlfFGjOb+sO2M9KKEDEazCrpQWj6Q=,tag:iwnvqwQEdd6jicx9jJBdbg==,type:str]
-meilisearch:
-    misskey-misskey: ENC[AES256_GCM,data:/wYR3Bz4LRk/Ks0vizlZS3Ebf5qVfnlBBqZEm/ZIBFdDuhddgu71cqCjTHIKQ6CYh3CoUyguKIIFWku/kOCHKA==,iv:dllKvZwxvZC4pVyEMOB9WNiVBsVxzo5kwbdYKCzzyrY=,tag:MvzqalVvBkyJoLbirN0V8Q==,type:str]
 wireguard:
     privateKey: ENC[AES256_GCM,data:oIpiXJvEoyryS4eEutoe85Af0L5a5iNuOsCWCat9KEhr2ecY/vRimk/1fbA=,iv:dm2hTSNX7Q38yASon5o1jxEJZbWPXUWYydXYMBHF/sE=,tag:yrANhwIF/wHQGHGA1bfPgw==,type:str]
 mariadb:
     slurm: ENC[AES256_GCM,data:fGvNMmqk7Cee28VJ1QoBVrBbgIUbj/F1W0SRjdP8N4K/M8Wx4AVm1kAr0IAhPWyDLXlIjM1NUvuEV5BpYDBdjg==,iv:rFTMJ4x2kgENQUA8ftSaLjdOc25i5mWR3UYbdq54vjs=,tag:6feD0eCSv7bcHWBveLNJwg==,type:str]
 nix:
     remote: ENC[AES256_GCM,data:uosYkxTCB0wiY+Uufk//OcBZFN3EzbZoQGZ95M9eZMjQ5AobAZqosi4laE+EMcZL1CqYqlWXaSoEUOB8biUaZPseo+1AX1TlmUgZ7QpkfOX0VKZu01C6C+lVyqVqMFq6z1BFyX/oeITMIfnd4a/2KwJCHLAZ4hMkJ5p+aJwByKGa3N/2m41HH/1S3z7pYQWj7YJxunTPPG6WNSiRncQki11rvmddwnXmsBF89+jW1Phge8U295haC57T5oIGPxR645IeTK4ZUlL8eVuZ+BhsnwbkYcaxvjSwe+DOIVPupR8GW+gis7KxwE89kqvnQhinamexcPUz4lGHlqO/Xn6jrJx6T/wXF+19epAzeHapYte3dTWNsdPwPLPJihT16YT5fwrLnH3zq8kexWz1crmnCGUoaBs4S2tHWHLgv2lTv0IHLx5F6ijpDBj/Avg9YILIURzdeea+rBxdycHasUDTVlJtYKRH5J+WbAKWI+oJ5qmXjIRUYL+O9xIUfOGO+1b3xs8MYxRWuvDV2P88N8vN,iv:yQQp5wjbSVn1oia5yL7d6GF9Vo704G0iOQRGMbzQHzg=,tag:bpBag5y5n+7ojOa8QOcDvA==,type:str]
+github:
+    token: ENC[AES256_GCM,data:59z1zSofzUyv2Qfn8oS7dZplzJDtOD/zxhPm07MLbVLHt8mE57IGcw==,iv:nZ4JmIE1h496RN6BChvqo7XWHjur76jP4HMgqGBbMJQ=,tag:pUSGsofG7hvkvJxCRwkg1Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -46,8 +46,8 @@ sops:
             OUlxNjdQaXdXMkZ6bnV1ek4yZ2dpbkEKpKGOAxo5Eef2jtGrg4iSzmGCeg+vTgvu
             +K8b+O19MIkGMDBm6UbYUPtc/7eqoEZRiTUzNMTmfkLVS4ul5zou9A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-11T08:27:38Z"
-    mac: ENC[AES256_GCM,data:X5AqIdnMzLNCHXbN3TuG4st907Rw080V8AqzesiwVFOjbBYRZWetCndtfE+/o8G1q5YE/Qwspy7HsxP5tCbSNI5c8P0XTjRTCEGyRFY8fM1TFIM32rCFjUot1iFC+l//iq62M/5iMhT2Z7pi+CDIyNMEE3TJMhBc8JmgTJXIsI8=,iv:UZXFi3rJgVHBNVqwNHlIkmW+xYkX6X2/54QQ1aZTmyU=,tag:SXyL69DZ5i0cQFvXnFkZIg==,type:str]
+    lastmodified: "2024-05-24T03:34:07Z"
+    mac: ENC[AES256_GCM,data:+nJ/wuO5G6pEsCiBNEHOYrbiYyGXXIHu3ZUgEVwqLQ10W94EOGLUto61IGtkapk4xmaHYAVmUlq76g2hRGrndLVlUthGnEc5QoQKZoUmrxK7ux1R2ubv0s1k+l2HpRerr/I8X+hHyV0fdxT6ivkpq6OsEzHDnxgewDvYNZGQS4k=,iv:TuzO1Yo0MPms5RrG8+GbwSCOILp9BF7Jsv5JvcAPwFw=,tag:fUNc+ccQDE/jcMLuQ4thCQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/pcarm/default.nix

@@ -10,19 +10,18 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/CE84-E0D8" = "/boot/efi";
+            # TODO: reparition
+            vfat."/dev/disk/by-uuid/CE84-E0D8" = "/boot";
             btrfs."/dev/disk/by-uuid/61f51d93-d3e5-4028-a903-332fafbfd365" =
-              { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; "/nix/boot" = "/boot"; };
+              { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; };
           };
           rollingRootfs = {};
         };
-        grub.installDevice = "efi";
         networking = { hostname = "pcarm"; networkd = {}; };
-        binfmt.enable = false;
         nixpkgs.arch = "aarch64";
-        kernel.varient = "nixos";
+        kernel.variant = "nixos";
+        sops.enable = false;
       };
-      packages.packageSet = "server";
       services.sshd = {};
     };
   };

devices/pcvm/default.nix

@@ -0,0 +1,28 @@
+inputs:
+{
+  config =
+  {
+    nixos =
+    {
+      system =
+      {
+        fileSystems =
+        {
+          mount =
+          {
+            # TODO: reparition
+            vfat."/dev/disk/by-uuid/AE90-1DD1" = "/boot";
+            btrfs."/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+          };
+          decrypt.auto."/dev/disk/by-uuid/a9e4a508-3f0b-492e-b932-e2019be28615" = { mapper = "root"; ssd = true; };
+          rollingRootfs = {};
+        };
+        kernel.variant = "xanmod-latest";
+        networking.hostname = "pcvm";
+        initrd.sshd.enable = true;
+      };
+      hardware.cpus = [ "amd" ];
+      services.sshd = {};
+    };
+  };
+}

devices/pcvm/secrets.yaml

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

devices/pi3b/default.nix

@@ -10,25 +10,23 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/ABC6-6B3E" = "/boot/efi";
+            # TODO: reparition
+            vfat."/dev/disk/by-uuid/ABC6-6B3E" = "/boot";
             btrfs."/dev/disk/by-uuid/c459c6c0-23a6-4ef2-945a-0bfafa9a45b6" =
-              { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; "/nix/boot" = "/boot"; };
+              { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; };
           };
           swap = [ "/nix/swap/swap" ];
           rollingRootfs = {};
         };
-        grub.installDevice = "efi";
         networking = { hostname = "pi3b"; networkd = {}; };
-        binfmt.enable = false;
         nixpkgs.arch = "aarch64";
-        kernel.varient = "nixos";
+        kernel.variant = "nixos";
       };
-      packages.packageSet = "server";
       services =
       {
         # snapper.enable = true;
         sshd = {};
-        xray.client.dae.wanInterface = [ "enu1u1" ];
+        xray.client.enable = true;
         fail2ban = {};
         wireguard =
         {

devices/surface/default.nix

@@ -11,38 +11,40 @@ inputs:
         {
           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" = "/"; };
-            };
+            vfat."/dev/disk/by-uuid/4596-D670" = "/boot";
+            btrfs."/dev/mapper/root1" = { "/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" ]; };
+            "/dev/disk/by-uuid/eda0042b-ffd5-47d1-b828-4cf99d744c9f" = { mapper = "root1"; ssd = true; };
+            "/dev/disk/by-uuid/41d83848-f3dd-4b2f-946f-de1d2ae1cbd4" = { mapper = "swap"; ssd = true; };
           };
           swap = [ "/dev/mapper/swap" ];
           resume = "/dev/mapper/swap";
           rollingRootfs = {};
         };
         nixpkgs.march = "skylake";
-        grub.installDevice = "efi";
-        nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        kernel.patches = [ "cjktty" "lantian" "surface" ];
+        nix = { substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ]; githubToken.enable = true; };
+        kernel = { variant = "xanmod-lts"; patches = [ "surface" "hibernate-progress" ]; };
         networking.hostname = "surface";
+        gui.enable = true;
       };
       hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };
-      packages.packageSet = "desktop-fat";
       virtualization = { docker.enable = true; waydroid.enable = true; };
       services =
       {
         snapper.enable = true;
-        fontconfig.enable = true;
         sshd = {};
-        xray.client.dae.wanInterface = [ "wlp2s0" ];
+        xray.client =
+        {
+          enable = true;
+          dnsmasq.hosts = builtins.listToAttrs (builtins.map
+            (name: { inherit name; value = "0.0.0.0"; })
+            [
+              "log-upload.mihoyo.com" "uspider.yuanshen.com" "ys-log-upload.mihoyo.com"
+              "dispatchcnglobal.yuanshen.com"
+            ]);
+        };
         firewall.trustedInterfaces = [ "virbr0" ];
         wireguard =
         {
@@ -53,10 +55,14 @@ inputs:
         };
         beesd.instances.root = { device = "/"; hashTableSizeMB = 512; };
       };
-      bugs = [ "xmunet" ];
+      bugs = [ "xmunet" "suspend-hibernate-no-platform" ];
+      packages.vasp = null;
     };
-    boot.kernelParams = [ "intel_iommu=off" ];
-    environment.systemPackages = with inputs.pkgs; [ maliit-keyboard maliit-framework ];
     powerManagement.resumeCommands = ''${inputs.pkgs.systemd}/bin/systemctl restart iptsd'';
+    services.iptsd.config =
+    {
+      Touch = { DisableOnPalm = true; DisableOnStylus = true; Overshoot = 0.5; };
+      Contacts = { Neutral = "Average"; NeutralValue = 10; };
+    };
   };
 }

devices/surface/secrets.yaml

@@ -2,6 +2,8 @@ xray-client:
     uuid: ENC[AES256_GCM,data:WEBAH3PQM5ahNpH/kvTtcjcJ2GllmmRlBR2oclG6AimGenSg,iv:TMp0WTOe9fuELSZoVGenl5XSZUFoiYUBEMWMn4NFv1g=,tag:GJTE0EELcZkrnGAKLYer1g==,type:str]
 wireguard:
     privateKey: ENC[AES256_GCM,data:P/tyZHaEAahZUBF22dJEZb6mACm/wmUunPDG0vS7SNW3sWbzxRSut0haR/g=,iv:8VMv5iotmDrYDLiszcOvJHkD8l6uE+SboPSILr6KuzU=,tag:U/FIBhvghwDTvFtUWEqr4g==,type:str]
+github:
+    token: ENC[AES256_GCM,data:SyqrpFfy+y7syReWs0Bi23651ew41Us8aqjImBTzkDanOtWQgIYC6g==,iv:H3Y/TuP3VvZv6MlRAdLOY0CiNUeoqGZRNg0s58ZSkQ8=,tag:rSf4E8Whvue/LZ+VlSqDDQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -26,8 +28,8 @@ sops:
             a2xybTRFUFZZN20zajZJTVNwVEpGcEEKglmFMk7z1q5IlZ+lZf9M0HtknmvcYt/P
             2/z5e8wLN1Hy0Zsbv0yIL/NmqwxAOGJOdzz7ElJszk/Y4kUr9aRasg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-16T14:25:17Z"
-    mac: ENC[AES256_GCM,data:lpZ+Jd5LF35ESBOmOoq7pbNHze7rJiQsiq8cOgf8+cWnAqVh1bccG0cFe7R8uBhmuKIqp7TwkORDFuD+KFCZW14cbR4SP3vndSoYzKxIBdKTObR95w2ETst+prUtQ3fvFeEtlJexeljikfprWf2pGo1OzPophAyocgT31z2iMjs=,iv:Bryz+kqRvXYPj6YuxeDhQfLsgYqHXrA+lHFX18m2GGE=,tag:A7mvmguWoOir2JoIprgL4A==,type:str]
+    lastmodified: "2024-05-24T03:36:38Z"
+    mac: ENC[AES256_GCM,data:Dv6WO5K0GFVm4Rt+GjXeE1vwqlPkP+kmRCGU41rbSR3YBcL8mkpBRQQXJiMU99cQQMK/rCGy+k91fhGnG5xFT/FdEZF8qUjRHPZ5MdWCjPOuY/LrXWnSnwwJa2neQLFH/ToUkNaGHCk/FngnZ/e0U43Rnwt3iHRDBG3io8oDY0M=,iv:Jf5EtkTuf/MFDq6UiOo8/31ev5zBiaP9WnlgsUgK5Y4=,tag:r6ql+UbXbG5A1vtbsGXnJQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/vps4/default.nix

@@ -0,0 +1,45 @@
+inputs:
+{
+  config =
+  {
+    nixos =
+    {
+      system =
+      {
+        fileSystems =
+        {
+          mount =
+          {
+            btrfs =
+            {
+              "/dev/disk/by-uuid/403fe853-8648-4c16-b2b5-3dfa88aee351"."/boot" = "/boot";
+              "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+            };
+          };
+          decrypt.manual =
+          {
+            enable = true;
+            devices."/dev/disk/by-uuid/bf7646f9-496c-484e-ada0-30335da57068" = { mapper = "root"; ssd = true; };
+            delayedMount = [ "/" ];
+          };
+          swap = [ "/nix/swap/swap" ];
+          rollingRootfs = {};
+        };
+        grub.installDevice = "/dev/disk/by-path/pci-0000:00:04.0";
+        nixpkgs.march = "znver2";
+        nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
+        initrd.sshd.enable = true;
+        networking = { hostname = "vps4"; networkd = {}; };
+        kernel.variant = "xanmod-latest";
+      };
+      services =
+      {
+        snapper.enable = true;
+        sshd = {};
+        fail2ban = {};
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 64; };
+        xray.server = { serverName = "xserver.vps4.chn.moe"; userNumber = 4; };
+      };
+    };
+  };
+}

devices/vps4/secrets.yaml

@@ -0,0 +1,51 @@
+xray-server:
+    clients:
+        #ENC[AES256_GCM,data:d7cv,iv:RHzGIDLuuKejCTQ5YlNNITkCS3VoprsqH/kHckdpAv0=,tag:3cYw7uyUmXALo3v7SiqLJA==,type:comment]
+        user0: ENC[AES256_GCM,data:o2wxpSzoqsPxs6grgYRLtPutMVwSqtzUWBrj7+7QuWWd1a1z,iv:2/5SxXq8Iw4J/LzBeclHbkrZXHitguip0WN+MINym8s=,tag:v/3oly53ORM9XAwbOzp06g==,type:str]
+        #ENC[AES256_GCM,data:0nHZmEPPaw==,iv:BtOZ8/U0yg3fthHrwerNQX3+KD/H9+fcUylYGnZqiIM=,tag:DkFGSFfq//LmWfg6DGm1aA==,type:comment]
+        user1: ENC[AES256_GCM,data:7ev7GuKLeJbPReMy0FnX02fLv5nNCpxdzfnQyAA+/IviwDMQ,iv:YbESsyIAiEAyvrHnj9A4lITX7NtRkuRhCrTv6hoG9Qs=,tag:8uledxLXqpXXLBh+cczm4g==,type:str]
+        #ENC[AES256_GCM,data:3KN/1hzeR2I=,iv:iaqJJD6iURTUlIL8e8P7fsAzJYo+y3NGZXgWmPX+4ao=,tag:e8g/JgVrMrWJamUMpiv2pQ==,type:comment]
+        user2: ENC[AES256_GCM,data:58PnLCwDayOYinsPCYPeMvuKiF7b4tZtbmEJFWEl+2Nu6HL2,iv:hSv3jCtkLm4rrm/4+ot10CBhobGwtnK5db5wR1S/XrU=,tag:SQbynYp8pDSqj4tAK6JBMQ==,type:str]
+        #ENC[AES256_GCM,data:uTZDsA==,iv:6cxvQycfji/x+DW1CnO45r+yNTLwkhYkiJwDaSpUCwo=,tag:8pMw+sYeOyZBN1idHoM9+g==,type:comment]
+        user3: ENC[AES256_GCM,data:WCVr0ylGm2SHtOGulb8TD/cI2xJXrbvY1d6+STXGxf0d0izb,iv:vhNshb38AVpwKCFRwUVruCQ0SxhHrOmwQ+IoQZeUj1k=,tag:OfdIjRrTAuVZBOEXTtnrQQ==,type:str]
+    private-key: ENC[AES256_GCM,data:akNIeVp2bfKvnzlS6KLAdqAo7qsGfPatzCZpN1tNRLhRVXmJCcUDVSmVoA==,iv:2Rny8ioDJ2x+NR+n7/Aluv7JZ+Om3MuJKsXiwONYntg=,tag:a3xubIr7hpVjRiHjFL/q5Q==,type:str]
+acme:
+    token: ENC[AES256_GCM,data:JBeN7SVxKGOe6er0eS7/v8YrXdv0nCK/KZc8Ygq0G7FIGu4hO662kg==,iv:rf59MgUCYlAA5h18wtdWoUyb2VPB13OPuJjz1VsI2dU=,tag:ViPrwduD8aWf8i8vmBG78A==,type:str]
+nginx:
+    detectAuth:
+        chn: ENC[AES256_GCM,data:lQHDpv8/Yl5/nycHoeTnCw==,iv:ernNxRpcTOSAllDpqRFVFg3qEw/slEEPPXDFq1AhNL0=,tag:2AVALUf9cDyOgCqI9wwgQQ==,type:str]
+        led: ENC[AES256_GCM,data:zyCiiH21,iv:iEYyNClDsCpWE2oNjt2NqQZ88xOOlMr0yycjKTPdmlw=,tag:kQfbshXfTBA5PtUAgpgCcA==,type:str]
+        chat: ENC[AES256_GCM,data:pXu0WPWmvUzvl2expDpQPqWwi1A4abg72npsaYXDXRcg6aVU0Ec+tgM2+uz2hT9rh3mNoBxadYXDc/zeOL1UCg==,iv:iln5UGGBK2s5pGS03PtolWTkx6KrnYBAWCFnI0V2Bag=,tag:EahTDoPIBkgWnp4MOoTCmw==,type:str]
+    maxmind-license: ENC[AES256_GCM,data:8OioibcXQ9IZ0OQhJ/zHSBQjfdHzkoqwUx5zR8Zq0atNw6SSf7vKrg==,iv:z6WTI2yeqP0h7EqKG114nRQpFVJlNzZspgS6gIFtpt4=,tag:a0dBt9pXJnncBiSKt9dsAQ==,type:str]
+telegram:
+    token: ENC[AES256_GCM,data:Si6yTh48HpA8OkkkvgHwtJYFhF8tW3oaQbldjwBc09QJxp9AoKgASMnZtbDZYA==,iv:GrNyZXjaZMviSjy/LGHHrYTr5PFvDkCXmT3MU4+SLpc=,tag:YifB1tKFLqsgXB/YLqYK4w==,type:str]
+    chat: ENC[AES256_GCM,data:ydPky0W4ZWqn,iv:uWQrZDz2GCxiKRaijM89Npt0fQeSNHbQzDefkZCkUAE=,tag:OJQwV/889Vp2/4wjbN41JA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNamN1TytweDd3blJsR2ZH
+            ZmlocFZjT3ZaUjlVbG1vVSt4a2s2SjJIaGtRCjRneDV6cHYwdGJOY1BDVS9DeDVC
+            cDdNbUdtSGRHNU1yZFpPc1MzRS92ME0KLS0tIFpmamNmTFYrRGRqbTFVSzBhUlNa
+            VllXdzZ3bEc3UFY0YjZRKzBUcGgyVkUKqI1ojiLbF87alAkEwyrm8wuW2fLbmj8d
+            YBIpoDCZ7AwR5uHWQAtl7BWJV1zab+rA3zvaf2BsrVA1A+RWOtYT/Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1yvrl4y0r6yzcxzzkgfwshlrtsjt8uuya6rfwks09pnft7esfcyvqmrtm5q
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWWitsSnRVSzJDZG9ZSE5I
+            bmt2NEFDanR3aFJyYVNnU1NlUldRb2RUVXhNClQrTkgzR1dPNWp3endZTUl5SmRs
+            dEtkSWk4aWJEc2hhbWlXZkxpNGhacFUKLS0tIGZNSG43R0NKYmdFMzdXbmJjSExJ
+            Ri9hM3NRTkM4Q1lDdmdPemEweEFBUmcKNLL5qH+JeFWX0GovkPFVVAnz+4tmfG6/
+            1jN8YqbMIxf5/L8tauXPf0iIiHa6pUcjtDZPr/OEmeXebmF6Bh9u9Q==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-08-25T03:19:55Z"
+    mac: ENC[AES256_GCM,data:v6yb7ZYcnPw/8SqEJnSWzmlE17PenjnBH2X8HZp+kIDXzNFyNvD19FcbCBZjwyjBLvN1ZF4M9FS7Y4+CvvMrN/4JcFufcY/V1NrOd8IZisfAT5N3WuopPee4IN9WEyPVOsbFnesZo6/wJKuqlV1UR8UZxCd3/wHXob9Lkz45cBw=,iv:XKIUiRfP0lj8V/Z1HbvhBankdcAjQqM8Way6TWjJJMY=,tag:PLYsVj6BmR132oWsxEKnfg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0

devices/vps6/default.nix

@@ -30,13 +30,13 @@ inputs:
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
         networking = { hostname = "vps6"; networkd = {}; };
+        # do not use cachyos kernel, beesd + cachyos kernel + heavy io = system freeze, not sure why
       };
-      packages.packageSet = "server";
       services =
       {
-        snapper.enable = false;
+        snapper.enable = true;
         sshd = {};
-        xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 14; };
+        xray.server = { serverName = "vps6.xserver.chn.moe"; userNumber = 20; };
         frpServer = { enable = true; serverName = "frp.chn.moe"; };
         nginx =
         {
@@ -53,15 +53,15 @@ inputs:
             (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"
+              "send" "kkmeeting" "api" "git" "grafana" "vikunja" "write" "blog"
             ]));
           applications =
           {
             element.instances."element.chn.moe" = {};
             synapse-admin.instances."synapse-admin.chn.moe" = {};
             catalog.enable = true;
-            blog.enable = true;
             main.enable = true;
+            nekomia.enable = true;
           };
         };
         coturn = {};
@@ -80,5 +80,10 @@ inputs:
         beesd.instances.root = { device = "/"; hashTableSizeMB = 64; };
       };
     };
+    specialisation.generic.configuration =
+    {
+      nixos.system.nixpkgs.march = inputs.lib.mkForce null;
+      system.nixos.tags = [ "generic" ];
+    };
   };
 }

devices/vps6/secrets.yaml

@@ -1,5 +1,5 @@
 acme:
-    cloudflare.ini: ENC[AES256_GCM,data:X1v1QuOZemIuxldd1bzIvbUsq+8HMGLh91zUB+fnrxaW40z0OQh9L1rF/0Nj3gmUmgT4KEV7nkHFYYpZBp4/Kyc=,iv:fQmbhx9wV3l+DVPaBrAyJbTCsS3q3s5F9Go1F7pZ2pQ=,tag:P4vuruX460YSOUsx6zGHXQ==,type:str]
+    token: ENC[AES256_GCM,data:lJc2A1Q5vxWQsSchA5pvXSYW+DjBCkdSbWVD7+Py+lG/6nGUmEAHVw==,iv:ZcysHsiLQzD/7vMn1wTCE5lw7/IgkH3oLem5xCjnf7Q=,tag:7EC+S79HRCG/Q+bqVcGVDw==,type:str]
 frp:
     token: ENC[AES256_GCM,data:T8b1ku4HNCNSJ+33QgIt1GILFA4wTu3Qd0rDqHPVgdqsGo0R90k0u8z+dElSO7q9PapTqUbZ,iv:hwnMu6JxfYLgw4TyhujX5dI2IAytgZh+Bexhgta6ATQ=,tag:lqgwvXlS/jGPxasmk5Vh3w==,type:str]
 xray-server:
@@ -34,9 +34,16 @@ xray-server:
         user13: ENC[AES256_GCM,data:ExbnvWDIBqga5+k2mpoT8AKBOXAvUNMjBTPXUKrmtWzz4l+L,iv:UI7CvSx2FHYGf6BEHS4e3iwHZZWkl2Zt5xg2WdKbLvY=,tag:ad0c7YW2Bxo+Dn+BoSZ0Ng==,type:str]
         #ENC[AES256_GCM,data:R8lN5T0=,iv:FXLf8Vtjg+PkwNhxXWDViMKqwn7tFMaPhio9zhnudZw=,tag:34gxRH+P9lmkUxlOPKcYMg==,type:comment]
         user14: ENC[AES256_GCM,data:dgNPPlJD5JOFPbKhlvlRHBLmUNKeDm/JAiawUVpBE7H07Box,iv:w+t9BkqYvlxVKr+x0MwtBz0/YSR/7z1OnZLIoPdW4gc=,tag:CR3GLbaO0jSQgA2HuwzRqg==,type:str]
-    telegram:
-        token: ENC[AES256_GCM,data:xsJoGgQ8pLeZqA2alGKkCyrvnjY6rVF5TlXn4GWDrStFBl65XXzwVY/9ZZthYQ==,iv:qTLfpRUyuIGFM668URfknhSRtx3WEHp/WTGzGUPuFd4=,tag:p8mF0tM+t02g7v2EQZN3Vg==,type:str]
-        chat: ENC[AES256_GCM,data:X1JxFQw0bPCu,iv:hf+TOSH2p9RdnXDFKxTpSRzxDLdJyzNHVV8MfOQuGWY=,tag:iiWw9IFiBGOOyOSl9Jj2wQ==,type:str]
+        #ENC[AES256_GCM,data:X80nhW5a/JQ1IQ==,iv:2UTsNLLDr4uBAEcPyvmep1fqH43JLUiHc/zqQWChfDk=,tag:DJEArs1nVnlcJgqM2uy17A==,type:comment]
+        user15: ENC[AES256_GCM,data:6AskiMLLl0HV6tm2rYpV46XW0jePQy+wme2oi3M7He7WsgVM,iv:lGfnFn69Vnjv5J3rp5sRazD5/B+8Nk8MNG7HIyf4HKA=,tag:Vbg82tdn3noOfhKVVx0Phg==,type:str]
+        #ENC[AES256_GCM,data:4jJkbMD9Psxrag==,iv:arRtRaNrqnYcT7vE3wqgl/y8/65ORaxqTdGw55AKDP8=,tag:pRpta6mXfy0XCyzMA4+cEQ==,type:comment]
+        user16: ENC[AES256_GCM,data:fo6KJXlPDn7+FmxjEJQo9d79rDYemLFx6LanYZcJpKJR7Gxq,iv:yEUKPNZ9idrSqyVO9fhksP/7bjPMT/LzNK2VSq503/c=,tag:M87D44SIo9JzDB3ZyKu7fA==,type:str]
+        #ENC[AES256_GCM,data:/Kec+CdtnT11EA==,iv:DnmbWfgriaE6XAnMqq2UXhHhN+Rd/3YRodKVUCJo6p4=,tag:NimqZpbslKxwzoljaZqEdw==,type:comment]
+        user17: ENC[AES256_GCM,data:gQInIcNFxJuCSsMDGq4yTp5JdMMmJRy1tY3PGLoLuuIXWV0a,iv:ya4n9Z7T9/bxeHqi5QqwJprEzDMsT6X0BuEXRS67wWk=,tag:RcjQfAHv8uc3PgN5c4bySA==,type:str]
+        #ENC[AES256_GCM,data:h7E4P6BiGjktYg==,iv:DhkK3NNppBqo3sXt9U7kbgfaBPYcSEX2hu6VOAesDiE=,tag:XoVbZklwCmU1EBhv0ujcSw==,type:comment]
+        user18: ENC[AES256_GCM,data:dssxPEv8srXydunolaaDAYYo+BOXhp2PoqidOWH3z6NYBpyB,iv:WCLcMMwQJiHZBwreQpaOZp2saXvjBwgYUqSf7HQhMgA=,tag:5jsAVcgAgO+7JhBINz6tzQ==,type:str]
+        #ENC[AES256_GCM,data:qGsMmWrUIzVdHw==,iv:DXayEA5zquwOzm+TqECYNHM98r0WSzcP3gA8zkzdPy4=,tag:OKTx12RqP9VxJQOnrBLkmw==,type:comment]
+        user19: ENC[AES256_GCM,data:+Mh15DR9xvFAwks86iuHEA9FpObKWTSuVOEzUDpBUS/h0hOz,iv:zYIkic2bibvwCBpomnJ9465mda1rbm3RERBZY9twXuc=,tag:bwdL6DAGgkGYhYFI2C4A+A==,type:str]
     private-key: ENC[AES256_GCM,data:ts/LRGFAsYqvGvkvlxUI42IW1a8cGsSkpZhMDd3QVceRKvhPb1SRDaXoSw==,iv:6xX9xFIFUNlLBZ6CPBOz9JbHpvC4+QG9ZaCZcWdl12c=,tag:DYIa+QTV8vyl1l7OKKykTw==,type:str]
 nginx:
     #ENC[AES256_GCM,data:85LrqdTMIhSa,iv:mIQPYz8VPd5AxeMCQEdTGMD0Iqa5QEAa5+8JVFaj3JM=,tag:TcZd7S3WRPpEV9lHI1fzbw==,type:comment]
@@ -53,6 +60,9 @@ coturn:
     auth-secret: ENC[AES256_GCM,data:50KqO4GQ1ERbCnK4IjYu6aywT+IPMtVlTzh/TE4MwWApU4pO9yqz25ENGUAKRLi4p+Ecug+Rn3InRl1b+q6bAQ==,iv:SgHkHvHg/+yA1Z5E9effgCnZMVXv5amGNUsVKErai54=,tag:PoYLV9Xr0IXXsA39n7wiTQ==,type:str]
 wireguard:
     privateKey: ENC[AES256_GCM,data:4DKPPqQkjb33rQzFIz863A2arDRQA9AivWFBaWTf0xXDX4hWvJFiIlJQfvE=,iv:0R2TH3CMxHgwVjojzjE2Gnp8SXonmBDLWF7hB33NiX0=,tag:vgtV8JkuCdspleN/SvgIqQ==,type:str]
+telegram:
+    token: ENC[AES256_GCM,data:LskBPmXZk3hRZ2bChXZjmRzzGd2A2GKrUZMknCDXTpTzOdP/RDibRvgI75HLWg==,iv:9lJKuGLD5HuQinWvvAvwWFAvEJofUGkJsxKNpqZrGmI=,tag:pTmTOlsYIY6Uqd69AtrnBA==,type:str]
+    chat: ENC[AES256_GCM,data:0ehCIvd7sBFc,iv:OwdiIoPrt/e1YgsCrYcqqMYhsJuEtKW2pSKNVxahMV4=,tag:ig2CfQxwzv2ppIutU6371w==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -77,8 +87,8 @@ sops:
             ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
             ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-28T10:31:05Z"
-    mac: ENC[AES256_GCM,data:6Z+ltjbvQaYhDPoiCN7ajQeWcp6vj3TIcUXUm/r/tZU4mIOvfxA7hxW971b76bYPTeVwgp7ZB9qQy9emDHV9i+aSyJpTPKQHRRz5J+T+NJhTP/IL3R3VmG89ssC6NH8FSk0S487JkPd8tNz+G6bvwFCPRxRLNj1pXX0Dp6tgwIw=,iv:xLw2iX1ODAbJCTJ8fEvG7SdZ1GnGwADIckH8DibVM2Y=,tag:TTzlHdcyIQr/92ZHmViRXQ==,type:str]
+    lastmodified: "2024-06-30T10:43:57Z"
+    mac: ENC[AES256_GCM,data:Mg/DZghIkaWM5KEjk5zg3S0L5qPa8/rkc2ooSjA1ewzbDhTKls2tzv7fQqLx2WQtcJiKkoVx22UkiL0AzBwJdCr3473vx93ajTVK9HNu3jqXmuzSiv2iVS21EX9tyBNiL6uWlVAtlVfMMs69PEUF+EJIYY5TkVVPaQjzEebwo5w=,iv:tFON7RVSnNNHo5U4dRuMGDhH5iPGShW9uoda+apiIjI=,tag:3nG/u7vaChFBHoDsLLb23w==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

devices/vps7/default.nix

@@ -26,42 +26,35 @@ inputs:
           rollingRootfs = {};
         };
         grub.installDevice = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
-        nixpkgs.march = "broadwell";
+        nixpkgs.march = "znver2";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
         networking = { hostname = "vps7"; networkd = {}; };
-        gui.preferred = false;
       };
-      packages.packageSet = "desktop";
       services =
       {
         snapper.enable = true;
-        fontconfig.enable = true;
         sshd = {};
         rsshub.enable = true;
         wallabag.enable = true;
         misskey.instances =
-        {
-          misskey.hostname = "xn--s8w913fdga.chn.moe";
-          misskey-old = { port = 9727; redis.port = 3546; meilisearch.enable = false; };
-        };
+          { misskey.hostname = "xn--s8w913fdga.chn.moe"; misskey-old = { port = 9727; redis.port = 3546; }; };
         synapse.instances =
         {
           synapse.matrixHostname = "synapse.chn.moe";
           matrix = { port = 8009; redisPort = 6380; slidingSyncPort = 9001; };
         };
-        xrdp = { enable = true; hostname = [ "vps7.chn.moe" ]; };
         vaultwarden.enable = true;
-        beesd.instances.root = { device = "/"; hashTableSizeMB = 1024; };
+        beesd.instances.root = { device = "/"; hashTableSizeMB = 1024; loadAverage = 4; };
         photoprism.enable = true;
-        nextcloud.enable = true;
+        nextcloud = {};
         freshrss.enable = true;
         send.enable = true;
         huginn.enable = true;
         fz-new-order = {};
-        nginx.applications = { kkmeeting.enable = true; webdav.instances."webdav.chn.moe" = {}; };
+        nginx.applications = { kkmeeting.enable = true; webdav.instances."webdav.chn.moe" = {}; blog = {}; };
         httpapi.enable = true;
-        gitea.enable = true;
+        gitea = { enable = true; ssh = {}; };
         grafana.enable = true;
         fail2ban = {};
         wireguard =
@@ -74,7 +67,14 @@ inputs:
         };
         vikunja.enable = true;
         chatgpt = {};
+        xray.server = { serverName = "xserver.vps7.chn.moe"; userNumber = 4; };
+        writefreely = {};
       };
     };
+    specialisation.generic.configuration =
+    {
+      nixos.system.nixpkgs.march = inputs.lib.mkForce null;
+      system.nixos.tags = [ "generic" ];
+    };
   };
 }

devices/vps7/secrets.yaml

@@ -1,5 +1,5 @@
 acme:
-    cloudflare.ini: ENC[AES256_GCM,data:PJ3JhdSPCyxzdcRI4UFdESWgyAjIYGyuVaU9l0R3s8mJidtgavvSSMy0hC0G/2fauLB/Eqc3L3NppXFjlKVywVE=,iv:lZVlOf7P/Vs/+u/5YPKFXmdeYV9NP9kcVWd00w1OjB4=,tag:LfWZTvPQH4QPrNrYfZ/Z6Q==,type:str]
+    token: ENC[AES256_GCM,data:D5D9Voteggfoc7Hj/xdhGEHmFIkG2H0Y0t2AfSY7hjRlsQhUoAzCRg==,iv:JLUjY/6DJrNsG0YZ0WD/Dmjgjsbx26VANAQvZnyj6l4=,tag:WBQv8AvPW5+XK8FAzppnNw==,type:str]
 nginx:
     detectAuth:
         chn: ENC[AES256_GCM,data:Gk0TTbnFcsvIgoDcen6B8w==,iv:kvyvygw9zDwaiTQ2vPFTHQex0EWDFg8M8U22AConQFM=,tag:ewAZ/nXxmTOhDAjW/A2OnA==,type:str]
@@ -29,8 +29,6 @@ postgresql:
     akkoma: ENC[AES256_GCM,data:6piRt7BbMBLVGdot+VyoJN3/S8DoPNTYHFh/1coHSLNmiA6kU/6sca4Bts1Up/Vu164oTsFAr1JsKx6tzNzAPg==,iv:qplA1GXHwzVrmjm7eagCk3PFa7DRdwaf+p7N1HLb6mw=,tag:W6WedSK3R1IgZVo/0Hr9vA==,type:str]
     synapse_matrix: ENC[AES256_GCM,data:5j+TYJ3vYUqu6CdRDYAT558DsTWbX4Rh+HuukPog5HGXlhneL3RnxVeGBR9CV1rlCP1NY99Nm8roBG+BcyPYHQ==,iv:CboB6lzqxAE/8ZlzaTU3bxw94N6OAhrq8pZ0AfxQiUc=,tag:z6cM3ufgbMn5n5PzgqdRjw==,type:str]
     vikunja: ENC[AES256_GCM,data:syb4NYBxL3DdmZmcC+em0klmm6bkkIL/DH/gnzShYRiaezRFskT+yay9govn++SpbuvkoCJq/GYAFxNL+hcVtw==,iv:TQUgdzYQ0gqsAmux9v3BAQFNzHnCTZ+X/OC0b9Bfya8=,tag:b1AsiAW5XzA3DzGdf8J03g==,type:str]
-meilisearch:
-    misskey-misskey: ENC[AES256_GCM,data:4s+qqd6mmstioC0XmG/vA6ED9mzu1vRJVPFFalRiqnnsFy0dYEU87H+y12eOp/KDSLdTNvpp6Z6jCNvxnpDXzQ==,iv:x6L9OPu/dwVsD9pYb4dqavw9NesMbo7LB+rwz6veAR4=,tag:/BBqV2sHIgPas7XsZydh2g==,type:str]
 rsshub:
     pixiv-refreshtoken: ENC[AES256_GCM,data:EeSOTSAAh+1Dc8+a/AaPJ0aBK5DTa3pdS6DrIMQmRw/n0SRu2QoynIF76w==,iv:dnZxi8jM1I4w3C2duYielpP/8wOAdHDjcqDIrowM0dM=,tag:8irGvLEbRJHV9TB8Jibs9g==,type:str]
     youtube-key: ENC[AES256_GCM,data:OEm/ynOUPUq7ZEVzL2jgs9d+utkLTIdNq0MHE0JDujb9ndAwyJJI,iv:RRae6Cg6GdDnXAQOdtBYmcA7ZNuu70VpIg2MEezBn5k=,tag:gX4ZG345cT3Jh3ovUxtLGw==,type:str]
@@ -56,11 +54,13 @@ synapse:
         signing-key: ENC[AES256_GCM,data:hzxxDbGp1L09O7+ueUSa5lJOY/QvF2zvHdpueEHjaPQEToQt9mr2loeTQHC7ObTegfLb9UHrI1jn4A==,iv:KngfahwYZZmDQ5LeOUPWptTMGAC8TZm1G0FWcrwCwsw=,tag:U9pW6/boBIpiswn67Ezrfw==,type:str]
         sliding-sync: ENC[AES256_GCM,data:BeA6g98IWDP6hnLFI77QqG6esDwB6j3OPzAv3eJxWoTajAsByHSgSYP1vHN5Iok6IgvSSmkf0/HiOJy1Ca8IIA==,iv:ca+t/rYwc/fAVUcz0JTmrRQCOcbDNscbnE8BpHkx/OE=,tag:eEfhUChUt4kRnO82XqRY4g==,type:str]
 vaultwarden:
-    admin_token: ENC[AES256_GCM,data:muavuOY88Lm4rSEoCp4IIPp7Z+sqf36VwpnPgf+K6IwwFkUgYM1GO80ogReYWqqUM6ij1Yzl5D9ncUbq+aGTKQ==,iv:jA4MRJlz71CMmPnWjb2tGbbIoMkEsESUowhXDckKKMI=,tag:l0HaJmnU29YeFUxjOgN3Kg==,type:str]
+    #ENC[AES256_GCM,data:yFDD8GHjZWHN/Yh53DseevKAhDVwrHX60e8sGZnF4BUsUuPA/4S2PRzj7CtlpFzUH3kb0i+HkLKRvbchg93U3as=,iv:JGG7daEKs0oMKTNVi9GS7PrXn/8rFtVkHknACsEQR+g=,tag:RSN6fojLsI4dcuPu2eTiWA==,type:comment]
+    admin_token: ENC[AES256_GCM,data:OpjREmxJSRj+aGVoP8KKRE7ClNqRtaV8va4WLVmpl1AO6D0q/GapJvhORHQb5s5ZjIAgvWTz1w+fh050Q9sPwRsNUke3FIcyeNy7k0PHgnnVIdxnU1Vn9KMz/SovjQ0/qEQ7tArvW/EXtKfwnP9lsz9m94VBvA==,iv:9AvDqMa2PeQOSrP2th3YBgA2RxPl3oKZTyUzi/yjRTM=,tag:HYFTQDgWvBsHQk8IZxWkfw==,type:str]
 mariadb:
     photoprism: ENC[AES256_GCM,data:TF1SZVFnvzyE+7vrHYYUS4Juqhbiw9QcJx7p3Xj88xyBFcTqS1YjzAKs/9GQ1PuzdBrt6hXm/XtJILHiuktnSg==,iv:sd9sQEuIePL6LzUYbFtmdecJ57sMrkF0coalBf8KFqQ=,tag:P/knaKYTJ+aXu4l6IixISA==,type:str]
     freshrss: ENC[AES256_GCM,data:ydqCbj3UbsLC1e++p5ixb5Kpmk2BsYd0urcfw8T51Is5N1/gQ7P0zgR33AOteAxw2oj85WQZhxu3eAN7BCXV5A==,iv:1oiMo1wwFNXiTZLsf4UPZSJfKFIWLI3h947TC06CVy4=,tag:Otq1oeKBnWXhqNilfsywPQ==,type:str]
     huginn: ENC[AES256_GCM,data:1Tdg1WDwGgFSXdChgif8knWS24BIFYnmaiSjJXxs5uj/v/5fJ1alb4K4XHW/kFRjQbuAOFfJiJ9ogJ1KAyk17A==,iv:qLMaQpVaKrjP7g2lWzhaNLghxwiV4YJmyYY1hrpu5I8=,tag:566JCENvOxgwD7tM3aQBiw==,type:str]
+    writefreely: ENC[AES256_GCM,data:+5jsON4SpeWKWZWlbn233XuQ/6HDzaS3XxUxDbUqAp8S/XGmn/QuFK2f375QJEiyZsnrIYkbN/CiOjdTw+nNzg==,iv:8mKqWegyxrT6908P5G0olVZzpP+BwpE7SYODEry7F3A=,tag:HeYoT0RFJGzX6DWcBQy7Jg==,type:str]
 photoprism:
     adminPassword: ENC[AES256_GCM,data:gB81joOfS8h05BNy2YmD/N0cpLPa/vAduDcQBeHiY/WkcnvqSXnXsOfnvbP74KQfoP4W35oFkfyGVPUBSB83tg==,iv:AkN2NoqMXVHQA9fHTTR7xbEapEqy/D61mHn7O23hyYk=,tag:WV+siDA3VnRkOYnP4Z9Qhw==,type:str]
 nextcloud:
@@ -70,21 +70,18 @@ freshrss:
 huginn:
     invitationCode: ENC[AES256_GCM,data:+m2AabRzUiCFy3MAKTB8d1IE05WHTcmZ,iv:ccdIPHl9N+bvPR/QCwZUwZOfWTeW6gWhhBjOpL85JRg=,tag:Ir2085K04XUGkAuoCG+7VQ==,type:str]
 fz-new-order:
-    manager: ENC[AES256_GCM,data:qZc5U3SZQPWzcKVjN2+A2qWNae4GItcjvEQFgkThvIQ=,iv:fJpiUlViiUg1ea/zGhgedQG7TeTbeb9dPviYoiUBLqI=,tag:6T7rgJflsjgK++28SgsLtg==,type:str]
     token: ENC[AES256_GCM,data:qhwWRflJbW1QMOhiPfbTIrEdQJyVtfZ1QycCgstdKD1Nh40=,iv:GvZ8MJig64l34jkvuJbMMjyNaPT5yz0/pFCc6KEPTvA=,tag:cMXo/6F9thl8k2iAhT507Q==,type:str]
     uids:
-        #ENC[AES256_GCM,data:WJszzA==,iv:KvyEnUu69+L5ZxNbRmjtP2R+8lHKgdlMN0WuvDbYgE4=,tag:LP2FJ2HXWZJmTdvXpHflVQ==,type:comment]
-        user0: ENC[AES256_GCM,data:Qw18Ht6qXo3n7DD9NgNB+3IRbCmKuvJQiK5UBsg/FC8=,iv:TeeTcR0tnRrniySqKrsKfOfr2JO7+kqS3iETdCFX5ZA=,tag:rRo2yNku9JWxmILWBS/Wyw==,type:str]
         #ENC[AES256_GCM,data:O3DOE3jFCg==,iv:9shUoHCLXsJPKHELlyWdreouEcyOqhsfVI2KaqwC4CU=,tag:tYKVv+/DuesSijZwWGdrig==,type:comment]
-        user1: ENC[AES256_GCM,data:vY4qTPNqdFp2H348jAgvwKktywdVVvQK/lR2NgRE4Ho=,iv:DrweeSEJ5ETomIkRtkcVboiQindzBoxvxjlSmrQIfI8=,tag:sMz1ITHkDclBc4OY91dMGg==,type:str]
+        user0: ENC[AES256_GCM,data:2sieulGmi7mCYrJH24djrrmHArrFbOHZ9wUuKvY4f2k=,iv:lb5ODFOeQQ+D9HZnMw48n/DGRB7L51U4frBVcPx1mvk=,tag:MwZua6u+G478uGOwtGu4fQ==,type:str]
         #ENC[AES256_GCM,data:yeA9zF8Tug==,iv:VZuWLZnt1RBmkBWudKVvgJkYfqxIj/umEHVCfR6IG3k=,tag:1kj7HyjVT59n05VYJ1uP+w==,type:comment]
-        user2: ENC[AES256_GCM,data:7hlq1FEauGcKkStREDbxA3tOA5NmFo9AbXiOPUt+kZ4=,iv:urOP3ENSviWRKDIWGc1P5PkEtkoBSCSYlgGqJQznp8s=,tag:NNKCW5bFPY7t/PC7dsSJwg==,type:str]
+        user1: ENC[AES256_GCM,data:Aw0ydspmf+PXKU27Pdzn4q/nY4sxXCADL1WGB7vm3eo=,iv:uTmVvGlW1HfdvoNbupSw3GyShsWTGVCoNrvVJ5BPUy0=,tag:k9KIoCWM6bSprwR8dmN+Hg==,type:str]
         #ENC[AES256_GCM,data:4G7DyLVVgQ==,iv:Ht/exln1QtL2BxjCaOTIXHRPDiSFYP4zIa7VaeMCuhE=,tag:btVLXf+WS/YgzRFbVFoAfQ==,type:comment]
-        user3: ENC[AES256_GCM,data:nBTbmp9OP14ayVBz1UGC5g76txfUwxL2NPQCKGxsQyw=,iv:2B8ISdT+8WpfeiU9peKoMlpwcRoGZVh11VyAnS9IKP4=,tag:uBMxqrPlb6TaftnAMqodKw==,type:str]
+        user2: ENC[AES256_GCM,data:P5gmhaQ+VOWVOjTrsx34zUS8dsqIkzCwOImIE8TIfUc=,iv:IoJIUcNJmaBTyr0Ut6R7BN/UqyK8p4HtiwbXUl171pE=,tag:k99PGSL1cEALTmFVWH1uSg==,type:str]
         #ENC[AES256_GCM,data:TGrZBuCRgQ==,iv:9IOJ3Bkw9udS/y93TTtZ9o79aDq3Bb+DMEogJG77iqA=,tag:S/XcPX1f89IyfZnMoR9s/A==,type:comment]
-        user4: ENC[AES256_GCM,data:LVendDEBlPUCkXPfgbYf2X0EgJsAdLKjAudXeAgy2Is=,iv:bR0emkQa6OHUP1ucgAvJU0eEop0gp+3rwDB5XJhh4+s=,tag:YZsW9Yyr+ey9AbTO3ucWDg==,type:str]
+        user3: ENC[AES256_GCM,data:cAzf2X20rtQYyz1rLK6b4jo8utuUOdUHVYfCWdfPTDY=,iv:L5cg7aNdfnLTH2dKl4bWCqaujJ9tIvBJrJIoDIaBLwk=,tag:9Al6Wig4lz1my6hgozSsIA==,type:str]
         #ENC[AES256_GCM,data:b4iJ73sUoQ==,iv:A2hmi7lCR15E5jVR8E71GQuHgF4TdjDuQadXOtBon6k=,tag:eopTJdjN16u7PtpZdhKymQ==,type:comment]
-        user5: ENC[AES256_GCM,data:wG4awLnfB4B0qLWG6Aj+OslLMnViPjIzicfB4ZzkZPA=,iv:b9C1IDmZTMV0RYXqkM/Y3khZeSQEOISrQyPjhQe3WKM=,tag:cRMtLNU6TCwTQG4UVhvTng==,type:str]
+        user4: ENC[AES256_GCM,data:nUJ0lPuFOUVGCtq0IRSh5dAkAna7hoow1YOtFEgSoZc=,iv:D8phoZxdbQ2/Zaeq8498eRb0a7SZD5WnVdKv+u2pBak=,tag:Obu01n34JjyAVnF0f3uKzg==,type:str]
     config0:
         username: ENC[AES256_GCM,data:p8+q8u1A,iv:9s52kS5yLB4vQuGVXNtA4amZqT3eHTTybsbsQZRiFnk=,tag:7SA4SEzMHpP9H/rwoE+UJQ==,type:str]
         password: ENC[AES256_GCM,data:58+gFodT,iv:ohZlT1BwnzCYv84xHgFsLRkiPMpE8lB8QVHwr0QtDWc=,tag:XF047RnXs6IbKsTnsm0D6g==,type:str]
@@ -93,8 +90,6 @@ fz-new-order:
         username: ENC[AES256_GCM,data:xWP1cesh,iv:11KFZ/J9PScz/oW2+H5BWgw0+ETkCXlcYOMuPpgjEs0=,tag:HswEVzm6ElRjIDsZyEfZcA==,type:str]
         password: ENC[AES256_GCM,data:Da/E7ZeZ,iv:gIoheXeTErV3+CtZSEDsX7pGzRahHWlKYQ6QZ6W2eu8=,tag:0oQzQ5DJiS2hqMQfU6JRWw==,type:str]
         comment: ENC[AES256_GCM,data:etfZKwbh,iv:XqqF3D0PpCPd2Q/CCu/PAH4SrvXAOu+lIXvSht/KfKk=,tag:7jyG33foxneRK2wvI/5uBg==,type:str]
-httpapi:
-    token: ENC[AES256_GCM,data:fuGJ+5sKr3yob7JbyqtwGBAxnDzxTvoC5XPWHNawOjqC7Ydz6HujpYudG2CUMxt+rA==,iv:Yhg5NqRRp+PYsxNKFUiUydAL1hmz2pr/T0f5GDKV18w=,tag:SZoy0gTzpeq39mEFBTUDLA==,type:str]
 gitlab:
     secret: ENC[AES256_GCM,data:hBax7ClSuttBacykKw42pvrvowZW8OeTry/0rkmy5BHyLM7HllNYCOw+tupIOdhVEfgJPWQeBeGuyFHt7lPRWQ==,iv:zOM+eMW04Z9QkTchkAXWYHg2eWTQmGEs/dHtUnvNVd8=,tag:RzLyecuASl9CcmQSuabN6w==,type:str]
     otp: ENC[AES256_GCM,data:Hgq5Tyq+BUTsexVsjFWf07fY0znPL50+qIm+fhuVljlauXBZouQjJKMhqTs9zhLECOktYUtp0wrNa++nO1Ys9A==,iv:Am51j8QjDtldtsZL8uCu0I3pr/SQ6R8KUQinznZjClg=,tag:hbtrlG0MGNL3VcbQUG/irQ==,type:str]
@@ -109,6 +104,22 @@ vikunja:
     jwtsecret: ENC[AES256_GCM,data:p6e22qPJzTGB21oWhSr8AA4bfrele9ZOHVtZ8BHgX21IhoKdm58coGtSX1CGXR7J6+1/74RdLY9K88nGrM1F1w==,iv:DGUO8rhf7Lg9dTqSmzlR/Jd2K4oUjO8w9E5bihwsykI=,tag:SpX6UI0QIju/tC1fIL9CCg==,type:str]
 chatgpt:
     key: ENC[AES256_GCM,data:bkLxKUqkjwpUeqeAZCaAgKiOse8QtZ0zOn9TQNA84+B3rxNiTFPisI8=,iv:Zd5dO5Sdt4HCvNZgS2K0FjJAzti6oE22vahYQl99TrI=,tag:E3o+X84tRsIEGU9Jfb85JQ==,type:str]
+telegram:
+    token: ENC[AES256_GCM,data:Mr6KrAzYoDXA+dPT3oXqK2wm9ahTjZ5GVE/iRPsmcM+S2MABT+8ramyHz9oIFw==,iv:nIZ8rpSxz2GwMbDQFfG3xauMQjiriZ1oxFMrEQeH7sQ=,tag:y5U1T1vV/mmdE/CeaeTR8g==,type:str]
+    chat: ENC[AES256_GCM,data:8w/0EI64a1dC,iv:dHu9JHcUY7QPd9YBKXnrRXQB2K6jpnLrSFs+1IJmkio=,tag:3ucN3uNnBxxRF+cbLsa1nQ==,type:str]
+xray-server:
+    clients:
+        #ENC[AES256_GCM,data:aAZS,iv:Z+iJG7yC6HJeNdKCCpsZSc9Ny7kAt6GYfXUtZozMb4A=,tag:iMfwjqqmLvu5a8YpF7a0zQ==,type:comment]
+        user0: ENC[AES256_GCM,data:Q8MFrN/3SRgzSlwTx2GmpP/gvG1vpYiVgjsESzUoomsJaigP,iv:oLsf7AX3FE0tFOkJAbqrZVrCa6UxKjp450Sl1rs2Vs0=,tag:5w+AX0p4Or1GAQsEU3NxOQ==,type:str]
+        #ENC[AES256_GCM,data:j3zVwqHmag==,iv:8+ol60wNlbV2RzMBe47VxIrZuec8aXDUNcQvHcxKuiA=,tag:1AgCMfZf9vzWiWDS6hkw2Q==,type:comment]
+        user1: ENC[AES256_GCM,data:ucCiL7uoSafFUP9IiwKOjJqgwNxNLmuHxYXsLYl0fBgbCT3F,iv:RbNPwvSWibODQqySRc+YW65nUvRwaeXT0eDh02sfrwM=,tag:iE7GGrkBxljBT9HdPzDOfA==,type:str]
+        #ENC[AES256_GCM,data:x7dwVDe22M8=,iv:+fT7VUxZGd8SgS0PnEBqHLPLDuywu4s01iWB6TA/BKQ=,tag:CxfP7xSd4L9RBulSfViHaQ==,type:comment]
+        user2: ENC[AES256_GCM,data:e6PbRg30dzOJSXNmU6TML4AaFsSWEvZwN7MHAEX6fEW2p3hW,iv:Y+YYAO6hY9e/T8LSCr34M7riGmSzFIocmWwAwWjnZQs=,tag:LTkdGcRyrx7HqvbSYSsv4A==,type:str]
+        #ENC[AES256_GCM,data:j83rYg==,iv:3oEdAoVz7aMcezcy2chTO0LQTtKpTrJJoQZx3PC03BU=,tag:ABteEIyr2Y6MbGQhmrQySQ==,type:comment]
+        user3: ENC[AES256_GCM,data:Uk0Ax9FVzmmYs+ggWy7z6FEkuj2tppGlvnQdoW6PDI1VA9oI,iv:wSxigXleRUalQR1/TzKfdUVrdyEUuq+Wg42gSv1QMAI=,tag:qn6nBWv6MlGhMarCfI13BA==,type:str]
+    private-key: ENC[AES256_GCM,data:TarrinCFzWkB5zCc7i7f3B3tFfxrF+cGnrg4bw9CAGKWBazSJHCviY8Imw==,iv:azHdrc6AlgS9RPwGVsYRb8bBeC/askCdut1rnv9TA3I=,tag:AT2lLraKVgbp9GmlLJiI+w==,type:str]
+writefreely:
+    chn: ENC[AES256_GCM,data:YvhPa69sVdiljm9Ix6yQh6YCEpFvC9iw5Yx72MBcGr7+swdbvWDAfMmGFY066mAPvhpwZX/IEivKvrS0t/OSnw==,iv:7s2yEb30YaCAtNeevbur0HL28nXHVIqmCx6Bngh+HWk=,tag:yx0JK8RNQMVcYLBSxNj+uw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -133,8 +144,8 @@ sops:
             SnFHS1Z0SXUzTFdEd29KTy9DU3Y3R0UKfhh+rUmWDrf+UGjclP57dHipPLFoXSqy
             HdelmfV6q4/c7ppx2E+oZw3VNgoZCsrxxzYZfwxHJiZb+5vkE0D8iA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-06T14:33:12Z"
-    mac: ENC[AES256_GCM,data:bQIh7fDdE5/fEbTP1pNWcGwZILfOcWoNM/uhj3A+rxYukwMSLKL7MUHnLCFEnjrTkm2CxOdXYda5jCGEOKgRZsKePSz4/8sFKX2yJrWpRCn+02/wtDyCc1JSFgV9TmJpydmdltZvl663vU6Fot0/9oIvGH/M6GiGo3OAqjhl1ig=,iv:i1w31ujw3wcFat33auutDuxBDQ9YpWkJLvKxZ625NWM=,tag:mAk0tLLe07hLtZUQjKNKFg==,type:str]
+    lastmodified: "2024-08-20T15:48:48Z"
+    mac: ENC[AES256_GCM,data:buEby7ZmmEFARmRp3r7JwYdMck87u4c3TGkeF2pkc5ORnqIgwSH1XVSjlbK8vTBWz2FKXeQh9wkX3BMaam9dU873/yPBe54BnbZNggZ7jDDEpSTeddfTsM8mrka0xDO3CUHbwCsqYWFm4NLAbCfRPKhrjvSJVyEC85K3eO45Z6M=,iv:/7cOdSi6oiaaFRkSnR+1/XXapjlQdMgom31xrpIGXHk=,tag:XW4WX93bw45zPweblW4Dtg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0

devices/wlin.xmuhpc/.bash_profile

@@ -0,0 +1,12 @@
+# .bash_profile
+
+# Get the aliases and functions
+if [ -f ~/.bashrc ]; then
+	. ~/.bashrc
+fi
+
+# User specific environment and startup programs
+
+PATH=$PATH:$HOME/bin
+
+export PATH

devices/wlin.xmuhpc/.bashrc

@@ -0,0 +1,43 @@
+# .bashrc
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+export PATH=$PATH:/data/gpfs01/wlin/bin
+
+# User specific aliases and functions
+export PATH=/data/gpfs01/wlin/bin/vaspkit.1.4.1/bin:${PATH}
+#export PATH=~/bin:/data/gpfs01/wlin/opt/mpich_ifort/bin:$PATH
+#export LD_LIBRARY_PATH=/data/gpfs01/wlin/opt/mpich_ifort/lib:$LD_LIBRARY_PATH
+#export PATH=~/bin:/data/gpfs01/wlin/opt/mpich/bin:$PATH
+#export LD_LIBRARY_PATH=/data/gpfs01/wlin/opt/mpich/lib:$LD_LIBRARY_PATH
+export P4_RSHCOMMAND=ssh
+ shopt -s cdspell
+ export HISTCONTROL=ignoredups
+#shopt -s histappend
+ PROMPT_COMMAND='history -a'
+ export C3_RSH="ssh -x"
+export OMP_NUM_THREADS=1
+export MKL_NUM_THREADS=1
+alias grep='grep --color'
+USER_IP=`who -u am i 2>/dev/null| awk '{print $NF}'|sed -e 's/[()]//g'` 
+ 
+export HISTTIMEFORMAT="%Y-%m-%d %H:%M:%S  `whoami`@${USER_IP}: "
+export HISTFILESIZE=1000000
+export PROMPT_COMMAND="history -a; history -r;  $PROMPT_COMMAND"
+shopt -s histappend
+# Auto add env parameter $PROMPT_COMMAND when use non-Linux tty login by ssh.
+if [ "$SSH_CONNECTION" != '' -a "$TERM" != 'linux' ]; then
+declare -a HOSTIP
+HOSTIP=`echo $SSH_CONNECTION |awk '{print $3}'`
+export PROMPT_COMMAND='echo -ne "\033]0;${USER}@$HOSTIP:[${HOSTNAME%%.*}]:${PWD/#$HOME/~} \007"'
+fi
+ulimit -s unlimited
+export PYTHONPATH=/data/gpfs01/wlin/bin/VaspBandUnfolding-master:${PYTHONPATH}
+
+# vsts, see https://theory.cm.utexas.edu/vtsttools/scripts.html
+export PATH=$PATH:/data/gpfs01/wlin/yjj/vtstscripts-1022
+export PERL5LIB=/data/gpfs01/wlin/yjj/vtstscripts-1022
+

devices/xmupc1/README.md

@@ -16,10 +16,25 @@ SLURM 是一个用来对任务排队的系统，轮到某个任务时，再调
 
 ## 常用命令
 
+我做了一个 TUI 界面，用起来比较简单，大多情况下可以满足需求。命令为：
+
+```bash
+sbatch-tui
+```
+
+或
+
+```bash
+sbatch
+```
+
+如果需要在提交任务时指定更详细的细节，或者要编写脚本批量提交任务，则在 `sbatch` 后面加上参数，这时是直接调用来自 SLURM 的 `sbatch` 命令。
+常用的参数见下文。更详细的内容见 SLURM 的官方文档。
+
 提交一个 VASP GPU 任务的例子：
 
 ```bash
-sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia-640
+sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia
 ```
 
 * `--gpus` 指定使用GPU 的情况：
@@ -30,12 +45,12 @@ sbatch --gpus=1 --ntasks-per-gpu=1 --job-name="my great job" vasp-nvidia-640
 * `--ntasks-per-gpu=1` 对于 VASP 来说一定要写。
 * `--job-name=xxx` 指定任务的名字。可以简写为 `-J`。也可以不指定。
 * 默认情况下，一个 task 会搭配分配一个 CPU 核（一个线程），一般已经够用。如果一定要修改，用 `--cpus-per-task`。
-* `vasp-nvidia-640` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-nvidia-640-gam`。
+* `vasp-nvidia` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-nvidia-gam`。
 
 提交一个 VASP CPU 任务的例子：
 
 ```bash
-sbatch --ntasks=4 --cpus-per-task=4 --hint=nomultithread --job-name="my great job" vasp-intel-640
+sbatch --ntasks=4 --cpus-per-task=4 --hint=nomultithread --job-name="my great job" vasp-intel
 ```
 
 * `--ntasks=4 --cpus-per-task=4` 指定使用占用多少核。
@@ -45,7 +60,7 @@ sbatch --ntasks=4 --cpus-per-task=4 --hint=nomultithread --job-name="my great jo
     * 对于 xmupc2：`--ntasks=4 --cpus-per-task=10`。
 * `--hint=nomultithread` 记得写。
 * `--job-name=xxx` 指定任务的名字。可以简写为 `-J`。也可以不指定。
-* `vasp-intel-640` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-intel-640-gam`。
+* `vasp-intel` 指调用 std 版本，要使用 gam 或 ncl 版本时，写为例如 `vasp-intel-gam`。
 
 要把其它程序提交到队列里，也是类似的写法。请自行举一反三。
 
@@ -173,9 +188,7 @@ RDP 暂时没有硬件加速（主要是毛玻璃之类的特效会有点卡）
 
 samba 就是 windows 共享文件夹的那个协议。
 
-* 地址：xmupc1.chn.moe
-* 用户名：自己名字的拼音首字母
-* 初始密码和 ssh 一样，你可以自己修改密码（使用 `smbpasswd` 命令）。samba 的密码和 ssh/rdp 的密码是分开的，它们使用不同的验证机制。
+* 地址：因为懒得管理暂时禁用。
 
 在 windows 上，可以直接在资源管理器中输入 `\\xmupc1.chn.moe` 访问。
 也可以将它作为一个网络驱动器添加（地址同样是 `\\xmupc1.chn.moe`）。
@@ -186,31 +199,35 @@ samba 就是 windows 共享文件夹的那个协议。
 
 VASP 有很多很多个版本，具体来说：
 
-* VASP 多个版本可以共存。目前安装了两个版本：6.3.1 和 6.4.0。
-* VASP 可以用不同的编译器编译。目前安装的有：nvidia、gnu、intel 和 amd。nvidia 使用 GPU 计算，其它的只能用 CPU 计算。
+* VASP 可以用不同的编译器编译。目前安装的有：nvidia、intel。nvidia 使用 GPU 计算，intel 能用 CPU 计算。其它版本性能不佳，没有安装。
 * VASP 的 std/gam/ncl 版本有一点区别，一般用 std，只有一个 gamma 点的时候用 gam 会快一点，系统中存在方向不平行的磁矩时必须用 ncl。
 * 无论哪个版本，都集成了下面这些补丁：
   * HDF5：用于生成 hdf5 格式的输出文件。
   * wannier90：我也不知道干啥的，随手加上的。
   * OPTCELL：如果存在一个 `OPTCELL` 文件，VASP 会据此决定弛豫时仅优化哪几个晶胞参数。
   * MPI shared memory：用来减小内存占用。
+  * VTST tools：用来计算 neb。
 
 如何提交 VASP 到队列系统已经在上面介绍过了。下面的例子是，如果要直接运行一个任务的写法：
 
 ```bash
-vasp-nvidia-640-env mpirun -np 1 -x CUDA_DEVICE_ORDER=PCI_BUS_ID -x CUDA_VISIBLE_DEVICES=0 -x OMP_NUM_THREADS=4 vasp-std
-vasp-gnu-640-env mpirun -np 2 -x OMP_NUM_THREADS=4 vasp-std
-vasp-intel-640-env mpirun -n 2 -genv OMP_NUM_THREADS=4 vasp-std
-vasp-amd-640-env mpirun -np 2 -x OMP_NUM_THREADS=4 vasp-std
+vasp-nvidia-env mpirun -np 1 -x CUDA_DEVICE_ORDER=PCI_BUS_ID -x CUDA_VISIBLE_DEVICES=0 -x OMP_NUM_THREADS=4 vasp-std
+vasp-intel-env mpirun -n 2 -genv OMP_NUM_THREADS=4 vasp-std
 ```
 
 其中 `CUDA_VISIBLE_DEVICES` 用于指定用哪几个显卡计算（多个显卡用逗号分隔）。
-要查看显卡的编号，可以用 `CUDA_DEVICE_ORDER=PCI_BUS_ID vasp-nvidia-640-env nvaccelinfo` 命令。
+要查看显卡的编号，可以用 `CUDA_DEVICE_ORDER=PCI_BUS_ID vasp-nvidia-env nvaccelinfo` 命令。
 
-这里 `vasp-xxx-6.4.0` 命令的作用是，进入一个安装了对应版本的 VASP 的环境，实际上和 VASP 关系不大；
+这里 `vasp-xxx-env` 命令的作用是，进入一个安装了对应版本的 VASP 的环境，实际上和 VASP 关系不大；
   后面的 `mpirun xxx` 才是真的调用 VASP。
 所以实际上你也可以在这个环境里做别的事情，例如执行上面的 `nvaccelinfo` 命令。
 
+要使用 VTST tools 里带的脚本，需要在命令前加上 `vtstscripts` 。例如：
+
+```bash
+vtstscripts dist.pl POSCAR.init POSCAR.final
+```
+
 ## mumax
 
 问龚斌，我没用过。

devices/xmupc1/default.nix

@@ -10,10 +10,11 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/467C-02E3" = "/boot/efi";
+            # TODO: reparition
+            vfat."/dev/disk/by-uuid/467C-02E3" = "/boot";
             btrfs =
             {
-              "/dev/disk/by-uuid/2f9060bc-09b5-4348-ad0f-3a43a91d158b" = { "/nix" = "/nix"; "/nix/boot" = "/boot"; };
+              "/dev/disk/by-uuid/2f9060bc-09b5-4348-ad0f-3a43a91d158b"."/nix" = "/nix";
               "/dev/disk/by-uuid/a04a1fb0-e4ed-4c91-9846-2f9e716f6e12" =
               {
                 "/nix/rootfs" = "/nix/rootfs";
@@ -26,7 +27,6 @@ inputs:
           swap = [ "/nix/swap/swap" ];
           rollingRootfs = {};
         };
-        grub.installDevice = "efi";
         nixpkgs =
         {
           march = "znver3";
@@ -47,20 +47,17 @@ inputs:
             forwardCompat = false;
           };
         };
-        gui = { preferred = false; autoStart = true; };
-        kernel.patches = [ "cjktty" "lantian" ];
+        gui = { enable = true; preferred = false; autoStart = true; };
         networking.hostname = "xmupc1";
         nix.remote.slave.enable = true;
       };
       hardware = { cpus = [ "amd" ]; gpu.type = "nvidia"; };
-      packages.packageSet = "workstation";
       virtualization = { waydroid.enable = true; docker.enable = true; kvmHost = { enable = true; gui = true; }; };
       services =
       {
         snapper.enable = true;
-        fontconfig.enable = true;
         sshd = { passwordAuthentication = true; groupBanner = true; };
-        xray.client.dae.wanInterface = [ "wlp57s0" ];
+        xray.client.enable = true;
         firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
         smartd.enable = true;
         beesd.instances =
@@ -78,7 +75,7 @@ inputs:
         slurm =
         {
           enable = true;
-          cpu = { cores = 16; threads = 2; };
+          cpu = { cores = 16; threads = 2; mpiThreads = 3; openmpThreads = 4; };
           memoryMB = 94208;
           gpus = { "2080_ti" = 1; "3090" = 1; "4090" = 1; };
         };
@@ -90,9 +87,10 @@ inputs:
           shares = { home.path = "/home"; root.path = "/"; };
         };
         groupshare = {};
+        hpcstat = {};
       };
       bugs = [ "xmunet" "amdpstate" ];
-      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" ];
     };
     services.hardware.bolt.enable = true;
   };

devices/xmupc1/secrets/default.yaml

@@ -1,5 +1,5 @@
 acme:
-    cloudflare.ini: ENC[AES256_GCM,data:PjCyozvFTXxA///enYYbaMZ8ISfFjJviLVKfdOcMSi5G3CEjEsp1Ez4krbgy4/eJo4v9HfTN0bMmUnl2OHOyzTg=,iv:e1iQZ5JUHkzfnfP956Lzl3FWs11xdULctA5MZsALtU0=,tag:8X2Q/Hixxn/ci4XRSUDidg==,type:str]
+    token: ENC[AES256_GCM,data:KKMdZgzciiM+n0Hdsb8vivjmCw6SiqJMbEAmvFwFQgvS9zpCNSyh+g==,iv:GbNJrVLmFudVzgoLdf+j8JsEPRvrQhBu3+2585grReQ=,tag:3tNL+2hoz2R9aOz0TUTjVQ==,type:str]
 nginx:
     maxmind-license: ENC[AES256_GCM,data:/7R7w+fiMw54Cmd7y/wT/s8RMqFMf3Fc0Mph0ZhURmCzowkmLEhtmw==,iv:i+Z+2NbssI864Edwf73SQfaeFuWoqr+U8eQ/8R23FOk=,tag:8ITlkS97vlsmHM1HDk6/3A==,type:str]
 xray-client:
@@ -15,8 +15,17 @@ users:
     yjq: ENC[AES256_GCM,data:ua0DINHutjt2Pk+SfHRQRV99mT3Cnw6rRKO8VRIAlP0dY6QhK9wkNdyRYWYRBKVrWgyFQMGNFYAxIpymjF/X7mBOVI2sOHLgkw==,iv:PUZ6S0KICuqoSA2sDLxdL4gtAOQnQXOUY+5f3qDZgpc=,tag:f39P34vAUOrV23BsKkRarA==,type:str]
     #ENC[AES256_GCM,data:6qNjSdjck4Vz,iv:c/GNqCNgRgwgL+2f6Vumtjb/ub9WCBSy8R02NRCDqk8=,tag:b/tucJsHTjSfcK0vgHtE8A==,type:comment]
     gb: ENC[AES256_GCM,data:3eAKBiJoC1owCHTFd3Xq8vI8VK980evePc92xCXJJ21M9D1MdbwN8ySZ3Ovjk7VfQmEo8oRv1Ll1sftyrXYoeTHmJsNDxCpR6A==,iv:Ju/ERNuGrgO5kYlbvmkbLJkgiW3Elou34AsJTFITCUg=,tag:POVlxYh9kZ1BMSbt97IVOQ==,type:str]
+    #ENC[AES256_GCM,data:/2y613pek/CO,iv:gqSh74Ac0BxPdO+fOsQ0K8t2YduwyTVOjMq/A5Wmoz0=,tag:jLUYXu7f27FruwH5rUUZSA==,type:comment]
+    wp: ENC[AES256_GCM,data:3jeHpeu1YlFhK2+o19q2/JyJPhZFivPbUQzJJbJZ15GzAVh7i1VsTSN31LufXAgsC8KjZHAPhEZlGYvnGpCvPzoISQa5NVAJdQ==,iv:bL3ohgbjA2agFKDwgw0H3LgiHTWB4Y5KlQAtHfEMr+w=,tag:SfLtj7iDcmV3dgOlITFvxA==,type:str]
+    #ENC[AES256_GCM,data:YIlY7n5pcJTp,iv:Y/+ogxaMgSl0vcMPRr3qdSHjjnnhY+N2Q6jFojzIDyQ=,tag:zat02jxJ8jI2uk8noslmHQ==,type:comment]
+    hjp: ENC[AES256_GCM,data:Ii4P9ZsUOEh3cqt3AKWlgUH1CMNnmHln9QNWdTRR3vZXkkR5j5qKAIrAltml/i3xFlt4hftYNufnupog4UlAVWQJhYBlhCSE4g==,iv:eKWmUcKItjd1dsvVP1se5CAhIFqV/eVH03gPJhBau1E=,tag:ZTE0BTSoDpJGqECklGjs2g==,type:str]
 mariadb:
     slurm: ENC[AES256_GCM,data:qQMD8SKNmxb3PdScXNqppF9zkX7dV5i7rvljvZuhiI5zLnu77qYCHBW6ymh0mrY14N9NjxmQZhZWX/H8TvBlcg==,iv:J5N3LjCYW3QmuEkMBpl7qvPFW1Z9ZoPLkj45jKcIW9U=,tag:Tl+ld07+lVkmzt7f/f2MqQ==,type:str]
+hpcstat:
+    key: ENC[AES256_GCM,data:POK329h/joF7WdSBwSE1EkYH/pZ9X+wiTKcVWLZjmh7gM9d7HONbN/PqsYNFTHJVR0GgysqpLEcPN2OFGs/SSeH86o04cAdjAVznKZgt1Q34QGYy6b+io15P3lbmK0kTKmeGt5qEhGkBh6BVBoSyqbKAknvUqJ17ZkL17kyRaKffm3Zais7keEJCFdyRF6oSz2kl2CvEmKNWPWDdO9EpgqgYlm9mwu95/k9Hx5eyUjiFpxc3fdFTESGbe0ZYAqKQ0eLFfLLorQp0pAzxCbbxIzZEgyxjzkICXKa1n7Zz6h1ON2Rsqq0Q4hEYJdWGLtvOH/VLVxvNWjW4Er6i3lWGhZRiDDrxLErQGONI+X7QqbneFCnMCZGln3pAfNtOr+KX58ij/egyzmb7bKZrARqnm+X+/I/L0+VS1PfDdLP53GaX7mfKYpcH6z7O2F/zjpuXQTV8njs64YlvgyYXsCaghEUBzehsruwRsBEkTIb4R2AlqItpbesMnNNUJ4Cr/B7Bw6O+gHeJ+oK4ZPBYbgso,iv:B2eWjydl8m8nbcPw2fZfxCnj57utWM9ABj2eJ1pRKWQ=,tag:5W9ZwVSJvm1KvZnf/E5Tug==,type:str]
+telegram:
+    token: ENC[AES256_GCM,data:Mu7guAFUu+UoHvo/h1blcI6Kg3mvng6zNc/HKXuCdf73ujziK0mXwPcf7t7d/w==,iv:BkA4d0OJ4lTD7csZJQHcDnYe7SYcFbwRVYOQAWOQ2lQ=,tag:GuJ4z5pe2znTY3xNT2WF+w==,type:str]
+    chat: ENC[AES256_GCM,data:OC8ElUPmfsVL,iv:WgZMJP2ugZbqZyihdNtL1xMH8u9VpLNzO8DGpDL4w4k=,tag:u4cKABikuMUbCIm5zCnk6A==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -41,8 +50,8 @@ sops:
             ZDNHUjE2QVlCV3p0NHdKYW5IMHVBZzQKkZtfyvfroOntg3yRjMw4jQHiQj8eaB2h
             IeIHfW4y01mmVT2ofbtB0xYpjcl4gtUlQ8X3tn5iJ9P8gcVo0G598A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-10T13:47:17Z"
-    mac: ENC[AES256_GCM,data:19w2Q1SRhKIyxibGgKa+CkEhiizFJ27FePOlMll+8tJVJRzfIl8KrutlRi0hMhEYFlML0bWunbINUEIg7yJbIwFCSjxFDnqKsCT3iClT3kaktxr5+0R+ECoQTGGV67VkT5WY/LT3V1zdLYI38MVaBQObGKCpBs23nIK2QXrg39Q=,iv:q1ezSmo14vsmEE8owxnsonWMq2uj6mrVjKNh+RuK+cE=,tag:QBc99UEaEPiEgZH+Z3Z8tA==,type:str]
+    lastmodified: "2024-08-30T06:31:26Z"
+    mac: ENC[AES256_GCM,data:3t5jUl0FE4mqMMZp5RFlgmHPdy0jhwFZqtgP5NsAPfHRnQdL10YenqinIHue+R/Bp/0Auq7h+OKX/puibsPpyyqKPtACU2ONmyDqHqDuR+dj4rqFHMiIuU4qCF14J7XUh/PkDGLdASO5GsGPxOJPAGEcj77a8N/zWNSXY0K9NlI=,iv:RYE7lWzAnEgvAvgNDSsNYZcgqR1Yf7rbNHumizxwHjs=,tag:mNs/5JJ40C04apBIo3DoyA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0

devices/xmupc1/tunnel.md

@@ -0,0 +1,39 @@
+# 使用 SSH 隧道连接
+
+在学校外且不使用厦大 VPN 时，无法直接连接到学校的服务器，可以通过下面的方法连接到：
+  首先连接到 vps6.chn.moe。这个服务器在校外（洛杉矶），因此可以直接连接到。
+  同时，它通过别的方式与学校的服务器保持着连接，利用这个保持着的连接，跳回到学校的服务器。
+
+这个跳转的过程不需要手动操作，只需要将软件设置好即可。
+
+## PuTTY
+
+1. 首先设置一个名为 `vps6` 的会话。
+   1. 在 Session 页，填入 `vps6.chn.moe` 作为 Host Name。
+   2. 在 Connection -> SSH -> Auth -> Credentials 页，在 “Private key file for authentication“ 选择密钥文件。
+   3. 在 Connection -> Data 页，在 “Auto-login username” 填写用户名。
+   4. 回到 Session 页，在 “Saved Sessions” 填入 `vps6` 并点击 “Save” 保存配置。
+2. 再设置一个名为 `wireguard.xmupc1` 的会话。
+   1. 在 Session 页，填入 `wireguard.xmupc1.chn.moe` 作为 Host Name。
+   2. 在 Connection -> SSH -> Auth -> Credentials 页和 Connection -> Data 页，需要修改的设置与在 `vps6` 会话中相同。
+   3. 在 Connection -> Proxy 页，设置 Proxy type 为 `SSH to proxy and use port forwarding`，Proxy hostname 为 `vps6`。
+   4. 回到 Session 页，在 “Saved Sessions” 填入 `wireguard.xmupc1` 并点击 “Save” 保存配置。
+
+之后双击双击 `wireguard.xmupc1` 会话即可连接到学校的服务器。
+
+## WinSCP
+
+1. 在登陆界面，点击 “新建站点”。
+   1. 设置 “文件协议” 为 `SCP`，“主机名” 为 `wireguard.xmupc1.chn.moe`，并输入用户名。
+   2. 然后点击右下角 “高级” 继续修改设置。
+   3. 在 连接 -> 隧道 页，勾选 “通过 SSH 隧道进行连接”，主机名填写 `vps6.chn.moe`，选择密钥文件，并填写用户名。
+   4. 在 SSH -> 验证 页，选择密钥文件。
+   5. 点击 “确定”，再点击 “保存”。
+
+## OpenSSH
+
+下面是一个命令的示例：
+
+```bash
+ssh -J username@vps6.chn.moe username@wireguard.xmupc1.chn.moe
+```

devices/xmupc2/README.md

@@ -4,7 +4,7 @@
 * 内存：256 G。
 * 显卡：
   * 4090：24 G 显存。
-  * P5000：16 G 显存。
+  * ~~P5000：16 G 显存~~暂时拔掉了，否则 4090 供电不够。
 * 硬盘：18 T。
 
 # 支持的连接协议
@@ -18,14 +18,12 @@
 
 ## RDP
 
-* 地址：xmupc2.chn.moe
+* 地址：xmupc2.chn.moe:3390
 * 用户名：自己名字的拼音首字母
 * 密码和 ssh 一样（使用同样的验证机制）。
 
 ## samba
 
-* 地址：xmupc2.chn.moe
-* 用户名：自己名字的拼音首字母
-* 初始密码和 ssh 一样。
+因端口冲突暂时禁用。
 
 其它内容请阅读 [xmupc1](../xmupc1) 的说明，两台机器的软件大致是一样的。

devices/xmupc2/default.nix

@@ -10,17 +10,16 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/23CA-F4C4" = "/boot/efi";
+            vfat."/dev/disk/by-uuid/23CA-F4C4" = "/boot";
             btrfs =
             {
               "/dev/disk/by-uuid/d187e03c-a2b6-455b-931a-8d35b529edac" =
-                { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; "/nix/boot" = "/boot"; };
+                { "/nix/rootfs/current" = "/"; "/nix" = "/nix"; };
             };
           };
           swap = [ "/nix/swap/swap" ];
           rollingRootfs = {};
         };
-        grub.installDevice = "efi";
         nixpkgs =
         {
           march = "skylake";
@@ -41,20 +40,17 @@ inputs:
             forwardCompat = false;
           };
         };
-        gui = { preferred = false; autoStart = true; };
-        kernel.patches = [ "cjktty" "lantian" ];
+        gui = { enable = true; preferred = false; autoStart = true; };
         networking.hostname = "xmupc2";
         nix.remote.slave.enable = true;
       };
       hardware = { cpus = [ "intel" ]; gpu.type = "nvidia"; };
-      packages.packageSet = "workstation";
       virtualization = { waydroid.enable = true; docker.enable = true; kvmHost = { enable = true; gui = true; }; };
       services =
       {
         snapper.enable = true;
-        fontconfig.enable = true;
         sshd = { passwordAuthentication = true; groupBanner = true; };
-        xray.client.dae.wanInterface = [ "wlp4s0" ];
+        xray.client.enable = true;
         firewall.trustedInterfaces = [ "virbr0" "waydroid0" ];
         smartd.enable = true;
         beesd.instances.root = { device = "/"; hashTableSizeMB = 16384; threads = 4; };
@@ -68,16 +64,16 @@ inputs:
         slurm =
         {
           enable = true;
-          cpu = { sockets = 2; cores = 22; threads = 2; };
+          cpu = { sockets = 2; cores = 22; threads = 2; mpiThreads = 4; openmpThreads = 10; };
           memoryMB = 253952;
-          gpus = { "4090" = 1; "p5000" = 1; };
+          gpus."4090" = 1;
         };
         xrdp = { enable = true; hostname = [ "xmupc2.chn.moe" ]; };
         samba = { enable = true; hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; };
         groupshare = {};
       };
       bugs = [ "xmunet" ];
-      user.users = [ "chn" "xll" "zem" "yjq" "gb" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" ];
     };
   };
 }

devices/xmupc2/secrets/default.yaml

@@ -1,5 +1,5 @@
 acme:
-    cloudflare.ini: ENC[AES256_GCM,data:/y070fzfZFI/Jb9xS8UO7iRnjHJ3uItqsHqjyHPAqsTN4tSEyMpaE3KtNpecgWxk2PvLRfqdmdwu/bnGlIp7adU=,iv:fv4dbeK1F/cn5nhnSC1lTUqxeFPG/0lNqEvPWMH6Mzw=,tag:dE4clxPGraAXXsJM6NS8XQ==,type:str]
+    token: ENC[AES256_GCM,data:Wb7Gons3HCMK5WGIZpG4XrrqZ5G6bymjuKMW6IUjLiK0CIXFz/ARNg==,iv:zc4BgHcc+O7SHQbJkff11fBwgsd+TFtvSEGJ/qrzVo4=,tag:K+Nu9kenTtTnin4+hDCdWA==,type:str]
 nginx:
     maxmind-license: ENC[AES256_GCM,data:FPVSD8otQMNpbESNEHXCfQjB/zi3OVwZoyLijUtnHQlQzec7KVSiGw==,iv:DkkwCqvRmcFHQIXseh2fycCxZboJMYhHPu67GddenY4=,tag:iHEC8r5GcuB1QcZ5Uf8Skw==,type:str]
 xray-client:
@@ -15,6 +15,10 @@ users:
     yjq: ENC[AES256_GCM,data:sGPQ0xALULREnhzl9g/V91M5osMglsSps6R4gYn5OZc/4xVC1phF3qajVN3YMOr7kKgkHbF2Rjm6/2vuK0k1iYZnFswUAmFlmw==,iv:5vG1hn7SlX6HCpas2BgxBSwWqLby8OCxcH3EKNvceIc=,tag:TVwFBAuosKnEOZecq1phXw==,type:str]
     #ENC[AES256_GCM,data:ALHxkRABA+ll,iv:r1IDiHLFcTdLID3q16zrLTavAwQfddC7bXMKcFZFveI=,tag:4Pd0/Q1BmH4gJjaM4hbqqQ==,type:comment]
     gb: ENC[AES256_GCM,data:z4CrtdmdLJJ0qZzr7qvihnluJQgjtciX56KdEmtemiRu0llEJk9qz6a23aJ7m40Sfc38elF1/LsvjOuBOC87+BVkKDCj76phag==,iv:WrFVxkr3snmqDXZx5kAYCLp7ixEIzxoT7El3rV7Ovqg=,tag:iExf2Y/HObHQrKMTRvqn7A==,type:str]
+    #ENC[AES256_GCM,data:XfNExliq7noL,iv:K+rFlZHF1oY5rsTzaO0mgxiE1VlKdtPTifAaesg321k=,tag:Dja8NmPWZdJkf/J/96/wAw==,type:comment]
+    wp: ENC[AES256_GCM,data:yjMDez28pJUo6riIHypQQgjGFbuLwy87eG4ek/+Li2w8b4Cm5JckRvs26o+S0blfICc8WqIqEJGakT2wVBE5O1jGfniKn3PhTA==,iv:dOA318XRd2EXxmTIlk6GhlAR/FBpbKkbPJJCXTwFCxM=,tag:9MkXNUuAoplAzE+4eJpr0w==,type:str]
+    #ENC[AES256_GCM,data:YGcTkNCeu3m7,iv:jYmVrfRFwQoX1XxeSzS23wRMAD/AnzYBXQjI76Ke2FE=,tag:WJfSmjdggzPojDcJ6GzP+A==,type:comment]
+    hjp: ENC[AES256_GCM,data:0R5SfBFKuLGurwINnTj31FOrwwfY9bqVS1rG/a0HqIYd+Ui8/2ffFBx0Et+tYIqcxXEJpGbvse43V0naNKmFKlLanfcy9YV/Hg==,iv:mpAUmcVHWWLoreEsG9ha09jxte8mQCLt/A7nm04iX9Y=,tag:bia9pjL0MAcs9vj1gKCVCQ==,type:str]
 mariadb:
     slurm: ENC[AES256_GCM,data:9wLQ1zF/kDaiw0s3UaRpiHgmngU7u6hwyqpddSjev0+Z0v58Q2oiJtK8vn+2VlSxx5ACfqEFbzp0PZYAxd575w==,iv:q9JTkgDymOwkbZ/PaxRAAQrtO96QmGgZcQuLTFCMoS4=,tag:dwOHlOTgZqT/1jQ+oGf7UQ==,type:str]
 sops:
@@ -41,8 +45,8 @@ sops:
             M0xoL1dQR0kvMWpzN0RMNWVCTFQxNFUKj9LPjBo5NGOrGYNvu8qZ13PLYjLEWllU
             LARzEn4XgkeHckouwvxZYMCx7WxmAruRWaOvnxTIczzSNP7wIrqnkA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-10T13:46:59Z"
-    mac: ENC[AES256_GCM,data:j+bdp0emAtTNNI7aZsKTJ+uARsuyLb9GRV0CeIb2EoZaOmj5cJpUzYtcAWIdCYplt1ZScCcR7iQPUlCzUb0+pXth7QDibtGJcj0dqw87DoaY3cqm7jNkKteiIYxXOCmbMBgED9eMxQVdcGZTDSuTQ0KjFYoXkcUSriMsJltDUDc=,iv:+eLNmlxeqB/Q7Rmz5B/wZSajiesV+/ED3ROJuuShpfo=,tag:95xKRRuqRZkUFUjHbPrDNw==,type:str]
+    lastmodified: "2024-08-30T06:31:36Z"
+    mac: ENC[AES256_GCM,data:UUzv3IewuF4rhbrL2haJ0495p1d4wXA7LHa5ogc5TSv+ZAYuN/HL3VCXQzzKQrzqD3LtgC3DrGgmMNGVyAIzqVFYYxVuAwb03ov+lOp3SHvLTCMqkETbcE525aAIVWNqBXp7RBn7tKC4AD4y7AQihSYhBXO8VF1PeccjaCnN7R8=,iv:G0s8qchlgcm5HVshTKnGyt8nk+D4QYyP7n+5R0TOb8A=,tag:DspvfLf1pBs+/ol8GzT7Xw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0

flake.nix

@@ -3,36 +3,28 @@
 
   inputs =
   {
-    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable";
+    "nixpkgs-23.11".url = "github:CHN-beta/nixpkgs/nixos-23.11";
     "nixpkgs-23.05".url = "github:CHN-beta/nixpkgs/nixos-23.05";
     "nixpkgs-22.11".url = "github:NixOS/nixpkgs/nixos-22.11";
     "nixpkgs-22.05".url = "github:NixOS/nixpkgs/nixos-22.05";
-    home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; };
+    home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
     sops-nix =
     {
       url = "github:Mic92/sops-nix";
       inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; };
     };
     aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs-unstable"; };
-    nur.url = "github:nix-community/NUR";
-    nixos-cn = { url = "github:nixos-cn/flakes"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; };
     nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
     nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; };
     impermanence.url = "github:nix-community/impermanence";
-    qchem = { url = "github:Nix-QChem/NixOS-QChem/release-23.11"; 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"; };
+    qchem = { url = "github:Nix-QChem/NixOS-QChem/master"; inputs.nixpkgs.follows = "nixpkgs"; };
     plasma-manager =
     {
       url = "github:pjones/plasma-manager";
       inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
     };
-    nix-doom-emacs = { url = "github:nix-community/nix-doom-emacs"; inputs.nixpkgs.follows = "nixpkgs"; };
     nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
     nixos-hardware.url = "github:CHN-beta/nixos-hardware";
     envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -40,15 +32,16 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak";
     chaotic =
     {
-      url = "github:chaotic-cx/nyx?rev=03b2bea544688068025df1912ff1e9a1ad4a642a";
+      url = "github:chaotic-cx/nyx";
       inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
     };
     gricad = { url = "github:Gricad/nur-packages"; flake = false; };
+    catppuccin.url = "github:catppuccin/nix";
+    bscpkgs = { url = "git+https://pm.bsc.es/gitlab/rarias/bscpkgs.git"; 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; };
@@ -58,8 +51,6 @@
     nodesoup = { url = "github:olvb/nodesoup"; flake = false; };
     tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; flake = false; };
     v-sim = { url = "gitlab:l_sim/v_sim"; flake = false; };
-    win11os-kde = { url = "github:yeyushengfan258/Win11OS-kde"; flake = false; };
-    fluent-kde = { url = "github:vinceliuice/Fluent-kde"; flake = false; };
     rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; };
     blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; flake = false; };
     slate = { url = "github:TheBigWazz/Slate"; flake = false; };
@@ -68,33 +59,70 @@
     lmod = { url = "github:TACC/Lmod"; flake = false; };
     mumax = { url = "github:CHN-beta/mumax"; flake = false; };
     kylin-virtual-keyboard = { url = "git+https://gitee.com/openkylin/kylin-virtual-keyboard.git"; flake = false; };
+    cjktty = { url = "github:CHN-beta/cjktty-patches"; flake = false; };
+    zxorm = { url = "github:CHN-beta/zxorm"; flake = false; };
+    openxlsx = { url = "github:troldal/OpenXLSX?rev=f85f7f1bd632094b5d78d4d1f575955fc3801886"; flake = false; };
+    sqlite-orm = { url = "github:fnc12/sqlite_orm"; flake = false; };
+    sockpp = { url = "github:fpagliughi/sockpp"; flake = false; };
+    git-lfs-transfer = { url = "github:charmbracelet/git-lfs-transfer"; flake = false; };
+    nc4nix = { url = "github:helsinki-systems/nc4nix"; flake = false; };
+    hextra = { url = "github:imfing/hextra"; flake = false; };
+    nu-scripts = { url = "github:nushell/nu_scripts"; flake = false; };
+
+    # does not support lfs yet
+    # nixos-wallpaper = { url = "git+https://git.chn.moe/chn/nixos-wallpaper.git"; flake = false; };
   };
 
   outputs = inputs:
     let
-      localLib = import ./local/lib inputs.nixpkgs.lib;
-      devices = builtins.attrNames (builtins.readDir ./devices);
+      localLib = import ./lib.nix inputs.nixpkgs.lib;
+      devices = builtins.filter (dir: (builtins.readDir ./devices/${dir})."default.nix" or null == "regular" )
+        (builtins.attrNames (builtins.readDir ./devices));
     in
     {
-      packages.x86_64-linux =
+      packages.x86_64-linux = rec
       {
+        pkgs = (import inputs.nixpkgs
+        {
+          system = "x86_64-linux";
+          config.allowUnfree = true;
+          overlays = [ inputs.self.overlays.default ];
+        });
         default = inputs.nixpkgs.legacyPackages.x86_64-linux.writeText "systems"
           (builtins.concatStringsSep "\n" (builtins.map
             (system: builtins.toString inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel)
             devices));
+        hpcstat =
+          let
+            openssh = (pkgs.pkgsStatic.openssh.override { withLdns = false; etcDir = null; }).overrideAttrs
+              (prev: { doCheck = false; patches = prev.patches ++ [ ./packages/hpcstat/openssh.patch ];});
+            duc = pkgs.pkgsStatic.duc.override { enableCairo = false; cairo = null; pango = null; };
+          in pkgs.pkgsStatic.localPackages.hpcstat.override
+            { inherit openssh duc; standalone = true; version = inputs.self.rev or "dirty"; };
+        ufo =
+          let
+            range-v3 = pkgs.pkgsStatic.range-v3.overrideAttrs (prev:
+            {
+              cmakeFlags = prev.cmakeFlags or []
+                ++ [ "-DRANGE_V3_DOCS=OFF" "-DRANGE_V3_TESTS=OFF" "-DRANGE_V3_EXAMPLES=OFF" ];
+              doCheck = false;
+            });
+            tbb = pkgs.pkgsStatic.tbb_2021_11.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags or [] ++
+              [ "-DTBB_TEST=OFF" ]; });
+            biu = pkgs.pkgsStatic.localPackages.biu.override { inherit range-v3; };
+            matplotplusplus = pkgs.pkgsStatic.localPackages.matplotplusplus.override { libtiff = null; };
+          in pkgs.pkgsStatic.localPackages.ufo.override { inherit biu tbb matplotplusplus; };
+        chn-bsub = pkgs.pkgsStatic.localPackages.chn-bsub;
+        blog = pkgs.callPackage ./blog { inherit (inputs) hextra; };
       }
-      // (
-        builtins.listToAttrs (builtins.map
-          (system:
-          {
-            name = system;
-            value = inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel;
-          })
-          devices)
+      // (builtins.listToAttrs (builtins.map
+        (system:
+        {
+          name = system;
+          value = inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel;
+        })
+        devices)
       );
-      # 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
@@ -109,7 +137,7 @@
               [
                 (moduleInputs: { config.nixpkgs.overlays = [(prev: final:
                   # replace pkgs with final to avoid infinite recursion
-                  { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; })
+                  { localPackages = import ./packages (moduleInputs // { pkgs = final; }); })]; })
                 ./modules
                 ./devices/${system}
               ];
@@ -125,63 +153,56 @@
             [
               (moduleInputs: { config.nixpkgs.overlays = [(prev: final:
                 # replace pkgs with final to avoid infinite recursion
-                { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; })
+                { localPackages = import ./packages (moduleInputs // { pkgs = final; }); })]; })
               ./modules
               ./devices/pi3b
             ];
           };
         }
       );
-      # 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
-      # nix copy --to ssh://nixos@192.168.122.56 ./result
-      # sudo nixos-install --flake .#bootstrap
-      #    --option substituters http://192.168.122.1:5000 --option require-sigs false
-      # sudo chattr -i var/empty
-      # nix-shell -p ssh-to-age --run 'cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age'
-      # sudo nixos-rebuild switch --flake .#vps6 --log-format internal-json -v |& nom --json
-      # boot.shell_on_fail systemd.setenv=SYSTEMD_SULOGIN_FORCE=1
-      # sudo usbipd
-      # ssh -R 3240:127.0.0.1:3240 root@192.168.122.57
-      # modprobe vhci-hcd
-      # sudo usbip bind -b 3-6
-      # usbip attach -r 127.0.0.1 -b 3-6
-      # systemd-cryptenroll --fido2-device=auto /dev/vda2
-      # systemd-cryptsetup attach root /dev/vda2
-      deploy =
-      {
-        sshUser = "root";
-        user = "root";
-        fastConnection = true;
-        autoRollback = false;
-        magicRollback = false;
-        nodes = builtins.listToAttrs (builtins.map
-          (node:
-          {
-            name = node;
-            value =
-            {
-              hostname = node;
-              profiles.system.path = inputs.self.nixosConfigurations.${node}.pkgs.deploy-rs.lib.activate.nixos
-                inputs.self.nixosConfigurations.${node};
-            };
-          })
-          [ "vps6" "vps7" "nas" "surface" "xmupc1" "xmupc2" "pi3b" ]
-        );
-      };
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
       overlays.default = final: prev:
-        { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; topInputs = inputs; }); };
-      config.archive = false;
-      devShell.x86_64-linux = let inherit (inputs.self.nixosConfigurations.pc) pkgs; in pkgs.mkShell
+        { localPackages = (import ./packages { inherit (inputs) lib; pkgs = final; topInputs = inputs; }); };
+      config = { archive = false; branch = "production"; };
+      devShells.x86_64-linux = let inherit (inputs.self.packages.x86_64-linux) pkgs; in
       {
-        packages = with pkgs; [ pkg-config cmake ninja clang-tools_17 ];
-        buildInputs =
-          (with pkgs; [ fmt boost magic-enum libbacktrace eigen range-v3 ])
-          ++ (with pkgs.localPackages; [ concurrencpp tgbot-cpp nameof ]);
-        # hardeningDisable = [ "all" ];
-        # NIX_DEBUG = "1";
+        biu = pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }
+        {
+          inputsFrom = [ pkgs.localPackages.biu ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        hpcstat = pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }
+        {
+          inputsFrom = [ (inputs.self.packages.x86_64-linux.hpcstat.override { version = null; }) ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        sbatch-tui = pkgs.mkShell
+        {
+          inputsFrom = [ pkgs.localPackages.sbatch-tui ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        ufo = pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }
+        {
+          inputsFrom = [ (inputs.self.packages.x86_64-linux.ufo.override { version = null; }) ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        chn-bsub = pkgs.mkShell
+        {
+          inputsFrom = [ pkgs.localPackages.chn-bsub ];
+          packages = [ pkgs.clang-tools_18 ];
+          CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+        };
+        winjob =
+          let inherit (pkgs) clang-tools_18; in let inherit (inputs.self.packages.x86_64-w64-mingw32) pkgs winjob;
+          in pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; }
+          {
+            inputsFrom = [ winjob ];
+            packages = [ clang-tools_18 ];
+            CMAKE_EXPORT_COMPILE_COMMANDS = "1";
+          };
       };
     };
 }

lib.nix

@@ -54,4 +54,36 @@ lib: rec
             else null
           else null)
       (attrsToList (builtins.readDir path))));
+
+  # replace the value in a nested attrset. example:
+  # deepReplace
+  #   [ { path = [ "a" "b" 1 ]; value = "new value"; } ]
+  #   { a = { b = [ "old value" "old value" ]; }; }
+  # => { a = { b = [ "old value" "new value" ]; }; }
+  deepReplace = pattern: origin:
+    let replace = { path, value, content }:
+      if path == [] then
+        if (builtins.typeOf value) == "lambda" then value content
+        else value
+      else let currentPath = builtins.head path; nextPath = builtins.tail path; in
+        if (builtins.typeOf currentPath) == "string" then
+          if (builtins.typeOf content) != "set" then builtins.throw "content should be a set"
+          else builtins.mapAttrs
+            (n: v: if n == currentPath then replace { path = nextPath; inherit value; content = v; } else v) content
+        else if (builtins.typeOf currentPath) == "int" then
+          if (builtins.typeOf content) != "list" then builtins.throw "content should be a list"
+          else lib.imap0
+            (i: v: if i == currentPath then replace { path = nextPath; inherit value; content = v; } else v) content
+        else if (builtins.typeOf currentPath) != "lambda" then throw "path should be a lambda"
+        else
+          if (builtins.typeOf content) == "list" then builtins.map
+            (v: if currentPath v then replace { path = nextPath; inherit value; content = v; } else v) content
+          else if (builtins.typeOf content) == "set" then builtins.listToAttrs (builtins.map
+            (v: if currentPath v then replace { path = nextPath; inherit value; content = v; } else v)
+            (attrsToList content))
+          else throw "content should be a list or a set.";
+    in
+      if (builtins.typeOf pattern) != "list" then throw "pattern should be a list"
+      else if pattern == [] then origin
+      else deepReplace (builtins.tail pattern) (replace ((builtins.head pattern) // { content = origin; }));
 }

local/pkgs/aocc/default.nix

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

local/pkgs/aocl/default.nix

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

local/pkgs/biu/CMakeLists.txt

@@ -1,45 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-project(biu LANGUAGES CXX)
-enable_testing()
-include(GNUInstallDirs)
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message("Setting build type to 'Release' as none was specified.")
-  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif()
-
-find_package(magic_enum REQUIRED)
-find_package(fmt REQUIRED)
-find_package(Boost REQUIRED COMPONENTS headers iostreams)
-# find_package(concurrencpp REQUIRED)
-find_package(Eigen3 REQUIRED)
-find_package(range-v3 REQUIRED)
-find_path(NAMEOF_INCLUDE_DIR nameof.hpp REQUIRED)
-# find_path(TGBOTCPP_INCLUDE_DIR tgbot/tgbot.h REQUIRED)
-# find_library(TGBOTCPP_LIB libTgBot.a REQUIRED)
-# find_path(BACKTRACE_INCLUDE_DIR backtrace.h REQUIRED)
-# find_library(BACKTRACE_LIB backtrace REQUIRED)
-
-# add_library(biu SHARED src/common.cpp src/logger.cpp src/string.cpp)
-add_library(biu SHARED src/common.cpp)
-target_include_directories(biu PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  ${NAMEOF_INCLUDE_DIR} ${TGBOTCPP_INCLUDE_DIR})
-target_link_libraries(biu PUBLIC
-  magic_enum::magic_enum
-  fmt::fmt
-  Boost::headers Boost::iostreams
-#   concurrencpp::concurrencpp
-  Eigen3::Eigen
-  range-v3::range-v3)
-# ${TGBOTCPP_LIB} ${BACKTRACE_LIB})
-set_property(TARGET biu PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
-install(TARGETS biu EXPORT biuConfig)
-install(EXPORT biuConfig NAMESPACE ${PROJECT_NAME}:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/biu)
-install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-get_property(ImportedTargets DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS)
-message("Imported targets: ${ImportedTargets}")
-message("List of compile features: ${CMAKE_CXX_COMPILE_FEATURES}")

local/pkgs/biu/default.nix

@@ -1,10 +0,0 @@
-{
-  stdenv, cmake,
-  magic-enum, fmt, boost, eigen, range-v3, nameof
-}: stdenv.mkDerivation
-{
-  name = "biu";
-  src = ./.;
-  buildInputs = [ magic-enum fmt boost eigen range-v3 nameof ];
-  nativeBuildInputs = [ cmake ];
-}

local/pkgs/biu/include/biu.hpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

local/pkgs/biu/src/common.cpp

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

local/pkgs/biu/src/logger.cpp

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

local/pkgs/biu/src/string.cpp

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

local/pkgs/citation-style-language/default.nix

@@ -1,22 +0,0 @@
-{ stdenvNoCC, texlive, src }: stdenvNoCC.mkDerivation (finalAttrs:
-{
-  name = "citation-style-language";
-  inherit src;
-  passthru =
-  {
-    pkgs = [ finalAttrs.finalPackage ];
-    tlDeps = with texlive; [ latex ];
-    tlType = "run";
-  };
-
-  nativeBuildInputs = [ texlive.combined.scheme-full ];
-  dontConfigure = true;
-  dontBuild = true;
-  installPhase =
-  ''
-    runHook preInstall
-    export TEXMFHOME=$out
-    l3build install
-    runHook postInstall
-  '';
-})

local/pkgs/date/default.nix

@@ -1,13 +0,0 @@
-{ stdenv, src }: stdenv.mkDerivation
-{
-  name = "date";
-  inherit src;
-  phases = [ "installPhase" ];
-  installPhase =
-  ''
-    runHook preInstall
-    mkdir -p $out
-    cp -r $src/{include,src} $out
-    runHook postInstall
-  '';
-}

local/pkgs/default.nix

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

local/pkgs/fluent-kde/default.nix

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

local/pkgs/hpcstat/doc/setup.md

@@ -0,0 +1 @@
+Moved to [../../../../packages/hpcstat/doc/setup.md](../../../../packages/hpcstat/doc/setup.md)

local/pkgs/matplotplusplus/default.nix

@@ -1,18 +0,0 @@
-{
-  stdenv, src, 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;
-  cmakeFlags =
-  [
-    "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF"
-    "-DMATPLOTPP_WITH_SYSTEM_NODESOUP=ON" "-DMATPLOTPP_WITH_SYSTEM_CIMG=ON"
-    "-DMATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND=ON" "-DGLAD_REPRODUCIBLE=ON"
-  ];
-  buildInputs = [ gnuplot libjpeg libtiff zlib libpng lapack blas fftw opencv nodesoup cimg glfw libGL glad ];
-  nativeBuildInputs = [ cmake pkg-config python3 ];
-  propagatedBuildInputs = [ libGL glad glfw ];
-  propagatedNativeBuildInputs = [ python3 ];
-}

local/pkgs/misskey/default.nix

@@ -1,69 +0,0 @@
-{
-  lib, stdenv, mkPnpmPackage, fetchurl, nodejs, writeShellScript, buildFHSEnv,
-  bash, cypress, vips, pkg-config, src, libtensorflow
-}:
-let
-  name = "misskey";
-  originalPnpmPackage = mkPnpmPackage
-  {
-    inherit name src nodejs;
-    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 CYPRESS_RUN_BINARY="${cypress}/bin/Cypress"
-    export NODE_ENV=production
-    pnpm run migrateandstart
-  '';
-in
-  stdenv.mkDerivation rec
-  {
-    inherit src name;
-    buildInputs =
-    [
-      bash nodejs nodejs.pkgs.typescript nodejs.pkgs.pnpm nodejs.pkgs.gulp cypress vips pkg-config
-    ];
-    nativeBuildInputs = buildInputs;
-    CYPRESS_RUN_BINARY = "${cypress}/bin/Cypress";
-    NODE_ENV = "production";
-    configurePhase =
-    ''
-      export HOME=$NIX_BUILD_TOP # Some packages need a writable HOME
-      export npm_config_nodedir=${nodejs}
-      pnpm config set reporter append-only
-
-      runHook preConfigure
-
-      store=$(pnpm store path)
-      mkdir -p $(dirname $store)
-
-      cp -f ${originalPnpmPackage.passthru.patchedLockfileYaml} pnpm-lock.yaml
-      cp -RL ${originalPnpmPackage.passthru.pnpmStore} $store
-      chmod -R +w $store
-      pnpm install --frozen-lockfile --offline
-
-      runHook postConfigure
-    '';
-    buildPhase =
-    ''
-      runHook preBuild
-      pnpm run build
-      runHook postBuild
-    '';
-    installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out
-      mv * .* $out
-      mkdir -p $out/bin
-      cp ${startScript} $out/bin/misskey
-      mkdir -p $out/files
-      runHook postInstall
-    '';
-    passthru =
-    {
-      inherit originalPnpmPackage startScript;
-    };
-  }

local/pkgs/rsshub/default.nix

@@ -1,50 +0,0 @@
-{
-  lib, stdenv, mkPnpmPackage, nodejs, writeShellScript,
-  chromium, bash, src
-}:
-let
-  name = "rsshub";
-  originalPnpmPackage = mkPnpmPackage { inherit name src nodejs; };
-  nodeModules = originalPnpmPackage.nodeModules.overrideAttrs { PUPPETEER_SKIP_DOWNLOAD = true; };
-  rsshub-unwrapped = stdenv.mkDerivation
-  {
-    inherit src;
-    name = "${name}-unwrapped";
-    configurePhase = 
-    ''
-      export HOME=$NIX_BUILD_TOP # Some packages need a writable HOME
-      export npm_config_nodedir=${nodejs}
-
-      runHook preConfigure
-
-      ln -s ${nodeModules}/. node_modules
-
-      runHook postConfigure
-    '';
-    installPhase =
-    ''
-      runHook preInstall
-      mkdir -p $out
-      mv * .* $out
-      runHook postInstall
-    '';
-  };
-  startScript = writeShellScript "rsshub"
-  ''
-    cd ${rsshub-unwrapped}
-    export PATH=${lib.makeBinPath [ bash nodejs nodejs.pkgs.pnpm chromium ]}:$PATH
-    export CHROMIUM_EXECUTABLE_PATH=chromium
-    pnpm start
-  '';
-in stdenv.mkDerivation
-{
-  inherit name;
-  phases = [ "installPhase" ];
-  installPhase =
-  ''
-    runHook preInstall
-    mkdir -p $out/bin
-    cp ${startScript} $out/bin/rsshub
-    runHook postInstall
-  '';
-}

local/pkgs/vasp/amd/default.nix

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

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

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

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

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

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

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

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

@@ -1,87 +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
-
-# Intel MKL for FFTW, BLAS, LAPACK, and scaLAPACK
-MKLROOT   ?= /path/to/your/mkl/installation
-LLIBS_MKL  = -L$(MKLROOT)/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_scalapack_lp64 -lmkl_blacs_openmpi_lp64 -lgomp -lpthread -lm -ldl
-INCS       = -I$(MKLROOT)/include/fftw
-
-# Use a separate scaLAPACK installation (optional but recommended in combination with OpenMPI)
-# Comment out the two lines below if you want to use scaLAPACK from MKL instead
-#SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
-#LLIBS_MKL  = -L$(SCALAPACK_ROOT)/lib -lscalapack -L$(MKLROOT)/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
-
-LLIBS      += $(LLIBS_MKL)
-
-# HDF5-support (optional but strongly recommended)
-CPP_OPTIONS+= -DVASP_HDF5
-HDF5_ROOT  ?= /path/to/your/hdf5/installation
-LLIBS      += -L$(HDF5_ROOT)/lib -lhdf5_fortran
-INCS       += -I$(HDF5_ROOT)/include
-
-# For the VASP-2-Wannier90 interface (optional)
-CPP_OPTIONS    += -DVASP2WANNIER90
-WANNIER90_ROOT ?= /path/to/your/wannier90/installation
-LLIBS          += -L$(WANNIER90_ROOT)/lib -lwannier
-
-# For the fftlib library (hardly any benefit in combination with MKL's FFTs)
-#CPP_OPTIONS+= -Dsysv
-#FCL        += fftlib.o
-#CXX_FFTLIB  = g++ -fopenmp -std=c++11 -DFFTLIB_USE_MKL -DFFTLIB_THREADSAFE
-#INCS_FFTLIB = -I./include -I$(MKLROOT)/include/fftw
-#LIBS       += fftlib
-#LLIBS      += -ldl

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

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

local/pkgs/vasp/gnu/default.nix

@@ -1,56 +0,0 @@
-{
-  stdenvNoCC, requireFile, writeShellApplication,
-  rsync, blas, scalapack, mpi, openmp, gfortran, gcc, fftwMpi, hdf5, wannier90,
-  additionalCommands ? ""
-}:
-let
-  sources = import ../source.nix { inherit requireFile; };
-  include = version: ./makefile.include-${version};
-  vasp = version: stdenvNoCC.mkDerivation rec
-  {
-    pname = "vasp-gnu";
-    inherit version;
-    src = sources.${version};
-    configurePhase =
-    ''
-      cp ${include version} makefile.include
-      cp ${../constr_cell_relax.F} src/constr_cell_relax.F
-      mkdir -p bin
-    '';
-    enableParallelBuilding = true;
-    makeFlags = "DEPS=1";
-    buildInputs = [ 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-${builtins.replaceStrings ["."] [""] version}-env";
-    runtimeInputs = [(vasp version)];
-    text =
-    ''
-      # if OMP_NUM_THREADS is not set, set it according to SLURM_CPUS_PER_TASK or to 1
-      if [ -z "''${OMP_NUM_THREADS-}" ]; then
-        if [ -n "''${SLURM_CPUS_PER_TASK-}" ]; then
-          OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
-        else
-          OMP_NUM_THREADS=1
-        fi
-      fi
-      export OMP_NUM_THREADS
-
-      ${additionalCommands}
-
-      exec "$@"
-    '';
-  };
-in builtins.mapAttrs (version: _: startScript version) sources

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

@@ -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       = -O3
-OFLAG_IN    = $(OFLAG)
-DEBUG       = -O0
-
-OBJECTS     = fftmpiw.o fftmpi_map.o fftw3d.o fft3dlib.o
-OBJECTS_O1 += fftw3d.o fftmpi.o fftmpiw.o
-OBJECTS_O2 += fft3dlib.o
-
-# For what used to be vasp.5.lib
-CPP_LIB     = $(CPP)
-FC_LIB      = $(FC)
-CC_LIB      = gcc
-CFLAGS_LIB  = -O
-FFLAGS_LIB  = -O1
-FREE_LIB    = $(FREE)
-
-OBJECTS_LIB = linpack_double.o getshmem.o
-
-# For the parser library
-CXX_PARS    = g++
-LLIBS       = -lstdc++
-
-##
-## Customize as of this point! Of course you may change the preceding
-## part of this file as well if you like, but it should rarely be
-## necessary ...
-##
-
-# When compiling on the target machine itself, change this to the
-# relevant target when cross-compiling for another architecture
-# VASP_TARGET_CPU ?= -march=native
-# FFLAGS     += $(VASP_TARGET_CPU)
-
-# For gcc-10 and higher (comment out for older versions)
-FFLAGS     += -fallow-argument-mismatch
-
-# 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

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

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

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

@@ -1,83 +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          = mpiifx -qopenmp
-FCL         = mpiifx
-
-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      = icx
-CFLAGS_LIB  = -O
-FFLAGS_LIB  = -O1
-FREE_LIB    = $(FREE)
-
-OBJECTS_LIB = linpack_double.o getshmem.o
-
-# For the parser library
-CXX_PARS    = icpx
-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
-LLIBS      += -L$(MKLROOT)/lib/intel64 -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
-INCS        =-I$(MKLROOT)/include/fftw
-
-# Use a separate scaLAPACK installation (optional but recommended in combination with OpenMPI)
-# Comment out the two lines below if you want to use scaLAPACK from MKL instead
-# SCALAPACK_ROOT ?= /path/to/your/scalapack/installation
-# LLIBS      += -L${SCALAPACK_ROOT}/lib -lscalapack
-
-# 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

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

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

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

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

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
-  '';
-}

modules/bugs/default.nix

@@ -11,47 +11,6 @@ inputs:
         SuspendState=freeze
         HibernateMode=shutdown
       '';
-      # reload iwlwifi after resume from hibernate
-      hibernate-iwlwifi =
-      {
-        systemd.services.reload-iwlwifi-after-hibernate =
-        {
-          description = "reload iwlwifi after resume from hibernate";
-          after = [ "systemd-hibernate.service" ];
-          serviceConfig.Type = "oneshot";
-          script = let modprobe = "${inputs.pkgs.kmod}/bin/modprobe"; in
-          ''
-            ${modprobe} -r iwlwifi
-            ${modprobe} iwlwifi
-            echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo
-          '';
-          wantedBy = [ "systemd-hibernate.service" ];
-        };
-        nixos.system.kernel.modules.modprobeConfig =
-          [ "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ];
-      };
-      # disable wakeup on lid open
-      suspend-lid-no-wakeup.systemd.services.lid-no-wakeup =
-      {
-        description = "lid no wake up";
-        serviceConfig.Type = "oneshot";
-        script =
-          let
-            cat = "${inputs.pkgs.coreutils}/bin/cat";
-            grep = "${inputs.pkgs.gnugrep}/bin/grep";
-          in
-          ''
-            if ${cat} /proc/acpi/wakeup | ${grep} LID0 | ${grep} -q enabled
-            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" ];
-      };
       # xmunet use old encryption
       xmunet.nixpkgs.config.packageOverrides = pkgs: { wpa_supplicant = pkgs.wpa_supplicant.overrideAttrs
         (attrs: { patches = attrs.patches ++ [ ./xmunet.patch ];}); };
@@ -77,10 +36,10 @@ inputs:
             script = "${systemctl} start waydroid-container";
           };
         };
-      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" ];
+      hibernate-mt7921e.powerManagement.resumeCommands =
+        let modprobe = "${inputs.pkgs.kmod}/bin/modprobe"; in "${modprobe} -r -w 3000 mt7921e && ${modprobe} mt7921e";
     };
   in
     {

modules/default.nix

@@ -10,11 +10,12 @@ inputs:
       topInputs.sops-nix.nixosModules.sops
       topInputs.aagl.nixosModules.default
       topInputs.nix-index-database.nixosModules.nix-index
-      topInputs.nur.nixosModules.nur
       topInputs.nur-xddxdd.nixosModules.setupOverlay
       topInputs.impermanence.nixosModules.impermanence
       topInputs.nix-flatpak.nixosModules.nix-flatpak
       topInputs.chaotic.nixosModules.default
+      { config.chaotic.nyx.overlay.onTopOf = "user-pkgs"; }
+      topInputs.catppuccin.nixosModules.catppuccin
       (inputs:
       {
         config =
@@ -22,17 +23,13 @@ inputs:
           nixpkgs.overlays =
           [
             topInputs.qchem.overlays.default
-            topInputs.nixd.overlays.default
-            topInputs.napalm.overlays.default
-            topInputs.pnpm2nix-nzbr.overlays.default
             topInputs.aagl.overlays.default
+            topInputs.bscpkgs.overlays.default
             (final: prev:
             {
               nix-vscode-extensions = topInputs.nix-vscode-extensions.extensions."${prev.system}";
               nur-xddxdd = topInputs.nur-xddxdd.overlays.default final prev;
               nur-linyinfeng = (topInputs.nur-linyinfeng.overlays.default final prev).linyinfeng;
-              deploy-rs =
-                { inherit (prev) deploy-rs; inherit ((topInputs.deploy-rs.overlay final prev).deploy-rs) lib; };
               firefox-addons = (import "${topInputs.rycee}" { inherit (prev) pkgs; }).firefox-addons;
               inherit (import topInputs.gricad { pkgs = final; }) intel-oneapi intel-oneapi-2022;
             })
@@ -40,7 +37,7 @@ inputs:
           home-manager.sharedModules =
           [
             topInputs.plasma-manager.homeManagerModules.plasma-manager
-            topInputs.nix-doom-emacs.hmModule
+            topInputs.catppuccin.homeManagerModules.catppuccin
           ];
         };
       })

modules/hardware/cpus.nix

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

modules/hardware/default.nix

@@ -1,14 +1,17 @@
 inputs:
 {
   imports = inputs.localLib.findModules ./.;
-  options.nixos.hardware = let inherit (inputs.lib) mkOption types; in
-  {
-    bluetooth = mkOption { type = types.nullOr (types.submodule {}); default = {}; };
-    joystick = mkOption { type = types.nullOr (types.submodule {}); default = {}; };
-    printer = mkOption { type = types.nullOr (types.submodule {}); default = {}; };
-    sound = mkOption { type = types.nullOr (types.submodule {}); default = {}; };
-    cpus = mkOption { type = types.listOf (types.enum [ "intel" "amd" ]); default = []; };
-  };
+  options.nixos.hardware =
+    let
+      inherit (inputs.lib) mkOption types;
+      default = if inputs.config.nixos.system.gui.enable then {} else null;
+    in
+    {
+      bluetooth = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
+      joystick = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
+      printer = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
+      sound = mkOption { type = types.nullOr (types.submodule {}); inherit default; };
+    };
   config = let inherit (inputs.config.nixos) hardware; in inputs.lib.mkMerge
   [
     # bluetooth
@@ -26,7 +29,7 @@ inputs:
             enable = true;
             drivers = inputs.lib.mkIf (inputs.config.nixos.system.nixpkgs.arch == "x86_64") [ inputs.pkgs.cnijfilter2 ];
           };
-          avahi = { enable = true; nssmdns = true; openFirewall = true; };
+          avahi = { enable = true; nssmdns4 = true; openFirewall = true; };
         };
       }
     )
@@ -36,39 +39,7 @@ inputs:
       {
         hardware.pulseaudio.enable = false;
         services.pipewire = { enable = true; alsa = { enable = true; support32Bit = true; }; pulse.enable = true; };
-        sound.enable = true;
         security.rtkit.enable = true;
-        environment.etc."wireplumber/main.lua.d/50-alsa-config.lua".text =
-          let
-            content = builtins.readFile
-              (inputs.pkgs.wireplumber + "/share/wireplumber/main.lua.d/50-alsa-config.lua");
-            matched = builtins.match
-              ".*\n([[:space:]]*)(--\\[\"session\\.suspend-timeout-seconds\"][^\n]*)[\n].*" content;
-            spaces = builtins.elemAt matched 0;
-            comment = builtins.elemAt matched 1;
-            config = ''["session.suspend-timeout-seconds"] = 0'';
-          in
-            builtins.replaceStrings [(spaces + comment)] [(spaces + config)] content;
-      }
-    )
-    # cpus
-    (
-      inputs.lib.mkIf (hardware.cpus != [])
-      {
-        hardware.cpu = builtins.listToAttrs
-          (map (name: { inherit name; value = { updateMicrocode = true; }; }) hardware.cpus);
-        boot.initrd.availableKernelModules =
-          let
-            modules =
-            {
-              intel =
-              [
-                "intel_cstate" "aesni_intel" "intel_cstate" "intel_uncore" "intel_uncore_frequency" "intel_powerclamp"
-              ];
-              amd = [];
-            };
-          in
-            builtins.concatLists (map (cpu: modules.${cpu}) hardware.cpus);
       }
     )
   ];

modules/hardware/gpu.nix

@@ -13,11 +13,15 @@ inputs:
       ]);
       default = null;
     };
-    dynamicBoost = mkOption { type = types.bool; default = false; };
-    prime =
+    nvidia =
     {
-      mode = mkOption { type = types.enum [ "offload" "sync" ]; default = "offload"; };
-      busId = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
+      dynamicBoost = mkOption { type = types.bool; default = false; };
+      prime =
+      {
+        mode = mkOption { type = types.enum [ "offload" "sync" ]; default = "offload"; };
+        busId = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
+      };
+      driver = mkOption { type = types.enum [ "production" "latest" "beta" ]; default = "production"; };
     };
   };
   config = let inherit (inputs.config.nixos.hardware) gpu; in inputs.lib.mkIf (gpu.type != null) (inputs.lib.mkMerge
@@ -30,50 +34,51 @@ inputs:
           let modules =
           {
             intel = [ "i915" ];
-            nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" ]; # nvidia-uvm should not be loaded
-            amd = [ "amdgpu" ];
+            nvidia = []; # early loading breaks resume from hibernation
+            amd = [];
           };
           in builtins.concatLists (builtins.map (gpu: modules.${gpu}) gpus);
         hardware =
         {
-          opengl =
+          graphics =
           {
             enable = true;
-            driSupport = true;
-            driSupport32Bit = true;
             extraPackages =
               let packages = with inputs.pkgs;
               {
                 intel = [ intel-vaapi-driver libvdpau-va-gl intel-media-driver ];
                 nvidia = [ vaapiVdpau ];
-                amd = [ amdvlk rocmPackages.clr rocmPackages.clr.icd ];
+                amd = [];
               };
               in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
-            extraPackages32 =
-              let packages = { intel = []; nvidia = []; amd = [ inputs.pkgs.driversi686Linux.amdvlk ]; };
-              in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
           };
           nvidia = inputs.lib.mkIf (builtins.elem "nvidia" gpus)
           {
             modesetting.enable = true;
             powerManagement.enable = true;
-            dynamicBoost.enable = inputs.lib.mkIf gpu.dynamicBoost true;
+            dynamicBoost.enable = inputs.lib.mkIf gpu.nvidia.dynamicBoost true;
             nvidiaSettings = true;
-            forceFullCompositionPipeline = true;
-            # package = inputs.config.boot.kernelPackages.nvidiaPackages.production;
+            package = inputs.config.boot.kernelPackages.nvidiaPackages.${gpu.nvidia.driver};
+            open = true; # TODO: remove when 560 is stable
             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";
+        boot.blacklistedKernelModules = [ "nouveau" ];
+        environment.variables =
+          if builtins.elem "nvidia" gpus then { VDPAU_DRIVER = "nvidia"; }
+          else if builtins.elem "intel" gpus then { VDPAU_DRIVER = "va_gl"; }
+          else {};
         services.xserver.videoDrivers =
           let driver = { intel = "modesetting"; amd = "amdgpu"; nvidia = "nvidia"; };
           in builtins.map (gpu: driver.${gpu}) gpus;
+        nixos.packages.packages._packages =
+          let packages = with inputs.pkgs;
+          {
+            intel = [ intel-gpu-tools ];
+            nvidia = [ nvtopPackages.full ];
+            amd = [];
+          };
+          in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
       }
     )
     # nvidia prime offload
@@ -82,13 +87,23 @@ inputs:
       {
         prime =
         {
-          offload = inputs.lib.mkIf (gpu.prime.mode == "offload") { enable = true; enableOffloadCmd = true; };
-          sync = inputs.lib.mkIf (gpu.prime.mode == "sync") { enable = true; };
+          offload = inputs.lib.mkIf (gpu.nvidia.prime.mode == "offload") { enable = true; enableOffloadCmd = true; };
+          sync = inputs.lib.mkIf (gpu.nvidia.prime.mode == "sync") { enable = 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 = inputs.lib.mkIf (gpu.prime.mode == "offload") true;
+          (inputs.localLib.attrsToList gpu.nvidia.prime.busId));
+        powerManagement.finegrained = inputs.lib.mkIf (gpu.nvidia.prime.mode == "offload") true;
+      };}
+    )
+    # amdgpu
+    (
+      inputs.lib.mkIf (inputs.lib.strings.hasPrefix "amd" gpu.type) { hardware.amdgpu =
+      {
+        opencl.enable = true;
+        legacySupport.enable = true;
+        initrd.enable = true;
+        amdvlk = { enable = true; support32Bit.enable = true; supportExperimental.enable = true; };
       };}
     )
   ]);

modules/packages/chromium.nix

@@ -0,0 +1,12 @@
+inputs:
+{
+  options.nixos.packages.chromium = let inherit (inputs.lib) mkOption types; in mkOption
+  {
+    type = types.nullOr (types.submodule {});
+    default = if inputs.config.nixos.system.gui.enable then {} else null;
+  };
+  config = let inherit (inputs.config.nixos.packages) chromium; in inputs.lib.mkIf (chromium != null)
+  {
+    programs.chromium = { enable = true; extraOpts.PasswordManagerEnabled = false; };
+  };
+}