system.initrd: remove ip=dhcp kernel parameter

This reverts commit fdbf027236.

devices/jykang.xmuhpc/.ssh/authorized_keys

@@ -4,6 +4,8 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJ/jzUQ6QuAjnAryvpWk7TReS6pnHxhEXY9RonojKk
 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

devices/pc/default.nix

@@ -183,11 +183,6 @@ inputs:
         };
         system.nixos.tags = [ "nvidia" ];
       };
-      zen.configuration =
-      {
-        nixos.system.kernel = { variant = inputs.lib.mkForce "zen"; patches = inputs.lib.mkForce []; };
-        system.nixos.tags = [ "zen" ];
-      };
     };
   };
 }

devices/vps6/default.nix

@@ -79,7 +79,6 @@ inputs:
         };
         beesd.instances.root = { device = "/"; hashTableSizeMB = 64; };
       };
-      user.users = [ "chn" "zqq" ];
     };
     specialisation.generic.configuration =
     {

devices/xmupc1/README.md

@@ -188,9 +188,7 @@ RDP 暂时没有硬件加速（主要是毛玻璃之类的特效会有点卡）
 
 samba 就是 windows 共享文件夹的那个协议。
 
-* 地址：xmupc1.chn.moe
-* 用户名：自己名字的拼音首字母
-* 初始密码和 ssh 一样，你可以自己修改密码（使用 `smbpasswd` 命令）。samba 的密码和 ssh/rdp 的密码是分开的，它们使用不同的验证机制。
+* 地址：因为懒得管理暂时禁用。
 
 在 windows 上，可以直接在资源管理器中输入 `\\xmupc1.chn.moe` 访问。
 也可以将它作为一个网络驱动器添加（地址同样是 `\\xmupc1.chn.moe`）。

devices/xmupc1/default.nix

@@ -90,7 +90,7 @@ inputs:
         hpcstat = {};
       };
       bugs = [ "xmunet" "amdpstate" ];
-      user.users = [ "chn" "xll" "zem" "yjq" "gb" "zqq" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" ];
     };
     services.hardware.bolt.enable = true;
   };

devices/xmupc1/secrets/default.yaml

@@ -15,8 +15,10 @@ 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:oniighfvCNGWUwdhqg==,iv:RVUuZBqCd111QJ7MpgYBuP4fDCzm4NZAtbua9kXkrJM=,tag:21zF8E/3lBTDr54I9NKPVg==,type:comment]
-    zqq: ENC[AES256_GCM,data:Vjbbs8xIlH3+of7+kLGFVp4bIizU8D5R1qRbCqP5FhzTadXA8KD9/uiYxtrV3oxYGwZ/RlLvriHMClob4ihyDF4U2t8Dc4eVqA==,iv:FjCftpfKPZYThiNOyNkhx9uNyWIsjC5sK5WWcaEBtiY=,tag:MTL490c2SeFGx3EhxEdvkA==,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:
@@ -48,8 +50,8 @@ sops:
             ZDNHUjE2QVlCV3p0NHdKYW5IMHVBZzQKkZtfyvfroOntg3yRjMw4jQHiQj8eaB2h
             IeIHfW4y01mmVT2ofbtB0xYpjcl4gtUlQ8X3tn5iJ9P8gcVo0G598A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-21T09:56:03Z"
-    mac: ENC[AES256_GCM,data:9+AR9Y6ik+BH1Spk62LSTU1NFQ8ID0YROF+yf8ss2RqhfP6/5+lsrNjGC7gnEEMYF8UWVtChUuljIK3Q4MtT64JhDWgp8tenbpkJnRFGylzEe37MYajdDY7nrPP7iPUPNvS1ndo6vp/yuEigBXVhCtpjMObj7zIdGnLbtz0sczA=,iv:gNb8gVp9adnlZsMM2afOlFe46Vy15ELmC9vGaaeaInY=,tag:rltLL3WSZytjEemgjCy6Ng==,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.9.0

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

@@ -66,14 +66,14 @@ inputs:
           enable = true;
           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" "zqq" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" ];
     };
   };
 }

devices/xmupc2/secrets/default.yaml

@@ -15,8 +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:UoNCXbGIHDNsmyCJxw==,iv:uTNvqg4xm7E+yn8vFaaihbEGEhLTZ2FNFNCYzdgiDlU=,tag:4bRSZbx6FFzA6MiBYVu0qw==,type:comment]
-    zqq: ENC[AES256_GCM,data:sfgufV++PfTrdeUBXZhmF1JoSpD8Nj+m0QKFrUMJG/pHb0AUagJEWEJwPsI+m91tZE0qxM271ks+WKqLElmyD4Ftw7ywWzTE0Q==,iv:R05QFUF+fvIHidWpHIR/D/e+UeciS5ehnx1kx+saCgM=,tag:3Awnd+pUQRxjjQ58SUX7Mg==,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:
@@ -43,8 +45,8 @@ sops:
             M0xoL1dQR0kvMWpzN0RMNWVCTFQxNFUKj9LPjBo5NGOrGYNvu8qZ13PLYjLEWllU
             LARzEn4XgkeHckouwvxZYMCx7WxmAruRWaOvnxTIczzSNP7wIrqnkA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-21T09:56:44Z"
-    mac: ENC[AES256_GCM,data:COodLhpL5EA5g15lgimsuxs1vmqJrLDVgtjw+0FLKTq6E1pcQ+zJl+dD0b9u5fYy9BBf56TI8TLJahVPR0eGxbDFlHmx8M9GStlTqaOE3jRsDT8GsihdlvLokyVt8jEfAnaWESTIgfehVL2TrLlsMnIsoVHrzdlEhX5ATXA3QOg=,iv:U/EwFmYWOcxi7ItkR/+MT8gTu7UobH5pxS00qrH/yyU=,tag:RVMcx4X0IS9yvpHrF0owpg==,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.9.0

flake.lock

@@ -915,11 +915,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724690375,
-        "narHash": "sha256-ow1HWzTNnbHBUmnIK4kKAt0SR38iyjDObUGwej1soC8=",
+        "lastModified": 1724925520,
+        "narHash": "sha256-MfvD4Ed4wCTG1V+h3rUN9j9csEi+2tgpRwhGAV4MFqw=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "7496c107d60dfbbc0c258550bbcc1d0df570aee4",
+        "rev": "8c66b7335f2f4ab354e41d828b74d851c64c4b85",
         "type": "github"
       },
       "original": {
@@ -1065,6 +1065,22 @@
         "type": "github"
       }
     },
+    "nu-scripts": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725014865,
+        "narHash": "sha256-EmlwDTEby2PAOQBUAhjiBJ8ymVW3H23V78dFaF8DQKw=",
+        "owner": "nushell",
+        "repo": "nu_scripts",
+        "rev": "614b0733104a7753ed7d775224fe5918877b71de",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nushell",
+        "repo": "nu_scripts",
+        "type": "github"
+      }
+    },
     "nur-linyinfeng": {
       "inputs": {
         "devshell": "devshell",
@@ -1293,6 +1309,7 @@
         "nixpkgs-23.05": "nixpkgs-23.05",
         "nixpkgs-23.11": "nixpkgs-23.11",
         "nodesoup": "nodesoup",
+        "nu-scripts": "nu-scripts",
         "nur-linyinfeng": "nur-linyinfeng",
         "nur-xddxdd": "nur-xddxdd",
         "openxlsx": "openxlsx",

flake.nix

@@ -67,6 +67,7 @@
     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; };

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

modules/packages/desktop/default.nix

@@ -38,6 +38,7 @@ inputs:
           # themes
           catppuccin catppuccin-sddm catppuccin-cursors catppuccinifier-gui catppuccinifier-cli catppuccin-plymouth
           (catppuccin-kde.override { flavour = [ "latte" ]; }) (catppuccin-kvantum.override { variant = "latte"; })
+          klassy
           localPackages.slate localPackages.blurred-wallpaper tela-circle-icon-theme
           # terminal
           warp-terminal
@@ -61,7 +62,7 @@ inputs:
           nix-template nil pnpm-lock-export bundix
           # instant messager
           element-desktop telegram-desktop discord fluffychat zoom-us signal-desktop slack nur-linyinfeng.wemeet
-          cinny-desktop nheko # qq nur-xddxdd.wechat-uos
+          nheko # qq nur-xddxdd.wechat-uos TODO: cinny-desktop
           # browser
           google-chrome tor-browser microsoft-edge
           # office

modules/packages/nushell.nix

@@ -0,0 +1,51 @@
+inputs:
+{
+  options.nixos.packages.nushell = let inherit (inputs.lib) mkOption types; in mkOption
+  {
+    type = types.nullOr (types.submodule {});
+    default = {};
+  };
+  config = let inherit (inputs.config.nixos.packages) nushell; in inputs.lib.mkIf (nushell != null)
+  {
+    nixos =
+    {
+      packages.packages._packages = [ inputs.pkgs.nushell ];
+      user.sharedModules =
+      [{
+        config.programs =
+        {
+          nushell =
+          {
+            enable = true;
+            extraConfig =
+            ''
+              source ${inputs.topInputs.nu-scripts}/aliases/git/git-aliases.nu
+              $env.PATH = ($env.PATH | append ~/bin)
+            '';
+          };
+          carapace.enable = true;
+          oh-my-posh =
+          {
+            enable = true;
+            enableZshIntegration = false;
+            settings = inputs.localLib.deepReplace
+              [
+                {
+                  path = [ "blocks" 0 "segments" (v: v.type or "" == "path") "properties" "style" ];
+                  value = "powerlevel";
+                }
+                {
+                  path = [ "blocks" 0 "segments" (v: v.type or "" == "executiontime") "template" ];
+                  value = v: builtins.replaceStrings [ "⠀" ] [ " " ] v;
+                }
+              ]
+              (builtins.fromJSON (builtins.readFile
+                "${inputs.pkgs.oh-my-posh}/share/oh-my-posh/themes/atomic.omp.json"));
+          };
+          zoxide.enable = true;
+          direnv.enable = true;
+        };
+      }];
+    };
+  };
+}

modules/packages/server.nix

@@ -10,7 +10,7 @@ inputs:
       [
         # basic tools
         beep dos2unix gnugrep pv tmux screen parallel tldr cowsay jq zellij ipfetch localPackages.pslist
-        fastfetch reptyr nushell duc ncdu progress libva-utils ksh neofetch
+        fastfetch reptyr duc ncdu progress libva-utils ksh neofetch
         # lsxx
         pciutils usbutils lshw util-linux lsof dmidecode lm_sensors
         # top
@@ -44,7 +44,7 @@ inputs:
         ++ (inputs.lib.optional (inputs.config.nixos.system.nixpkgs.arch == "x86_64") rar);
       _pythonPackages = [(pythonPackages: with pythonPackages;
       [
-        openai python-telegram-bot fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2
+        openai python-telegram-bot fastapi-cli pypdf2 pandas matplotlib plotly gunicorn redis jinja2
         certifi charset-normalizer idna orjson psycopg2 inquirerpy requests tqdm pydbus
       ])];
     };

modules/services/gitea.nix

@@ -43,6 +43,7 @@ inputs:
           SMTP_PORT = 465;
           USER = "bot@chn.moe";
         };
+        service.REGISTER_MANUAL_CONFIRM = true;
       };
     };
     nixos.services =

modules/services/groupshare.nix

@@ -4,7 +4,11 @@ inputs:
   {
     type = types.nullOr (types.submodule { options =
     {
-      users = mkOption { type = types.listOf types.nonEmptyStr; default = [ "chn" "gb" "xll" "yjq" "zem" ]; };
+      users = mkOption
+      {
+        type = types.listOf types.nonEmptyStr;
+        default = [ "chn" "gb" "xll" "yjq" "zem" "gb" "wp" "hjp" ];
+      };
     };});
     default = null;
   };

modules/services/rsshub.nix

@@ -13,22 +13,26 @@ inputs:
       inherit (builtins) map listToAttrs toString;
     in mkIf rsshub.enable
     {
-      systemd.services.rsshub =
+      systemd =
       {
-        description = "rsshub";
-        after = [ "network.target" "redis-rsshub.service" ];
-        requires = [ "redis-rsshub.service" ];
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig =
+        services.rsshub =
         {
-          User = inputs.config.users.users.rsshub.name;
-          Group = inputs.config.users.users.rsshub.group;
-          EnvironmentFile = inputs.config.sops.templates."rsshub/env".path;
-          WorkingDirectory = "${inputs.pkgs.localPackages.rsshub}";
-          ExecStart = "${inputs.pkgs.localPackages.rsshub}/bin/rsshub";
-          CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
-          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+          description = "rsshub";
+          after = [ "network.target" "redis-rsshub.service" ];
+          requires = [ "redis-rsshub.service" ];
+          wantedBy = [ "multi-user.target" ];
+          serviceConfig =
+          {
+            User = inputs.config.users.users.rsshub.name;
+            Group = inputs.config.users.users.rsshub.group;
+            EnvironmentFile = inputs.config.sops.templates."rsshub/env".path;
+            WorkingDirectory = "${inputs.pkgs.localPackages.rsshub}";
+            ExecStart = "${inputs.pkgs.localPackages.rsshub}/bin/rsshub";
+            CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+            AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+          };
         };
+        tmpfiles.rules = [ "d /var/cache/rsshub 0700 rsshub rsshub" ];
       };
       sops =
       {
@@ -46,6 +50,8 @@ inputs:
             YOUTUBE_CLIENT_ID='${placeholder."rsshub/youtube-client-id"}'
             YOUTUBE_CLIENT_SECRET='${placeholder."rsshub/youtube-client-secret"}'
             YOUTUBE_REFRESH_TOKEN='${placeholder."rsshub/youtube-refresh-token"}'
+            XDG_CONFIG_HOME='/var/cache/rsshub/chromium'
+            XDG_CACHE_HOME='/var/cache/rsshub/chromium'
           '';
         secrets = (listToAttrs (map (secret: { name = "rsshub/${secret}"; value = {}; })
         [

modules/services/synapse.nix

@@ -192,6 +192,7 @@ inputs:
                   admin_contact = "mailto:chn@chn.moe";
                   enable_registration = true;
                   registrations_require_3pid = [ "email" ];
+                  registration_requires_token = true;
                   turn_uris = [ "turns:coturn.chn.moe" "turn:coturn.chn.moe" ];
                   max_upload_size = "1024M";
                   web_client_location = "https://element.chn.moe/";

modules/system/initrd.nix

@@ -33,8 +33,6 @@ inputs:
             # resolved does not work in initrd, causing network.target to fail
             services.resolved.enable = false;
           };
-          # ip=dhcp only attain ipv4
-          kernelParams = [ "ip=on" ];
         };
       }
     )

modules/system/kernel/default.nix

@@ -128,11 +128,6 @@ inputs:
                   let version = inputs.lib.versions.majorMinor inputs.config.boot.kernelPackages.kernel.version;
                   in ./hibernate-progress-${version}.patch;
               }];
-              amdgpu =
-              [{
-                name = "amdgpu";
-                patch = ./0001-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.patch;
-              }];
               # TODO: remove in 6.11
               btrfs =
               [{
@@ -141,6 +136,11 @@ inputs:
                   let version = inputs.lib.versions.majorMinor inputs.config.boot.kernelPackages.kernel.version;
                   in if version == "6.10" then ./btrfs.patch else null;
               }];
+              amdgpu =
+              [{
+                name = "amdgpu";
+                patch = ./0001-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.patch;
+              }];
             };
           in builtins.concatLists (builtins.map (name: patches.${name}) (kernel.patches ++ [ "btrfs" ]));
       };

modules/system/networking.nix

@@ -104,6 +104,8 @@ inputs:
         networkmanager.unmanaged = with networking.networkd; dhcp ++ (builtins.attrNames static);
         useNetworkd = true;
       };
+      # dnsable dns fallback, use provided dns servers or no dns
+      services.resolved.fallbackDns = [];
     })
     # wpa_supplicant
     (inputs.lib.mkIf (networking.wireless != [])

modules/system/nixpkgs.nix

@@ -23,7 +23,7 @@ inputs:
       nixpkgs =
         let
           permittedInsecurePackages =
-            [ "openssl_1_1" "python2" "zotero"  "electron_27" "electron_28" ];
+            [ "openssl_1_1" "python2" "zotero"  "electron_27" "electron_28" "olm" "fluffychat" ];
           hostPlatform = if nixpkgs.march != null
             then { system = "${nixpkgs.arch}-linux"; gcc = { arch = nixpkgs.march; tune = nixpkgs.march; }; }
             else "${nixpkgs.arch}-linux";

modules/user/chn/default.nix

@@ -10,6 +10,7 @@ inputs:
         (builtins.attrNames inputs.config.users.groups);
       autoSubUidGidRange = true;
       hashedPassword = "$y$j9T$xJwVBoGENJEDSesJ0LfkU1$VEExaw7UZtFyB4VY1yirJvl7qS7oiF49KbEBrV0.hhC";
+      shell = inputs.lib.mkForce inputs.pkgs.nushell;
     };
     home-manager.users.chn =
     {

modules/user/chn/plasma/theme.nix

@@ -4,29 +4,31 @@ inputs:
   {
     home-manager.users.chn.config =
     {
-      home.file.".config/Kvantum/catppuccin-latte-blue#/catppuccin-latte-blue#.kvconfig".source =
-        ./catppuccin-latte-blue.kvconfig;
       programs.plasma =
       {
         workspace =
         {
           theme = "breeze-light";
-          colorScheme = "CatppuccinLatteBlue";
+          colorScheme = "BreezeLight";
           cursor.theme = "breeze_cursors";
-          lookAndFeel = "Catppuccin-Latte-Blue";
+          lookAndFeel = "org.kde.klassylighttraditional.desktop";
           # ~/.config/kdeglobals [Icons]
-          iconTheme = "Tela-circle";
+          iconTheme = "klassy";
         };
         configFile =
         {
-          kdeglobals.KDE.widgetStyle.value = "kvantum";
-          "Kvantum/kvantum.kvconfig".General.theme.value = "catppuccin-latte-blue#";
           kwinrc =
           {
             Effect-blur.BlurStrength.value = 10;
             Effect-kwin4_effect_translucency.MoveResize.value = 75;
             Effect-wobblywindows =
-              { AdvancedMode.value = true; Drag.value = 85; Stiffness.value = 10; WobblynessLevel.value = 1; };
+            {
+              AdvancedMode.value = true;
+              Drag.value = 85;
+              Stiffness.value = 10;
+              WobblynessLevel.value = 1;
+              ResizeWobble.value = false;
+            };
             Plugins =
             {
               blurEnabled.value = true;

modules/user/chn/plasma/theme/catppuccin-latte-blue.kvconfig

@@ -1,466 +0,0 @@
-[%General]
-author=elkrien based on Arc Dark style
-comment=Catppuccin-Latte-Blue
-spread_menuitems=true
-left_tabs=true
-mirror_doc_tabs=true
-scroll_width=8
-attach_active_tab=true
-composite=true
-menu_shadow_depth=7
-tooltip_shadow_depth=0
-splitter_width=7
-check_size=16
-slider_width=4
-slider_handle_width=18
-slider_handle_length=18
-textless_progressbar=false
-menubar_mouse_tracking=true
-slim_toolbars=false
-toolbutton_style=1
-x11drag=menubar_and_primary_toolbar
-double_click=false
-translucent_windows=true
-blurring=true
-popup_blurring=true
-opaque=kaffeine,kmplayer,subtitlecomposer,kdenlive,vlc,smplayer,smplayer2,avidemux,avidemux2_qt4,avidemux3_qt4,avidemux3_qt5,kamoso,QtCreator,VirtualBox,trojita,dragon,digikam,qmplay2
-group_toolbar_buttons=false
-vertical_spin_indicators=false
-fill_rubberband=false
-spread_progressbar=true
-merge_menubar_with_toolbar=true
-small_icon_size=16
-large_icon_size=32
-button_icon_size=16
-scroll_arrows=false
-iconless_pushbutton=true
-toolbar_icon_size=16
-combo_as_lineedit=true
-button_contents_shift=false
-groupbox_top_label=true
-inline_spin_indicators=true
-joined_inactive_tabs=false
-layout_spacing=2
-submenu_overlap=0
-tooltip_delay=-1
-animate_states=false
-transient_scrollbar=true
-alt_mnemonic=true
-combo_menu=true
-layout_margin=4
-no_window_pattern=false
-respect_DE=true
-scroll_min_extent=36
-scrollable_menu=false
-scrollbar_in_view=false
-spin_button_width=16
-submenu_delay=250
-tree_branch_line=true
-progressbar_thickness=8
-click_behavior=0
-contrast=1.00
-dialog_button_layout=0
-drag_from_buttons=false
-hide_combo_checkboxes=false
-intensity=1.00
-no_inactiveness=false
-reduce_menu_opacity=20
-reduce_window_opacity=20
-saturation=1.00
-shadowless_popup=false
-transient_groove=false
-menu_blur_radius=0
-tooltip_blur_radius=0
-
-[GeneralColors]
-window.color=#EFF1F5
-base.color=#E6E9EF
-alt.base.color=#E6E9EF
-button.color=#CCD0DA
-light.color=#BCC0CC
-mid.light.color=#BCC0CC
-dark.color=#E6E9EF
-mid.color=#E6E9EF
-highlight.color=#1E66F5
-inactive.highlight.color=#1E66F5
-text.color=#4C4F69
-window.text.color=#4C4F69
-button.text.color=#4C4F69
-disabled.text.color=#ACB0BE
-tooltip.text.color=#4C4F69
-highlight.text.color=#E6E9EF
-link.color=#DC8A78
-link.visited.color=#1E66F5
-
-[ItemView]
-inherits=PanelButtonCommand
-frame.element=itemview
-interior.element=itemview
-frame=true
-interior=true
-text.iconspacing=3
-text.toggle.color=#E6E9EF
-
-[RadioButton]
-inherits=PanelButtonCommand
-frame=false
-interior.element=radio
-
-[CheckBox]
-inherits=PanelButtonCommand
-frame=false
-interior.element=checkbox
-
-[TreeExpander]
-indicator.element=tree
-indicator.size=8
-
-[ToolTip]
-frame.top=4
-frame.right=4
-frame.bottom=4
-frame.left=4
-frame=true
-
-[PanelButtonCommand]
-inherits=PanelButtonCommand
-interior.element=button
-frame.element=button
-text.normal.color=#4C4F69
-text.focus.color=#4C4F69
-text.press.color=#E6E9EF
-text.toggle.color=#E6E9EF
-
-[PanelButtonTool]
-inherits=PanelButtonCommand
-
-[DockTitle]
-inherits=PanelButtonCommand
-interior=false
-frame=false
-text.margin.top=5
-text.margin.bottom=5
-text.margin.left=5
-text.margin.right=5
-indicator.size=0
-
-[Dock]
-interior.element=toolbar
-frame.element=toolbar
-frame=true
-interior=true
-
-[GroupBox]
-inherits=PanelButtonCommand
-interior.element=tabframe
-interior=true
-frame=false
-
-[Focus]
-inherits=PanelButtonCommand
-frame=true
-frame.element=focus
-frame.top=1
-frame.bottom=1
-frame.left=1
-frame.right=1
-frame.patternsize=20
-
-[GenericFrame]
-inherits=PanelButtonCommand
-frame.element=common
-frame.top=1
-frame.bottom=1
-frame.left=1
-frame.right=1
-
-[Slider]
-inherits=PanelButtonCommand
-interior=true
-frame.element=slider
-interior.element=slider
-frame.top=3
-frame.bottom=3
-frame.left=3
-frame.right=3
-focusFrame=true
-
-[SliderCursor]
-inherits=PanelButtonCommand
-interior=true
-interior.element=slidercursor
-frame=false
-
-[LineEdit]
-inherits=PanelButtonCommand
-frame.element=lineedit
-interior.element=lineedit
-
-[IndicatorSpinBox]
-inherits=LineEdit
-frame.element=lineedit
-interior.element=lineedit
-frame.top=0
-frame.bottom=2
-frame.left=2
-frame.right=2
-indicator.size=8
-
-[DropDownButton]
-inherits=PanelButtonCommand
-frame.top=2
-frame.bottom=2
-frame.left=0
-frame.right=1
-indicator.size=8
-
-[ToolboxTab]
-inherits=PanelButtonCommand
-frame.element=tabframe
-frame.top=1
-frame.bottom=1
-frame.left=1
-frame.right=1
-
-[Tab]
-inherits=PanelButtonCommand
-interior.element=tab
-frame.element=tab
-frame.top=2
-frame.bottom=3
-frame.left=3
-frame.right=3
-indicator.size=10
-text.normal.color=#ACB0BE
-text.focus.color=#4C4F69
-text.press.color=#4C4F69
-text.toggle.color=#4C4F69
-focusFrame=true
-
-[TabBarFrame]
-inherits=GenericFrame
-frame=true
-frame.element=tabBarFrame
-interior=false
-frame.top=4
-frame.bottom=4
-frame.left=4
-frame.right=4
-
-[TabFrame]
-inherits=PanelButtonCommand
-frame.element=tabframe
-interior.element=tabframe
-
-[Dialog]
-inherits=TabBarFrame
-frame.element=tabframe
-interior=false
-frame=false
-frame.top=1
-frame.bottom=1
-frame.left=1
-frame.right=1
-
-[HeaderSection]
-inherits=PanelButtonCommand
-interior.element=header
-frame.element=header
-frame.top=0
-frame.bottom=1
-frame.left=1
-frame.right=1
-frame.expansion=0
-text.normal.color=#4C4F69
-text.focus.color=#1E66F5
-text.press.color=#4C4F69
-text.toggle.color=#4C4F69
-indicator.element=harrow
-
-[SizeGrip]
-inherits=PanelButtonCommand
-frame=false
-interior=false
-indicator.element=resize-grip
-indicator.size=0
-
-[Toolbar]
-inherits=PanelButtonCommand
-interior.element=menubar
-frame.element=menubar
-frame=true
-frame.bottom=4
-frame.left=4
-frame.right=4
-text.normal.color=#4C4F69
-text.focus.color=#4C4F69
-text.press.color=#1E66F5
-text.toggle.color=#1E66F5
-text.bold=false
-
-[MenuBar]
-inherits=PanelButtonCommand
-frame.element=menubar
-interior.element=menubar
-frame.bottom=0
-text.normal.color=#4C4F69
-frame.expansion=0
-text.bold=false
-
-[ToolbarButton]
-frame.element=tbutton
-interior.element=tbutton
-indicator.element=arrow
-text.normal.color=#4C4F69
-text.focus.color=#4C4F69
-text.press.color=#E6E9EF
-text.toggle.color=#E6E9EF
-text.bold=false
-
-[Scrollbar]
-inherits=PanelButtonCommand
-indicator.size=0
-interior=false
-frame=false
-
-[ScrollbarGroove]
-inherits=PanelButtonCommand
-interior=false
-frame=false
-
-[ScrollbarSlider]
-inherits=PanelButtonCommand
-interior=false
-frame.element=scrollbarslider
-frame.top=4
-frame.bottom=4
-frame.left=4
-frame.right=4
-
-[ProgressbarContents]
-inherits=PanelButtonCommand
-frame=true
-frame.element=progress-pattern
-interior.element=progress-pattern
-frame.top=2
-frame.bottom=2
-frame.left=2
-frame.right=2
-
-[Progressbar]
-inherits=PanelButtonCommand
-frame.element=progress
-interior.element=progress
-frame.top=2
-frame.bottom=2
-frame.left=2
-frame.right=2
-text.margin=0
-text.normal.color=#4C4F69
-text.focus.color=#4C4F69
-text.press.color=#E6E9EF
-text.toggle.color=#E6E9EF
-text.bold=false
-frame.expansion=18
-
-[RadioButton]
-inherits=PanelButtonCommand
-
-[Menu]
-frame.element=menu
-interior.element=menu
-inherits=PanelButtonCommand
-text.press.color=#E6E9EF
-text.toggle.color=#E6E9EF
-text.bold=false
-frame.top=3
-frame.bottom=3
-frame.left=3
-frame.right=3
-
-[MenuItem]
-inherits=PanelButtonCommand
-interior.element=menuitem
-indicator.size=8
-text.focus.color=#4C4F69
-text.press.color=#4C4F69
-
-[MenuBarItem]
-inherits=PanelButtonCommand
-interior.element=menubaritem
-frame=false
-text.margin.top=3
-text.margin.bottom=3
-text.margin.left=5
-text.margin.right=5
-
-[StatusBar]
-inherits=Toolbar
-frame.element=toolbar
-font.bold=true
-text.normal.color=#4C4F69
-frame=true
-frame.top=0
-frame.bottom=0
-
-[TitleBar]
-inherits=PanelButtonCommand
-frame=false
-interior=false
-text.margin.top=2
-text.margin.bottom=2
-text.margin.left=3
-text.margin.right=3
-
-[ComboBox]
-inherits=PanelButtonCommand
-indicator.size=8
-frame.top=3
-frame.bottom=3
-frame.left=3
-frame.right=3
-text.margin.top=1
-text.margin.bottom=1
-text.margin.left=3
-text.margin.right=3
-text.toggle.color=#4C4F69
-
-[ToolboxTab]
-inherits=PanelButtonCommand
-text.normal.color=#4C4F69
-text.press.color=#4C4F69
-text.focus.color=#4C4F69
-
-[Hacks]
-transparent_dolphin_view=true
-blur_konsole=true
-transparent_ktitle_label=true
-transparent_menutitle=true
-respect_darkness=true
-kcapacitybar_as_progressbar=true
-force_size_grip=false
-iconless_pushbutton=true
-iconless_menu=false
-disabled_icon_opacity=100
-lxqtmainmenu_iconsize=0
-normal_default_pushbutton=true
-single_top_toolbar=false
-tint_on_mouseover=0
-transparent_pcmanfm_sidepane=true
-transparent_pcmanfm_view=true
-blur_translucent=true
-centered_forms=false
-kinetic_scrolling=false
-middle_click_scroll=false
-no_selection_tint=false
-noninteger_translucency=false
-style_vertical_toolbars=false
-blur_only_active_window=false
-
-[Window]
-interior=true
-interior.element=window
-frame.top=0
-frame.bottom=0
-frame.left=0
-frame.right=0

modules/user/default.nix

@@ -18,7 +18,8 @@ inputs:
         zem = 1004;
         gb = 1005;
         test = 1006;
-        zqq = 1007;
+        wp = 1007;
+        hjp = 1008;
         misskey-misskey = 2000;
         misskey-misskey-old = 2001;
         frp = 2002;

modules/user/hjp/id_ed25519.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGRZp8xp9hVO7e/6eflQsnFZj853IRVywc97cTevnWbg hjp@xmupc1

modules/user/wp/id_ed25519.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMRpyIU8ZuYTa0LvsVHmJZ1FA7Lbp4PObjkwo+UcpCP8 wp@xmupc1

modules/user/zqq/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM+Hi3Jo/xb7vDm5L75jybjjrE6z7quveuKd0mTeXDP zqq@xmupc1

packages/hpcstat/share/keys/hjp

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGRZp8xp9hVO7e/6eflQsnFZj853IRVywc97cTevnWbg hjp@xmupc1

packages/hpcstat/share/keys/wp

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMRpyIU8ZuYTa0LvsVHmJZ1FA7Lbp4PObjkwo+UcpCP8 wp@xmupc1

packages/hpcstat/src/disk.cpp

@@ -110,13 +110,11 @@ namespace hpcstat::disk
       {
         if (!std::filesystem::exists(*homedir + "/" + dir))
           { std::cerr << "{} does not exist\n"_f(*homedir + "/" + dir); continue; }
-        if (auto size = get_size(dir)) usage.Teacher.push_back({ dir, *size });
-        else return {};
-        if (recursive) for (const auto& subdir : get_subdir(dir))
+        if (auto size = get_size(dir))
         {
-          if (auto size = get_size(dir + "/" + subdir); size)
+          usage.Teacher.push_back({ dir, *size });
+          if (recursive) for (const auto& subdir : get_subdir(dir)) if (auto size = get_size(dir + "/" + subdir); size)
             usage.Student.push_back({ dir + "/" + subdir, *size });
-          else return {};
         }
       }
       std::sort(usage.Teacher.begin(), usage.Teacher.end(),

packages/hpcstat/src/keys.cpp

@@ -10,6 +10,8 @@ namespace hpcstat
     { "fdq5k13N2DAzIK/2a1Mm4/ZVsDUgT623TSOXsVswxT8", { "yjq", "Junqi Yao" } },
     { "8USxEYi8ePPpLhk5FYBo2udT7/NFmEe8c2+oQajGXzA", { "zem", "Enming Zhang" } },
     { "C52EURGhRHtf+odfmE2qofh7NO24MnGB3Q8GhRQhHiM", { "xly", "Linyang Xie" } },
+    { "JODRKZ9E0+pjruWN9TPksC6Xsns/GZijKLbYfZqpSeY", { "wp", "Peng Wang" } },
+    { "uL/ZfBXKko30VpeuKb5dnnxbhJ8IAuHo8W+n2uwQhCI", { "hjp", "JiaPeng Huang" } },
     { "7bmG24muNsaAZkCy7mQ9Nf2HuNafmvUO+Hf1bId9zts", { "00", "Yaping Wu" } },
     { "dtx0QxdgFrXn2SYxtIRz43jIAH6rLgJidSdTvuTuews", { "01", "Jing Li" } },
     { "8crUO9u4JiVqw3COyjXfzZe87s6XZFhvi0LaY0Mv6bg", { "02", "Huahan Zhan" } },