mirror of
https://github.com/CHN-beta/nixos.git
synced 2026-01-12 09:49:22 +08:00
Compare commits
127 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 61ac5a0d5e | |||
| 353a369ff1 | |||
| 0b1b888e7d | |||
| cac52c47af | |||
| 3f441a127b | |||
| 6c11ecef50 | |||
| c25cf1b247 | |||
| 3047395d0b | |||
| fec397ba04 | |||
| 7dc66ab677 | |||
| 71b861492f | |||
| 783f5f6754 | |||
| 8bd7746ca6 | |||
| e9d6ef9ef7 | |||
| 60cbf91b7b | |||
| 5182d22428 | |||
| 08fe454c5c | |||
| 07d126049d | |||
| bad48d324a | |||
| 639dab16b7 | |||
| 34ca8802da | |||
| b7bc7d3b0f | |||
| 3f052c7be7 | |||
| 3cea37ca48 | |||
| 4bbc7e3347 | |||
| d525f2d07c | |||
| 70a4b66a59 | |||
| 393414874a | |||
| a0214ebae6 | |||
| 073e21f267 | |||
| 812669bac0 | |||
| 09b7b587eb | |||
| f30adfe9bf | |||
| d61e640f3f | |||
| 1f8b74103d | |||
| 8a0d4c70d7 | |||
| f78c1b8ce7 | |||
| be62868f0c | |||
| e5a31d9113 | |||
| 7034ba20a8 | |||
| fac137fafd | |||
| 609342f62f | |||
| 9f191432ea | |||
| d1ddf91c00 | |||
| 0f7d335194 | |||
| 66e7499a15 | |||
| d75815b940 | |||
| f0feefa57f | |||
| caa44d5ddb | |||
| 605ab96416 | |||
| 668c3723ec | |||
| dc09fd97a2 | |||
| a0b68184ae | |||
| f43f8e5eda | |||
| 4e21f82aec | |||
| f5190ef8af | |||
| 1254265367 | |||
| dac0935ce3 | |||
| e37c316fd8 | |||
| ebb7078487 | |||
| b0a523e797 | |||
| db2dce6224 | |||
| 71bf59a25c | |||
| b9bd5c7326 | |||
| 07c52da061 | |||
| 376cb9570e | |||
| e307c4bc14 | |||
| 8de99fdd4c | |||
| 7f6fe1c54b | |||
| d5bb5ecc2f | |||
| 8ea62bc9fd | |||
| 3d6172a199 | |||
| 03e0dd3a41 | |||
| 152eafda81 | |||
| 5ab2aa87fc | |||
| b7c141cec3 | |||
| 4e29c56e60 | |||
| cf239245a8 | |||
| f243649c38 | |||
| f007f86033 | |||
| b3af5b20b0 | |||
| 2de65449fe | |||
| 33051ff2f0 | |||
| 748bd5e1ff | |||
| 877ba67974 | |||
| 5be51a3dfd | |||
| 88db84c3cf | |||
| 2bb122cca0 | |||
| b91d4fa527 | |||
| 528b3d8ffc | |||
| e28e554ea9 | |||
| 1d45a3d544 | |||
| 0514ef5521 | |||
| a229ec031c | |||
| 6c29e42ce1 | |||
| e65d7854ad | |||
| 6e4123f294 | |||
| 7708adcc60 | |||
| 454792d0c0 | |||
| 78b5bc8504 | |||
| 63050aa2f1 | |||
| 8f1225f6c7 | |||
| c22bc23c79 | |||
| cace73c340 | |||
| 063d5d3f15 | |||
| 22737dedbd | |||
| 0030a7f35c | |||
| 5102ee5878 | |||
| 1e1eb52c22 | |||
| a95a4ea675 | |||
| 6cdb04407c | |||
| a54dd066ed | |||
| 4f3c571ea9 | |||
| 13f6b9da81 | |||
| 28ccf400d5 | |||
| 78bed7c2ba | |||
| cfdfb7d078 | |||
| 5841eae211 | |||
| 4c95017b99 | |||
| 394a3a60c0 | |||
| eaf74c6f3b | |||
| 2423a0b68f | |||
| 319153a57e | |||
| 5430154a09 | |||
| 5e4200f4b4 | |||
| 2eb20cf492 | |||
| 5b4b8c6889 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -6,3 +6,4 @@ build
|
||||
.vscode
|
||||
.cache
|
||||
.ccls-cache
|
||||
archive
|
||||
|
||||
18
.sops.yaml
18
.sops.yaml
@@ -1,14 +1,13 @@
|
||||
keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
|
||||
- &chn age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
|
||||
- &pc age1ffvr5pqd2lfj24e3fh53s92z6h76fda3du4y4k6r3yjumdwvpfgqzj033a
|
||||
- &vps4 age1yvrl4y0r6yzcxzzkgfwshlrtsjt8uuya6rfwks09pnft7esfcyvqmrtm5q
|
||||
- &vps6 age164tyqklwhdm57tfm5u863mdt2xrzrrzac4py8a0j9y6kzqcjy9zsp073t6
|
||||
- &vps7 age137x7csalutwvfygvvzpemlsywvdxj3j4z93a50z2sjx03w6zau8q3r5902
|
||||
- &surface age1ck5vzs0xqx0jplmuksrkh45xwmkm2t05m2wyq5k2w2mnkmn79fxs6tvl3l
|
||||
- &nas age19lhcwk37jmvn6z0v4dpdfh0k4u23f76twdjknc0p7atktf37rd7s4t4wj3
|
||||
- &xmupc1 age1hnarptkze0ujpp05dqr8uma04cxg9zqcx68qgpks5uf5l6rpk5gqhh8wxg
|
||||
- &xmupc2 age1l4stuz0vr7gs7pqwjrmezam44702jp2vmqaqyxw0l0r42kf9updq4dfhrw
|
||||
- &pi3b age1yjgswvexp0x0de0sw4u6hamruzeluxccmx2enxazl6pwhhsr2s9qlxdemq
|
||||
- &one age1m7nrxfw22wvp7pj8y9pdl745w95x89uu8dzl9ppsaazweqf2lqms5yshsp
|
||||
- &srv1-node0 age1nzetyehldf3gl6pr6mu5d2cv387p8wjqn6wfpll7a3sl8us6n38s0ds633
|
||||
- &srv1-node1 age1wj33xt8nj7rhnsenepsf6k3lmq5vk4wn84jwr55qy9cwu05xn5cspg3h7t
|
||||
- &srv1-node2 age16e7ykphshal6qhwfvat698hl48s8yr0jvzh27ecdyfh5uk7t9u6s753jgy
|
||||
@@ -19,11 +18,6 @@ creation_rules:
|
||||
- age:
|
||||
- *chn
|
||||
- *pc
|
||||
- path_regex: devices/vps4/.*$
|
||||
key_groups:
|
||||
- age:
|
||||
- *chn
|
||||
- *vps4
|
||||
- path_regex: devices/vps6/.*$
|
||||
key_groups:
|
||||
- age:
|
||||
@@ -39,11 +33,6 @@ creation_rules:
|
||||
- age:
|
||||
- *chn
|
||||
- *nas
|
||||
- path_regex: devices/surface/.*$
|
||||
key_groups:
|
||||
- age:
|
||||
- *chn
|
||||
- *surface
|
||||
- path_regex: devices/xmupc1/.*$
|
||||
key_groups:
|
||||
- age:
|
||||
@@ -59,6 +48,11 @@ creation_rules:
|
||||
- age:
|
||||
- *chn
|
||||
- *pi3b
|
||||
- path_regex: devices/one/.*$
|
||||
key_groups:
|
||||
- age:
|
||||
- *chn
|
||||
- *one
|
||||
- path_regex: devices/srv1/node0/.*$
|
||||
key_groups:
|
||||
- age:
|
||||
|
||||
@@ -9,6 +9,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGRZp8xp9hVO7e/6eflQsnFZj853IRVywc97cTevnWbg
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwUhEAFHjkbUfOf0ng8I80YbKisbSeY4lq/byinV7lh wm
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5bg5cayOLfnfUBJz8LeyaYfP41s9pIqUgXn6w9xtvR lly
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBoDGk9HYphkngx2Ix/vef2ZntdVNK1kbS9pY8+TzI41 yxf
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJi6O1Sf1BBV1dYyH1jcHiws+ntwVfV29+6Paq1CQaET hss
|
||||
|
||||
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
|
||||
|
||||
44
devices/one/default.nix
Normal file
44
devices/one/default.nix
Normal file
@@ -0,0 +1,44 @@
|
||||
inputs:
|
||||
{
|
||||
config =
|
||||
{
|
||||
nixos =
|
||||
{
|
||||
model = { type = "desktop"; private = true; };
|
||||
system =
|
||||
{
|
||||
fileSystems =
|
||||
{
|
||||
mount =
|
||||
{
|
||||
vfat."/dev/disk/by-partlabel/one-boot" = "/boot";
|
||||
btrfs."/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
|
||||
};
|
||||
luks.auto."/dev/disk/by-partlabel/one-root" = { mapper = "root"; ssd = true; };
|
||||
swap = [ "/nix/swap/swap" ];
|
||||
resume = { device = "/dev/mapper/root"; offset = 4728064; };
|
||||
rollingRootfs = {};
|
||||
};
|
||||
nixpkgs.march = "tigerlake";
|
||||
kernel.variant = "cachyos";
|
||||
};
|
||||
hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };
|
||||
services =
|
||||
{
|
||||
snapper.enable = true;
|
||||
xray.client.enable = true;
|
||||
smartd.enable = true;
|
||||
beesd.instances.root = { device = "/"; hashTableSizeMB = 512; };
|
||||
wireguard =
|
||||
{
|
||||
enable = true;
|
||||
peers = [ "vps6" ];
|
||||
publicKey = "Hey9V9lleafneEJwTLPaTV11wbzCQF34Cnhr0w2ihDQ=";
|
||||
wireguardIp = "192.168.83.5";
|
||||
};
|
||||
sshd = {};
|
||||
};
|
||||
bugs = [ "xmunet" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
46
devices/one/secrets.yaml
Normal file
46
devices/one/secrets.yaml
Normal file
@@ -0,0 +1,46 @@
|
||||
xray-client:
|
||||
uuid: ENC[AES256_GCM,data:GmfSlDQjO4aBq3u50jnFjOR9VxamYHzokUrO9IpIGuBx0j8e,iv:++O2wBUCnHDPowRgtxPQJQePXP2Cda74WXQvlKHbHNw=,tag:XDWhiXwT718RgrBw7L5yzw==,type:str]
|
||||
acme:
|
||||
token: ENC[AES256_GCM,data:+zy72VDj8hs1GH7E1U04WhiGq0xkIPGC8pHbAYR70OK5E6EOdkQwKA==,iv:oYNSrOH3pLhltYw2NX1d4s6jiUgMssWiIK//62i0ptQ=,tag:C5ekSVjmwSEphsTZ/DLcsg==,type:str]
|
||||
nginx:
|
||||
maxmind-license: ENC[AES256_GCM,data:/x9HJWh4Kpp5xy4TfuC/bP4Z/gMOFgAalz91cewHj1/tPxFe5R/nQA==,iv:K696zu685ydzwFMKIrqz1GiYLMKGM1dLNDWdhH4U0L8=,tag:nFwqXc7RPIYcQxVIu6GWgw==,type:str]
|
||||
wireguard:
|
||||
privateKey: ENC[AES256_GCM,data:NgA5rHB6GwqiNSx1mhxObywuiZWq5qpcNrlpk6HaD9hzQoL0j1IrrgMCqkU=,iv:ZZUlSJeQPN2/JxjhR08FdEZl3gCFuNpJ3M93C6JovHs=,tag:rCtWHOYCmgZKF1lRlIAReA==,type:str]
|
||||
github:
|
||||
token: ENC[AES256_GCM,data:rGiseVhDBU+rNcz92QXHeqAQ4lC7l5dba8d7rGUIIoEcpBVGwGh/5w==,iv:lf4aMBAQxI140qJsMLqHpI3dKRw6HiV20cyn0WFWbT8=,tag:w1P9MrqgUAmPzVWkIFs1jg==,type:str]
|
||||
chn:
|
||||
age: ENC[AES256_GCM,data:eI7ZtgOdcI0sWrD0MmbPEOnImVaacTrR/rDtZcUKSlUIMlpFga7HYOKUZbgMvqaxZK9YLuddB4setggrPvEx+rXpTU4fx0s5Ce4=,iv:5aYVpf5/nr/ssGAZDiSs4/5HP4aPDya0DZ8OfrhHowg=,tag:ImzDxw/1GB4/krCnNAxJ8Q==,type:str]
|
||||
rsa: ENC[AES256_GCM,data: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,iv:9FUcJX6puazsRTBtKfuhvbY8jA5pdVHD4PfChtSX314=,tag:bxLTovW44jFhGkzGzwCHiQ==,type:str]
|
||||
ed25519: ENC[AES256_GCM,data:KLBlDuxOdHnqmVU1KtDrd1r44VzuCYhQW8+7KDAXLD5XGKBP9ip41ZByuRxVUnhVtTP9LRlUt7qvEjPen4hn7HxH+Ic5tghN400JFKpnmxmnjZGbelIheAuRYU0t6BKFvTvcaKD5sNhpoYX9P29L+Yobt59Lo9dc96dF8xy6iWE4X+FPYBsxtheGOMDW/I0CLKF82pv+yy01EFDKLBLciPkweUcCf4642Xv/Lv1knCIhxnCGa5fD7XpqNbz/VfTiqgIDUScISIo5cXJQIp4Dho2SIaf3nMg8BQB5iNRDcyU45m01M36SaYKU7xBuJN7pRP+vtPySavtjbmqLbowFM9iQArpHCV+VT7cF6D35lPcn6hsZ9xEIP6XIpQU+cl6RrNmV+Rbxlzi/wGTYB6pWrfmrJaJpDPkYvyO9uy76yaljkbL03LgAsc7ittNkCEJ3xXznr9AHKH382JTHlQtMbKZPBUCAa8T7kJmu9gdfpj3yqJtvdHkOi+RIjls84l7X2OO3vhUzuRqx5FAboxKfDcPgifXV2t3d9wfMTlH8ziJGHiz8RKZJife6tdP2G7nKtSchjTyv9JqFQhTF,iv:C5KL23GV5Cs2vzHix8UNBcDSOvQgNvhewd96BMGpjj8=,tag:0zwTPg+AJyb/pCKV0zEQqA==,type:str]
|
||||
ed25519_sk: ENC[AES256_GCM,data:v8pEsJ2p9cBr+wFIvcVwtHMVfuYUtFOtjbr/SuusDfAzlJJNQ6jIQxrynFwiPGf+zKRKgOmQ55XdlTHnCMztK0stDzPSs15IzgIXf1xTKNsEZVh077VM4a+DAnQMWJVjslcf/ljU0Ec5yoEGuerO03Q7Ud3ffCdObdWCwYYN++QEJ63eKSQhzMZ1LFH0YLizhvIEeqe/NYsYncA+js8uL92/97e7W1Ui2iGwC1kB4gDe0QijmaVKv4yThaw2SlcHiBuKlenkuXZu1h26Z23oa3d/GpEscuNjgY6EKFBHwg9bZIDDH2V+Gt0sWe7lWfAUR6g9DlvXZQ5J2PR+eMaQmKIYKQJRfIogAzA4sh25ecazPDgU5MtJX8W2QO4yDDvbM6TclCFPjnqSPZFpqPu5Dmess2dKMFxq8F+BEJ9typonLcX2YsFizeIZ+y4cbmyINTV3WlMd/hVCOTIadmsTshEIwquKMkKpsxzlu0DRNt1IIj9InqcQmUDfXDJlOYQlE0YPjZnUZmHEq+s+yIhkR21a1dtJ7f5T7YU5de12OiTjn3ekMhw6fSncGIWobwLvezXplLJ0+JM=,iv:QSO+YZLxSwQ69K20+qp5J7R70C6yqZ76LjhXkbfnM98=,tag:TKGQeFJdkBGmj7KO37XOjA==,type:str]
|
||||
rsa.ppk: ENC[AES256_GCM,data:XBM/HD3mv2BD3Dp1LP0i+mSSSyUBrA38RzAQIIQlraFhID9oZBUTzqdSqXDeLtS1p6y2xAOxBVkH/D4WR1kOpXgw3LgNuvb1YFvZkYjCf5QgH9sxMSjiaXRdRHSAuF1b3MpGkgH7gmZRFTc5WkKvia7qzJgwGF0qNwS5j+lB1g0U0oXR6vguqb0gYcA2dKH2tpj/CqGJVAzkZCd1BxQygTpewcb2cbnVG+lb1kixD/r3q2PBoviS56BRCHbwoLhHLSn/y6XOnWqcaBgpBzwE7aZqTWa1QnRtv0OtUkGilrB+SBcXvMDNc0Xts2hhsHuc1DCB4CsAaEY37SEHKJhdZEVHoAZ9dJzScMntcRTES4AjhHXoBUpNy6wvTTLwdw58dXLkxfMdVl4LZ9Lcoc+mFfgPrNpvkvYVh8X0HiDC1FLgoEU8IQXPPW1HJCTGRbPAMRwXXtwxpmDN0byEnLH81JfxvSxnNZkvLu9qRyWC+IRknUALh3KkqzalzpuA3btDkyGBFDSX5phITtTmm0R1eSJg0R/BbFAogHz6NA/2KPoz9TtNH0nkQfDqiYfYub2J+8w9QsAr1k+0Wew9DeAF9eLaNTJSUeDlvz/Rq/DJLyUfOGIpCiY4cecJ5nbHPvdIia7qM3NBeGE0ImQspjjXaZH9WSaUZ/sjJu26LRNj7qJP9DWv8VfxkJ4BuRuYqP0qlWYFd36b38EQbgTiPoDHZoiIXG+1/cfqTf00bKskMl/gmEdoyoa2OZRO9K78iZLu7JFmqL7MoEaOUiLbNHymp7U6QgBdvbqeZxYmcIiMfvWK9Pudxrt5ts6rUDeZgJ02IdZy3BpDIjFBu8OXBHf5U4f+EIjuWDI39S8FOFy7Nv/XVcz9LIqPfR5j1hO+5Gdgqmx30xiccJRM2QZUxh5vC4m9wIFyg0HRrXYF/m7FRiTt3m5VXut4jWMyUbxSNaZMHlq8Lof+Wb/nbEv4HiQxywKCmDQ2YWotJita1fRgXNFCiV+BaEO3MTozUF+aGugBT7YvnufheVrAEVtxRnzD84kTsfvg1uDybvxGOJsj41HfDNOyEkHpsagCj8dcaqtIOPmg42oGEeoGO8sLeVQieVA/OzwDoBk+fC0gwa76t99VANrqdg+rVmHI5rF532j0jXJR9Nr59mZF9yzj0ECHOyRHEj7OkBRFKS9hLshifGJ6GvSNjEm59ohrf4S3ZIfkLx0fZUjmIovXDc6nxaazTd2ww5ZH1P+pkPtFLaGTqvlEKEQJ1zekzBYKH+gze6WP/LK6q/8RianwKB/5kuMbRkk3dsUF7fh017ir2DA7+nedU3Kk7d7/mM01eQHNcIED/BprFGQenuCUl64rn6V7XTdAKWlhusF5fQruU2bXdjO1ojGh8topWyz8Wp7TxN7cRSlU7SLLnXcLuNP2DfrfwDEAL8HNn4K4LJLJAB0gZiPi5Hz9nT1J54mWdifDgaeHbijsWmqrDZwpE/D6hYpXTMU8YWOM0RRf/5ECRCCmh0C+BZvx1CKncsd6BBAa3uMoB4hXMGtMSSpT5ZkDhcoU5h2XNoBSjRLmmbDYraUk9VqByRanZ9zpRGpvb5SFF0OFzuELl3bDxlw0NjYEKSh1lMWSSpVaTDm1XdNcpajXqFmBTN8x2oP77tnLlPPrFbcoXdn6k3jmvTzYpBk0FRv582ZYaHhH0iXkrp8/R4GtWA5VjqfZ7pGSZSBIu4OjzjdxXvee0ZK5Z1kR7MfR4G0S0BGgYbTPdoy5exm6Xfwy3qzKlfKI0vni8ttjbiACq+/ImMPUmvCSgtqnGTUejF4rEDrvJLZHrybQQ83X7/QoXrt9MzJB5gR7xCr80FdsEgT7ZnPd+arZJRJfryYHaMsZ83FTikc+eM62gRm1Hj5TdCUtHgmgwQraH3+GGgIWRQVZRxZoPf1RlAYRH+9i1+BiqdLxqdBECA==,iv:vaQNKRMYwXIFl+8Q1IKgpEHGd+pAAGzn27sLNlqS5sk=,tag:DQrSrQ06amQRcFhHJvy9xw==,type:str]
|
||||
xmuhk: ENC[AES256_GCM,data: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,iv:/FD0wfUdv26ZDkSneTnAkHoei6+I/YgyNrOfsDTP2Fs=,tag:rKPUUlSmCrD9iEKhZR0+GQ==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsOUJWMm5xT040cEoxQit5
|
||||
ZnhhQWVyWjlnejhzQlEvVVg3ZGVJb05iL1hjCnF5bzFTUTZFYkNQR0k5U0xmOW1t
|
||||
TXhsRHFIeVBBSXc1UURON2M4MDlTMEUKLS0tIGdSbTdZdmdjY0dmNjkrRjd0VkhK
|
||||
eWV6SDJqT1B2MEp1MURkV0E4S3Z0Zm8KX9lEjG4u2QRe1zH+13rbedCWl1B7vvl8
|
||||
2iMHj1qQ4JkCeq83llEH5IuDXKYnKKXSi8l3nU/l6Aw6yx/KHDFK/g==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1m7nrxfw22wvp7pj8y9pdl745w95x89uu8dzl9ppsaazweqf2lqms5yshsp
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2K3VKTVJqMTl2cWxUZHhM
|
||||
OVg5ZjN0VGNpVXQ5M1FKZHloZ0ZnWTZ2ZWowCjJIYTlhRU8wd1JienlUTHIwWXYw
|
||||
eFY1d2MxeStBd013VmszbTUzTkF6U2cKLS0tIDdDNXp4OTdQRjN0MGdIOS9oSldU
|
||||
ZW5PT3VYZWhDMkZUeHViZE41eUhna2sKc8J8mJ8ge9KMb5p6Xi/vRIIXZMEj6Ih+
|
||||
LjLKsgDfMbqNqKaQXSvC3tbvI/dDoiStyCsf4rkTY9QOkyEI80MtXg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-12-12T06:44:16Z"
|
||||
mac: ENC[AES256_GCM,data:/uuP0StTdBz+Z2FddjGDP7i5lZhT0z4vCd22twm6lzp4WkpSklX+YMPRddqvwT/zsJpJIFf1+vK9VtPZBW721SB7AZx4oC1f42adFHjBtSXO3QJPI8cfUx6wdvcjwN3ySXYIcf/qi34ePmFm9amr4xU9jzN1OaZhKUt5Y7kq2LY=,iv:RJUr4u5UKJh9X0xh1lvdE6HWKxnaxKoDi95V3Pj80f8=,tag:D71HJ8LgJrGIu31WV8KaCg==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.9.1
|
||||
@@ -4,7 +4,7 @@ inputs:
|
||||
{
|
||||
nixos =
|
||||
{
|
||||
model.type = "desktop";
|
||||
model = { type = "desktop"; private = true; };
|
||||
system =
|
||||
{
|
||||
fileSystems =
|
||||
@@ -38,18 +38,19 @@ inputs:
|
||||
"broadwell"
|
||||
# FXSR HLE LZCNT PREFETCHW RDRND SAHF SGX XSAVE
|
||||
"skylake" "cascadelake"
|
||||
# SAHF FXSR XSAVE RDRND LZCNT HLE PREFETCHW SGX MOVDIRI MOVDIR64B AVX512VP2INTERSECT KEYLOCKER
|
||||
"tigerlake"
|
||||
# AVX-VNNI CLDEMOTE GFNI-SSE HRESET KL LZCNT MOVDIR64B MOVDIRI PCONFIG PREFETCHW PTWRITE RDRND
|
||||
# SERIALIZE SGX WAITPKG WIDEKL XSAVE XSAVEOPT
|
||||
"alderlake"
|
||||
];
|
||||
githubToken.enable = true;
|
||||
};
|
||||
nixpkgs =
|
||||
{ march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
|
||||
kernel =
|
||||
{
|
||||
# TODO: switch to cachyos-lts
|
||||
variant = "xanmod-latest";
|
||||
variant = "cachyos";
|
||||
patches = [ "hibernate-progress" ];
|
||||
modules.modprobeConfig =
|
||||
[ "options iwlwifi power_save=0" "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ];
|
||||
@@ -59,11 +60,7 @@ inputs:
|
||||
hardware =
|
||||
{
|
||||
cpus = [ "amd" ];
|
||||
gpu =
|
||||
{
|
||||
type = "amd+nvidia";
|
||||
nvidia = { dynamicBoost = true; driver = "beta"; prime.busId = { amd = "6:0:0"; nvidia = "1:0:0"; }; };
|
||||
};
|
||||
gpu = { type = "nvidia"; nvidia = { dynamicBoost = true; driver = "beta"; }; };
|
||||
legion = {};
|
||||
};
|
||||
virtualization =
|
||||
@@ -97,10 +94,7 @@ inputs:
|
||||
[ "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"
|
||||
])
|
||||
[ "log-upload.mihoyo.com" "uspider.yuanshen.com" "ys-log-upload.mihoyo.com" ])
|
||||
++ [{ name = "4006024680.com"; value = "192.168.199.1"; }]
|
||||
);
|
||||
};
|
||||
@@ -110,7 +104,11 @@ inputs:
|
||||
enable = true;
|
||||
serverName = "frp.chn.moe";
|
||||
user = "pc";
|
||||
stcpVisitor."yy.vnc".localPort = 6187;
|
||||
stcpVisitor =
|
||||
{
|
||||
"yy.vnc".localPort = 6187;
|
||||
"temp.ssh".localPort = 6188;
|
||||
};
|
||||
};
|
||||
nix-serve = { enable = true; hostname = "nix-store.chn.moe"; };
|
||||
smartd.enable = true;
|
||||
@@ -123,7 +121,7 @@ inputs:
|
||||
publicKey = "l1gFSDCeBxyf/BipXNvoEvVvLqPgdil84nmr5q6+EEw=";
|
||||
wireguardIp = "192.168.83.3";
|
||||
};
|
||||
gamemode = { enable = true; drmDevice = 1; };
|
||||
gamemode = { enable = true; drmDevice = 0; };
|
||||
slurm =
|
||||
{
|
||||
enable = true;
|
||||
@@ -136,7 +134,7 @@ inputs:
|
||||
gpus."4060" = 1;
|
||||
};
|
||||
partitions.localhost = [ "pc" ];
|
||||
tui = { cpuMpiThreads = 4; cpuOpenmpThreads = 4; gpus = [ "4060" ]; };
|
||||
tui = { cpuQueues = [{ mpiThreads = 4; openmpThreads = 4; }]; gpuIds = [ "4060" ]; };
|
||||
};
|
||||
ollama = {};
|
||||
docker = {};
|
||||
@@ -144,7 +142,7 @@ inputs:
|
||||
keyd = {};
|
||||
};
|
||||
bugs = [ "xmunet" "backlight" "amdpstate" ];
|
||||
packages.android-studio = {};
|
||||
packages = { android-studio = {}; mathematica = {}; };
|
||||
};
|
||||
boot.loader.grub =
|
||||
{
|
||||
@@ -154,6 +152,7 @@ inputs:
|
||||
"SetupBrowser.efi" = ./bios/SetupBrowser.efi;
|
||||
"UiApp.efi" = ./bios/UiApp.efi;
|
||||
"EFI/Boot/Bootx64.efi" = ./bios/Bootx64.efi;
|
||||
"nixos.iso" = inputs.topInputs.self.src.iso;
|
||||
};
|
||||
extraEntries =
|
||||
''
|
||||
@@ -162,6 +161,15 @@ inputs:
|
||||
insmod chain
|
||||
chainloader @bootRoot@/EFI/Boot/Bootx64.efi
|
||||
}
|
||||
menuentry 'Live ISO' {
|
||||
set iso_path=@bootRoot@/nixos.iso
|
||||
export iso_path
|
||||
search --set=root --file "$iso_path"
|
||||
loopback loop "$iso_path"
|
||||
root=(loop)
|
||||
configfile /boot/grub/loopback.cfg
|
||||
loopback --delete loop
|
||||
}
|
||||
'';
|
||||
};
|
||||
# 禁止鼠标等在睡眠时唤醒
|
||||
|
||||
@@ -6,6 +6,7 @@ frp:
|
||||
token: ENC[AES256_GCM,data:0mE8/cWqHKNquCIiqgbjcNhipKk7KEfbZ+qRYbu+iZr7AH9QjfYZQiMJNp4Aa3JWwBLYAnpf,iv:ID4cc8Tn0H9b1CimXlPamMlhlAkafhRApDHo/CCQ4BE=,tag:BUuU/BCj16R7FlKlpubawA==,type:str]
|
||||
stcp:
|
||||
yy.vnc: ENC[AES256_GCM,data:IsZWkNGYHrbQcgvOSURDnA==,iv:4XO8RFBdNopLKYxCACmkXLMPu0wIVx64y0C7m2bsTVA=,tag:fMHzU9aQm0bRr8pTKwpuHQ==,type:str]
|
||||
temp.ssh: ENC[AES256_GCM,data:XG9WpTR8Bw==,iv:XiMTPN8Gx1nNssf4r+VXTvUATiUNsOYJ2jeHjhDSyTs=,tag:JS3NlA4cs/6IA19PJYrStg==,type:str]
|
||||
store:
|
||||
signingKey: ENC[AES256_GCM,data:TsB1nA0Rf2AsYyH59WpUK53pTCX2JdrGQjkJ9A9BfWLLmw3EMnPoaLHG12rv1R2/xRU7rP+iVhXb77g60I/Kn4ehun3ogMmK1oEAKyQcxudBUJFk+SeijaQLr2A=,iv:e2rdGBVOPS1nyC3pXhs5r0WyEkqxcpCnX3eAcBCj93M=,tag:HwccjH2Wms5/TevU2IuzNw==,type:str]
|
||||
nginx:
|
||||
@@ -22,10 +23,18 @@ 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]
|
||||
age: ENC[AES256_GCM,data:EPjip4/tz50e+blPko9NpzDamLRO6BVy64kDnGAhUJJ/bMw6V9Of8RzuiqUupIjEmFiUcgWf9ZsV5RZO3Ai9udq0W7mYS1Y/zn4=,iv:TBs/o6mp8t+S3Ma5/QhnLhzgl852HB3sEzKy9SvKJjU=,tag:2yMUVWPua2g0VOkaXpJzKQ==,type:str]
|
||||
chn:
|
||||
age: ENC[AES256_GCM,data:bxmGYdxcF0OTe8LIVuBUEIs1014k4l/UoN+k90B85FOcTSzeVuSbjpFTRgNDj68MQiqoERGy8mFkKC6pbDFhnlXyns3AsxCnoZw=,iv:U93Lo5JAxJzIdTTuVtMhfirbMA3VSCtP/SoZikDWLyo=,tag:Ld0wZK06PNuvEeXu6PysZQ==,type:str]
|
||||
rsa: ENC[AES256_GCM,data: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,iv:Hy9rTArntNBlYLShRbs7gWL5kcabBd30oH/Ib0vO2LI=,tag:GeibYKs+2b91rA6On6KrcA==,type:str]
|
||||
ed25519: ENC[AES256_GCM,data:zHHSiY9cQ8odPTu9v0kiLQ80ssBrzTLkihVboYdhO04fnH1VakzKNISj1mUZIsixdHGPR1Fd1gBr1sSA8I5tES0QsOjqF777Wwjg8en5foIwgr0Ue5jMFlIdM4VkFZVNQBOV1z8rsc75nEpP+4XiQ57/ca6Nlaye0zIe+8uU+06YO9vfRVE5II67DRAN8aoUeGKW0uiBGIggkxzgPd2+pvQuC1QPbEWwCuNP18azSRqrZW0XnE65tJn4wQhoUQBQIIYWk81CMSBRn5VO0KIaYyVI7VY+Mi+XqgU2223tqaaivt1bDHfhMCsbqXtyWcT8kwZF5s4LyTdK8mKaREwHqen0jRSsaEV0Yfy4Wgq74fSm4oaqAeZLLj0O3/SEDjsWSwdRW2IU6WpT4b9Nh14dBi670Ke2tcwgF3Q4fh7+nPN6nAUPQPtzxPIVrW4FCbB9BV79A4IPLr/dItjC5wrMpw6ibhMe5WF0FAxA0Vuhz3Ob6lqWsai5f+XvrIgObCnyb05Ing40u522dMLYRJt+bP2Xx27cKrgKZTQdZnzSmXdEQGzFH0so4rgMyhNl4DEhr1b2FlnqPbTTLZul,iv:B7lfJnud2IYPtoMPny4jr6xVsLUyIiKC+Q7ztVHuqvs=,tag:ShnpzJBtG5B4xJkPJqATKQ==,type:str]
|
||||
ed25519_sk: ENC[AES256_GCM,data:Zx271cuqIw+rj13VDR/JRY0vSWMwg+mXaxfpePol+vbCmV3LhSa61OSMy2iWIg05Lz3jwf9XE8lUWIAiajNgcLRg3k7ftwpbTCpyxoLE0U0l3DknbccaqM9riSyHX1UxXV0HYIsK5jb+vBjaDTvBqmCTmd91cG9Sn5Zo9GxdklebUeGLVmNe/9ldIaZU1XW8UHWvc2murzjF2HSkYDAMp6eKcnUPSo5u0QVrPVbo6g3iziw7Gwag0Xr/bVfoP7XZHrTobRcse8Sd+apRTinU1bHqcuHFaPwwfHsj/w9VRZJMCpwgg2V4DWyMTKZRjTohN6PUEqBmPc93Ep1DH/E7GmrGvAtBZ2yB9TLhjVoN+xH3ITbur2NtIIN9a3JPnEMoFtJgX4f1YQhUH9c3h6URDxdWtmBe78RxQCMk7OtHZ4UmhKxoUZUJoZuxvnccfQ0QcjtF3RN9rzP/ZPST3Cxvu2yUOPySl27Yp+eKjIOJ3rdorC9D3UhKbbb57O1/ABwPAiRfZjr45+wvgCGnZkOJZiXCiNoYeyw8UHMgvsICZuRM2HHPlh9GX577Np7QSwoFkYiEBFGJBO8=,iv:WWEwRDersTZYC3fEYLjWMtUtcyWXh9gLKyJVpaj73Vw=,tag:bqIFY6oaUMWIqMVfFwe4dw==,type:str]
|
||||
rsa.ppk: ENC[AES256_GCM,data:wCFbvosUbnbikayf/h0Z7gelFGs4quD2WQlZJcBjp4MiXTGYVxj8oNr3y6aqkmpfyoKd2J/vNJeMFEzqXkGVyH4JyvQaiR8zoedFVSWqusD+sq0DuWDzMpdPmosTdM2frqo+w5MHJ87ybCJxynFH5xVC08jbTABFdkLPf+LULmxtipy0Np6UQuO50+XFyT12r1ZxPxj8eXGLg5z0sRSM+97EdJuoA4gpL2butioiIfDJ8RiudnyfhPzoh4V96zZsK8eQ+33HcFQYhKbaPtOcIswK6FkBUyaKCg2odCMFaRtzgFWIKqAuvcMVooEPz8epb0OPajn58rMCwjEfNK0jFaD0yKmdd9ExogDD0cJfp3jK+uuV/UpLUczkk10c2lbNHZ4DHCsNRPgll6DxcOx3zJbF/0ua2Wmbv1VV6JoT58Rzq/Ri8DeeIBuF9tlItFGJpRLnUN0MaHD/V6myggQuo9aAuI9p6VNSJ1aV5noPONi8efeG7kOGe09jQcOmmltHM915khZ7Veu/Oby9ZDCI0TErLzsQiO40Y4NW5B4Gd801CaDPKSxxCdsVgaEWiZU053KzH0qa+0YwXt+ffanRGrY4TtLsrJdEmiF0AnOaWYs/znPkWZXMTSLPTk6Be3yoTfxxq1ggT6AWF9p9/nlMPdhkfLUrOnAV6uQq3fStKFq3gTCyHxNZ5dx/XyrN96Kd3OTCgflJbD8lCqABSH9jZwfdh06HZ74pB15yNGFLvhOIhJwn5E0H+WW26MkFUnDSWHz1R0vIJEKnyy3lSPRweFM2MxAtEMOBOjqvlN0C32oCEoKknM6t/S3s4lwlMtUrqsAme4uYlUzPbEVPmzzMRpYhr+UM+MoG4nmovtRrIOL0ELunU6nsEaxxiHymCwGWJDyD/7W9lh93lV3dGP7X87IcfTt9rTUj6+YJS2pqkycZRtnPWkVDlzkS/I8MOL90jIEk0/YkTRWbB5GDcJ8a878mKW0/YPcpfC6MbRsYPo6eDz4KIGKxHDPezRfnOJC/gs72rIrEiC6h7bfW+XGye5VwvMtZefXFjCVyh+ZVco45UPertfLqT9Ewr1mfo5SfgaBJHSs58IuV2vXyfIJeIdO8BXS/YEUxcmWAI9PG1gOJz9lSHbyrm8RtnXZ+f8NJNOT2m7zyF1cYfscGaQ0gTTSP6+0uSTWsZOYuc8rObFP5OU/99yIkDXZv8gVG9YrlAjP1RtwXSlsbzj9EYlUUNQyKYoMnZDwTQL9qlqQVuP2ndL7QpRg8lusnFHZGivgyNWZ6bae3QWe2yTgD5BaXH00u4sktdZsPHAVa6p3XMppmoSuVX63FVsimJ5qzDJp+yRhIbUAPD8KwHYrGLkV/q6SBV8Der184m/MbACv3dCGf3RHzrx4LWWtrpaqntTTbUrQo/BJagY6Vyb22kmFs2gpBB6VJJc4Srq+6RbuQq7Oo2PNaHjbLxkhFIqTRX7Z1/m0nvbuLIN3HIqtxzBEAod0vDUAhEF+Vw92tSTJmirEM4pEDrQn7v1klp67f+40Hlxt5dTXiOZO9fXr0jTF7Or5pnRxSQ9FvlzPDcMuaaiDuBBzVQABZC9wBNCWzUIhAF/RGXqv4Xs1oIpLrWzeg7Vo2QVHRTXEZn1mxnX4LOVFAfkvV6U09NW8T35qU7QyTqzl06jHqAutEPTU4Se6w9FqMEDZ2lMUZ83iO1u6Yj859mFLFRIguhK+cIFzIUOfcwUFKEH5RV741zx1wN2UMac3jgQwzkV70gz6h1Kwbb5B02FZCEaW0222A7A7oSkzuYFD7qZNrQTlsdeqsrsjp9XC95TZBBw/mEE62xp4sLV9UTgKOGSyERigawFfoUAlE8XGrbMIaHUgKBJKTMXAe7Ljc3HIaHczwUJAnYDsu48Pan1KZpF4CsiBO6H2lDVXfKl8GuePd9QkVgi9GFqulA9rWypk4hg==,iv:/O35CB1rNDim/CKsot0sWMM+qEN96vqr9Z4fVG1A3Dg=,tag:pKbid3MCW2I5XouRNXSk8Q==,type:str]
|
||||
xmuhk: ENC[AES256_GCM,data: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,iv:gdfp0dUqeJegQuoExquRV9GTtMo3eL1LWFKYOm5REkw=,tag:jsSkfWALdHsoNevaYkJyhA==,type:str]
|
||||
user:
|
||||
#ENC[AES256_GCM,data:a4mHxr7bn7BV,iv:FYQk3yv3XgxNO9CnrQefo3WqhO0Sf8Mihfp+Iw4AcWM=,tag:jebxvG+xUidghf5dOlvDYA==,type:comment]
|
||||
zzn: ENC[AES256_GCM,data:xBSve41JclBYQULPN7yV/1Eyo3u+CHAewVetKHwjvl6Te0kk/+aLx6gs8EpOJGmVaiSAdt6F2ayHXUD8RXXpJIOnnEHk88kqbw==,iv:XPxMLvlVtaZvpWnau5Jwlj/5ty5Zyw4F44ix5G64Z84=,tag:uJfWb0PCebdMtxXMfueULQ==,type:str]
|
||||
wechat2tg:
|
||||
token: ENC[AES256_GCM,data:PrZWR8WiZ7grkpTLqMxwbnkwZttl7n0e1lc1mdHJiFUWq/PqG2wNBC27C58jMg==,iv:02XHhfpN8YPix0REbJDnsBbvCwifbdwBwfuJ2glbvjo=,tag:6aWNqBfwulsjMbl+D6L9vw==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
@@ -50,8 +59,8 @@ sops:
|
||||
OUlxNjdQaXdXMkZ6bnV1ek4yZ2dpbkEKpKGOAxo5Eef2jtGrg4iSzmGCeg+vTgvu
|
||||
+K8b+O19MIkGMDBm6UbYUPtc/7eqoEZRiTUzNMTmfkLVS4ul5zou9A==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-09-04T01:39:48Z"
|
||||
mac: ENC[AES256_GCM,data:VkpF9zTWRLMriukAif6lfp8uy6+IcPDYUnXCQ5XLUtSstEyUoaVBjn+VVAoKkLX3MnyR6gyiYVWDDJmXrsyNoQpjRVQR0yu0p6p7sB3voGKiNxhw5qGwZj4IIXnHFWvktgWiawCiUkmSTUUHxe0XjAh7AWxjGqgAs/oyWGq/YfE=,iv:IQbJAhW/y18s57CAwRPeypQreBqQb0KkJAgIZ90QXJU=,tag:a0AB3l83j31Ex6PH9ziHRg==,type:str]
|
||||
lastmodified: "2024-12-14T01:12:53Z"
|
||||
mac: ENC[AES256_GCM,data:Ak+LR+PkQG1g9wwlfLtDN2Dm8GdGfbb0qA9Spb3X0LkdCSFLBWqW0Jf88gHB0j/4HszYVaCAUFs+OlTvTjOtboOCTM7tH6z3dd0sU+EMHeK9cPz9kmDlF1LFFhD8dyqytEwq8/xN2MlTmbVoYQvVoGsrD8tP0B9NBPaQiLMPcrQ=,iv:9DthG+HGB3lCxb85YpfitNw2PWYwpdqWTo660gTOUew=,tag:yAH6o3LkGfvKF1UOdgWyyQ==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.9.0
|
||||
version: 3.9.1
|
||||
|
||||
@@ -63,7 +63,11 @@ inputs:
|
||||
fdtd = [ "srv1-node2" ];
|
||||
all = [ "srv1-node0" "srv1-node1" "srv1-node2" "srv1-node3" ];
|
||||
};
|
||||
tui = { cpuMpiThreads = 8; cpuOpenmpThreads = 10; };
|
||||
tui.cpuQueues =
|
||||
[
|
||||
{ mpiThreads = 8; openmpThreads = 10; }
|
||||
{ name = "old"; mpiThreads = 8; openmpThreads = 4; }
|
||||
];
|
||||
setupFirewall = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
inputs:
|
||||
{
|
||||
imports = inputs.localLib.mkModules [ inputs.topInputs.nixos-hardware.nixosModules.microsoft-surface-pro-intel ];
|
||||
config =
|
||||
{
|
||||
nixos =
|
||||
{
|
||||
model.type = "desktop";
|
||||
system =
|
||||
{
|
||||
fileSystems =
|
||||
{
|
||||
mount =
|
||||
{
|
||||
vfat."/dev/disk/by-uuid/4596-D670" = "/boot";
|
||||
btrfs."/dev/mapper/root1" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
|
||||
};
|
||||
luks.auto =
|
||||
{
|
||||
"/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";
|
||||
nix = { substituters = [ "https://nix-store.chn.moe?priority=100" ]; githubToken.enable = true; };
|
||||
kernel = { variant = "xanmod-latest"; patches = [ "surface" "hibernate-progress" ]; };
|
||||
};
|
||||
hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };
|
||||
services =
|
||||
{
|
||||
snapper.enable = true;
|
||||
sshd = {};
|
||||
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"
|
||||
]);
|
||||
};
|
||||
wireguard =
|
||||
{
|
||||
enable = true;
|
||||
peers = [ "vps6" ];
|
||||
publicKey = "j7qEeODVMH31afKUQAmKRGLuqg8Bxd0dIPbo17LHqAo=";
|
||||
wireguardIp = "192.168.83.5";
|
||||
};
|
||||
beesd.instances.root = { device = "/"; hashTableSizeMB = 512; };
|
||||
waydroid = {};
|
||||
docker = {};
|
||||
};
|
||||
bugs = [ "xmunet" "suspend-hibernate-no-platform" ];
|
||||
};
|
||||
powerManagement.resumeCommands = ''${inputs.pkgs.systemd}/bin/systemctl restart iptsd'';
|
||||
services.iptsd.config =
|
||||
{
|
||||
Touchscreen = { DisableOnPalm = true; DisableOnStylus = true; Overshoot = 0.5; };
|
||||
Contacts = { Neutral = "Average"; NeutralValue = 10; };
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
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]
|
||||
age: ENC[AES256_GCM,data:KEaMrk9eldR6oCqNqSpwhbJKj+JrN1KBkDL5p9itaszGf4tnDRidcleCQi1Ae17osYXIEh4+OxX/d6RKb9TP6JMLJe0iq6c9sC8=,iv:ztiP2Vz4AFZkd8ZG7xYlqYrV3JZYvmX07Ez6GtJ6yp0=,tag:PS8oSkkrrpgYYVfjbTtkaQ==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzV1pvWkVGSFg5TVAvRlhu
|
||||
TnFnMEszcDRWWHlQanAyRkRpQWdqQkdhTzFvCjBqUG4xNFBiRnlSeTNQSmdkVkdD
|
||||
UlVCQjRFVExuZHdrSnViajZGZ3c2dWsKLS0tIHlQYU5VeGpEQzllMmxLSnJZZzZx
|
||||
N1R3Mkhxa0dOVlJiU0V2OEZVVzZVMFkKae3c1axl22uxh9wMygAHs6q1WA5ImOS8
|
||||
uzKSthWSqtC7DMqgUFaaSjBYM2TN3l402syx71xVFyyAmCcGZbbJcg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1ck5vzs0xqx0jplmuksrkh45xwmkm2t05m2wyq5k2w2mnkmn79fxs6tvl3l
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCSHJVRGIwQUFpVER5SWxq
|
||||
YjJOT0lXN3dFOFpjMFlWV3JCbmZFN0hnNEJBClpQUEczK2RWTGlVTmJRbVZaUC8y
|
||||
bEFrL1RjTTNlYVNnRVRBZlRjaTlnUEEKLS0tIE5GM01pTGFFcWVVSWEvUHE3Z08r
|
||||
a2xybTRFUFZZN20zajZJTVNwVEpGcEEKglmFMk7z1q5IlZ+lZf9M0HtknmvcYt/P
|
||||
2/z5e8wLN1Hy0Zsbv0yIL/NmqwxAOGJOdzz7ElJszk/Y4kUr9aRasg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-09-01T15:22:09Z"
|
||||
mac: ENC[AES256_GCM,data:Br2+miNeZI41QyTXdhJ5Mdwq5no/d4kJgESwiltcRZV/Pax8R+GFeLDg/AQFoh1fLHU6bTX45SN0wnIrIeCnkoXV0U2RiT7bdtBaDrGxqnFvjMVE0VaUrj9bpagta13tahsEfI17cyUq4BqwS4BXx60RXvbvs9jZ5/dfpYunGsc=,iv:FfWYfS40XcFgF8lEYK4IHypLzz7svFxPL+WuudQm3oA=,tag:0KDBdf7w6BdcQ8Qt3k1isg==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.9.0
|
||||
@@ -1,44 +0,0 @@
|
||||
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" = "/"; };
|
||||
};
|
||||
};
|
||||
luks.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://nix-store.chn.moe?priority=100" ];
|
||||
initrd.sshd = {};
|
||||
networking = {};
|
||||
};
|
||||
services =
|
||||
{
|
||||
snapper.enable = true;
|
||||
sshd = {};
|
||||
fail2ban = {};
|
||||
beesd.instances.root = { device = "/"; hashTableSizeMB = 64; };
|
||||
xray.server = { serverName = "xserver.vps4.chn.moe"; userNumber = 4; };
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
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
|
||||
@@ -78,7 +78,7 @@ inputs:
|
||||
wireguard =
|
||||
{
|
||||
enable = true;
|
||||
peers = [ "pc" "nas" "vps7" "surface" "xmupc1" "xmupc2" "pi3b" "srv1-node0" ];
|
||||
peers = [ "pc" "nas" "one" "vps7" "xmupc1" "xmupc2" "pi3b" "srv1-node0" ];
|
||||
publicKey = "AVOsYUKQQCvo3ctst3vNi8XSVWo1Wh15066aHh+KpF4=";
|
||||
wireguardIp = "192.168.83.1";
|
||||
listenIp = "74.211.99.69";
|
||||
|
||||
@@ -14,7 +14,7 @@ xray-server:
|
||||
user3: ENC[AES256_GCM,data:r+6jXaIj4HJoYLnJcnjJB+WEZlGaoSy/ktc1Aw77hFtNrrGp,iv:P+YUKns1yaOZokH5WkDB0jssGyHg3ncc54tF1PyA7Oc=,tag:/pxMEr7l4ye5EDAOsllxJA==,type:str]
|
||||
#ENC[AES256_GCM,data:4gqZh391hg==,iv:No22DrD6EBs2FA4/qH8msWEjs20fc+ZpEeZep+HIv+c=,tag:aHrYNbI83POI4PRj1nd+Yw==,type:comment]
|
||||
user4: ENC[AES256_GCM,data:ujiml/r4aFiKOkSJkaD/KE8rKuBtLSnpZREBH3vRJUzDT0QM,iv:a3VFlXpMLNFihvFa7gloANtHmBLg4szTL5LTm8E2kNs=,tag:W9KZ1GAVx9IBKfda7Zedng==,type:str]
|
||||
#ENC[AES256_GCM,data:PTYBkBHs16U=,iv:qr3u7OveM1CmTBIf9gZK4fTRuLCpcZCwf8jmnd1L3Co=,tag:w3O41NG7yCwCVqPGh/6SXA==,type:comment]
|
||||
#ENC[AES256_GCM,data:AzzKMw==,iv:Z73ISOLhPWP40wTy8PucY3KaB9nS7WQECK3tZFYC1ao=,tag:KJuiCODhHyDl5bXInUSI5g==,type:comment]
|
||||
user5: ENC[AES256_GCM,data:iDuLRb4dhLUOjpamioMwoTYrn7Cy+Ln4SaedVXkwVD05rjJ0,iv:AqzBBvLpJuIJCUJq0IyDcHrlqb0e84nQC0c94Rj85uw=,tag:0xou1i/iwAxGngO74OIMXg==,type:str]
|
||||
#ENC[AES256_GCM,data:D5xiJW0Oyg==,iv:9a/6myiT9Crf/fff6ZkXj/obW2k95cABUNqQdPmcwcc=,tag:chs8BA8YtVkM9m3Ey9ETlA==,type:comment]
|
||||
user6: ENC[AES256_GCM,data:YzLlf37SxKmU1/QA7gUIJsGid3KZNoAGOew8xR7cmw5l8ZmX,iv:SfKubo2jfjtxKn9odDiokMEZyPFfYZ/wwyYtBrgvgmM=,tag:+hxwIU5uBhzQyrKX4r3oiw==,type:str]
|
||||
@@ -24,7 +24,7 @@ xray-server:
|
||||
user8: ENC[AES256_GCM,data:H1gPtqF8vryD0rVH7HYzpMuZ3lufOBYczKwaTr4PidQtTyQK,iv:wh7NwFc/1ogNrnTTpm5L9dBqDVkvWiIsJZelR2mtR4Q=,tag:oEFdMFZJ9UYhsSVdefJ4rg==,type:str]
|
||||
#ENC[AES256_GCM,data:aYWIiLxs1UvupQ==,iv:AisokHuAzD5B6fEF6ak8WfAe151CM3a8MsaWC4uJPnw=,tag:cdk5S4n9ulyWrqsD+jcqYg==,type:comment]
|
||||
user9: ENC[AES256_GCM,data:HVK9KvGfOcwn1joc3VrkjBjE6hrxQPOBD5RTtQUgBPepToh6,iv:VK9aQ64L/GajpledBxC8PNB1BdNYEqwcdL3GKttgxvs=,tag:O/piztCYBARtAFxTMNXGaA==,type:str]
|
||||
#ENC[AES256_GCM,data:b839t/OihMOmz0gIcTo43r2MIw==,iv:8kaAFG7DhFOoitcvbFaAvE1NUSLFrFhy1KiMrqs4r/c=,tag:G4vSADa52ZfN5y5ytoFJoQ==,type:comment]
|
||||
#ENC[AES256_GCM,data:eCl1bK4=,iv:oYA2CFW6OGGrRYx6OHRYJpbEyFh575UjztvHaXA8UG8=,tag:Pw7xsisQB2Dd0KJeWFq6bQ==,type:comment]
|
||||
user10: ENC[AES256_GCM,data:xjVkr/wy7OxRuNZKfQagfNxdVxTEyQP1ZhnR6jHy2gjBQ0RD,iv:G6iOBCHOqlvfEENY/ega/TUm81wgT2OOdZKZ6bPfg9o=,tag:p8AMa3bGsIl0hWQ09lSzgA==,type:str]
|
||||
#ENC[AES256_GCM,data:+s3MMeNU5Q==,iv:CUrg+nNxCpJFbHQmMNXmSE+JcZK6Dfu8cGwtznx3CFY=,tag:G5CYMtao+hz3hs0fPVPmcw==,type:comment]
|
||||
user11: ENC[AES256_GCM,data:BIZ2zRgGv5/9AexiZZvu+m4A62YUWtAkjWWMu89GteqpWMBq,iv:13IJcDf18LjoxJk7uoKnuFZT6Ihxrxsy7DBaAaiFqus=,tag:RN7wj+uPneCkqNlMRyYrXw==,type:str]
|
||||
@@ -91,8 +91,8 @@ sops:
|
||||
ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
|
||||
ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-09-26T04:24:17Z"
|
||||
mac: ENC[AES256_GCM,data:AXhLmyZWGD6KvMkyHqmCERE6eNE3pD5Pa/9mRBWZe4hiXL4mKTzCn5C/ODGQ1ZeQjDdP+awjJRvLRjMiYFhVlU8rKpg/f2G1gDr4cIbr61sCdzXKX8wFW0G7bJWxxpAC4X59+u9EJ3sNcyf7bJrMdkTzTYpgXh29mtl2bprcdJQ=,iv:pK4hYexcWng3GwOmWGqgyMsmATnXgcwR3NH4UxCwpvE=,tag:zpv64JWoXc5cDCukDuW51g==,type:str]
|
||||
lastmodified: "2024-12-14T12:02:33Z"
|
||||
mac: ENC[AES256_GCM,data:2iQLMkj/qg+TQodFXqCaSOhj1G2NGGr1ZEDewDm/6H2zteppgEw4vRls5GPUrxTQnC22NHKqih7REWa0Xv7L4eALkxrVYqWkPVcxvlt1RauW8XrW1JJhhLj+E/52AKqOxGd1CviuyyQS2M2cZzk1t3gNDpSZ8YdmhjYPUHk2SCA=,iv:imFhB5A4LZYhE3NqIbQazMqBzEtdv/c6r7DcY9yJqKE=,tag:eRTl/1vbmI3YsLLEyFyIAg==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.9.0
|
||||
version: 3.9.1
|
||||
|
||||
@@ -47,7 +47,7 @@ inputs:
|
||||
photoprism.enable = true;
|
||||
nextcloud = {};
|
||||
freshrss.enable = true;
|
||||
send.enable = true;
|
||||
send = {};
|
||||
huginn.enable = true;
|
||||
fz-new-order = {};
|
||||
httpapi.enable = true;
|
||||
|
||||
@@ -82,7 +82,7 @@ inputs:
|
||||
gpus = { "p5000" = 1; "3090" = 1; "4090" = 1; };
|
||||
};
|
||||
partitions.localhost = [ "xmupc1" ];
|
||||
tui = { cpuMpiThreads = 3; cpuOpenmpThreads = 4; gpus = [ "p5000" "3090" "4090" ]; };
|
||||
tui = { cpuQueues = [{ mpiThreads = 3; openmpThreads = 4; }]; gpuIds = [ "p5000" "3090" "4090" ]; };
|
||||
};
|
||||
xrdp = { enable = true; hostname = [ "xmupc1.chn.moe" ]; };
|
||||
samba =
|
||||
@@ -96,7 +96,7 @@ inputs:
|
||||
docker = {};
|
||||
};
|
||||
bugs = [ "xmunet" "amdpstate" ];
|
||||
user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "lly" "yxf" ];
|
||||
user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "lly" "yxf" "hss" ];
|
||||
};
|
||||
services.hardware.bolt.enable = true;
|
||||
};
|
||||
|
||||
@@ -81,7 +81,7 @@ inputs:
|
||||
gpus."4090" = 1;
|
||||
};
|
||||
partitions.localhost = [ "xmupc2" ];
|
||||
tui = { cpuMpiThreads = 8; cpuOpenmpThreads = 10; gpus = [ "4090" ]; };
|
||||
tui = { cpuQueues = [{ mpiThreads = 8; openmpThreads = 10; }]; gpuIds = [ "4090" ]; };
|
||||
};
|
||||
xrdp = { enable = true; hostname = [ "xmupc2.chn.moe" ]; };
|
||||
samba = { enable = true; hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; };
|
||||
@@ -89,7 +89,7 @@ inputs:
|
||||
docker = {};
|
||||
};
|
||||
bugs = [ "xmunet" ];
|
||||
user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "lly" "yxf" ];
|
||||
user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "lly" "yxf" "hss" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
433
flake.lock
generated
433
flake.lock
generated
@@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731957371,
|
||||
"narHash": "sha256-Tf+U5UyjPrmohVywWcrtOT+Cxluo4gJVKpaPlBp8KRg=",
|
||||
"lastModified": 1733424321,
|
||||
"narHash": "sha256-obLH8dKxNw7ycfTV3Z2y3QppUkzg8iK5LFZXTJFeb14=",
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "203abb8943a35d6163762bc42042b5b41d9910f3",
|
||||
"rev": "53127d1f8c12fd4fa460b2e5d56178f32763e97d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -25,11 +25,11 @@
|
||||
"blog": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731678142,
|
||||
"narHash": "sha256-glOzOvJtNts0MR/Upt88pEPFWk5j0c97LVxwU1Ld0QA=",
|
||||
"lastModified": 1733321482,
|
||||
"narHash": "sha256-xSEMEFZQFdyYEQi9cK6wNqvqSSMbsGvqEA+mtyUC7QQ=",
|
||||
"ref": "refs/heads/public",
|
||||
"rev": "54e09b242cd29e987c43a3205b96f5a0db40bd0a",
|
||||
"revCount": 7,
|
||||
"rev": "91de30ed2cedf45ba1dc1962f853994e4bb8f5d2",
|
||||
"revCount": 10,
|
||||
"type": "git",
|
||||
"url": "https://git.chn.moe/chn/blog-public.git"
|
||||
},
|
||||
@@ -41,11 +41,11 @@
|
||||
"blurred-wallpaper": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1727825457,
|
||||
"narHash": "sha256-P/N7g/cl2K0R4NKebfqZnr9WQkHPSvHNbKbWiOxs76k=",
|
||||
"lastModified": 1733129997,
|
||||
"narHash": "sha256-Z+CJzAxI72L4dwLEPiK4A/nA7vHnZeJPFJDdoCfUuPw=",
|
||||
"owner": "bouteillerAlan",
|
||||
"repo": "blurredwallpaper",
|
||||
"rev": "09f8a0812fa45321fe29a1491809a39e884c8989",
|
||||
"rev": "a56efd0c2bd04bcc8babdccc5c6aa12e030d2477",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -61,11 +61,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726983918,
|
||||
"narHash": "sha256-eRGl50mhbJRT9Mk2NbePr6yzxzZRygndx4O7kObVa3g=",
|
||||
"lastModified": 1736213063,
|
||||
"narHash": "sha256-Ux/KRFONsbp97N/O7vK1OC7huF2tFgrfVaScUTMpVYc=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "7370c1d1ef2421608e1355368361af92777a2c6c",
|
||||
"revCount": 940,
|
||||
"rev": "cd3730c07eb2358b81a5fc96706ba64ecf38d321",
|
||||
"revCount": 941,
|
||||
"type": "git",
|
||||
"url": "https://git.chn.moe/chn/bscpkgs.git"
|
||||
},
|
||||
@@ -76,11 +76,11 @@
|
||||
},
|
||||
"catppuccin": {
|
||||
"locked": {
|
||||
"lastModified": 1731232837,
|
||||
"narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
|
||||
"lastModified": 1734057772,
|
||||
"narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
|
||||
"rev": "20b6328df20ae45752c81311d225fd47cba32483",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -101,11 +101,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732400024,
|
||||
"narHash": "sha256-uf1QzIl0Jj5dr7+erWjHWiCUEvywLaR7ir1jcqGgjeQ=",
|
||||
"lastModified": 1734087975,
|
||||
"narHash": "sha256-dQYXdA5zGKZ1G5HfPj9Gjf0JRGwXexl/dC9oZW5xOec=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc",
|
||||
"rev": "1174e016e517f60a8cfe00f0a5785e4c8bd17b53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -149,11 +149,11 @@
|
||||
"date": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732291332,
|
||||
"narHash": "sha256-J03NjeFJ0FXDrKfiGHEJkztfJxG+Nkw9OCgubMOBDwQ=",
|
||||
"lastModified": 1733528075,
|
||||
"narHash": "sha256-lT9R5EHrGkx2ttxf3Muu3lyHIezI8Mn/fEuBi8vTCtY=",
|
||||
"owner": "HowardHinnant",
|
||||
"repo": "date",
|
||||
"rev": "f079e3568c9c42f20bd40209b5667f030147069a",
|
||||
"rev": "28b7b232521ace2c8ef3f2ad4126daec3569c14f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -186,11 +186,11 @@
|
||||
"eigen": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732246759,
|
||||
"narHash": "sha256-d0SmmQpiC7/7EIwstnHVcMqRZQV5BLW+HvzrDIT1iSM=",
|
||||
"lastModified": 1733870909,
|
||||
"narHash": "sha256-hUVxiyRX4ctyYPS+yDsuQ8D/Uby9ocZV2u0fRQZc2Y4=",
|
||||
"owner": "libeigen",
|
||||
"repo": "eigen",
|
||||
"rev": "8ad4344ca79f2f248bc5ed70eec72e4b9c4d5e88",
|
||||
"rev": "af59ada0accc722ebd930ec65340156dbe62ffa1",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -208,11 +208,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729588101,
|
||||
"narHash": "sha256-cU03PTbxdiRkUCV13Lo3Z2jdqRqz8WhPuhzujadO6nk=",
|
||||
"lastModified": 1734001261,
|
||||
"narHash": "sha256-Rvsgt7cYy/hEh/NmbZ0vzlfJ/yxZ/SycsHdSu/XTuBg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "envfs",
|
||||
"rev": "2b6934ea38fa77bd5a97ba8f0be4ba8540e0e773",
|
||||
"rev": "916c0236acaeaf49935fb8149b079cb4f8e23e41",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -221,6 +221,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fancy-motd": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1736229765,
|
||||
"narHash": "sha256-EJGrEfuno6p7aDNcfo5SNGK0ytMZV7mA3zxrOHsK+Sw=",
|
||||
"owner": "CHN-beta",
|
||||
"repo": "fancy-motd",
|
||||
"rev": "75e6dc700589ac43c7de5a8f92c6909bd6ca4eb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "CHN-beta",
|
||||
"repo": "fancy-motd",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -256,11 +272,11 @@
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -344,11 +360,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -362,11 +378,11 @@
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -447,24 +463,6 @@
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_5": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
@@ -482,11 +480,11 @@
|
||||
"git-lfs-transfer": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731677931,
|
||||
"narHash": "sha256-upY3xdwFbWpch9m2Sj+vlDdpbl4dKipPCUISfwvFxoc=",
|
||||
"lastModified": 1733970275,
|
||||
"narHash": "sha256-rC86eu1Xy9xoE2jI8hdW8k6ZeJmbZ/N4i0PMfLidRvI=",
|
||||
"owner": "charmbracelet",
|
||||
"repo": "git-lfs-transfer",
|
||||
"rev": "b9a7efddbdc611f46ee0b2aed0a8f7d7ca4fb889",
|
||||
"rev": "e0340c3da857a4092c725c01ddb0ab85465b5b97",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -536,11 +534,11 @@
|
||||
"hextra": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731583139,
|
||||
"narHash": "sha256-aFpdS/V0B/4ZUXN+FImf2tuXUUYzP5+6jNGyQwZV1ps=",
|
||||
"lastModified": 1733875116,
|
||||
"narHash": "sha256-1TYxO9U4/IL5a0lShswRULi0XwWtkNC3fNOs3390qY4=",
|
||||
"owner": "imfing",
|
||||
"repo": "hextra",
|
||||
"rev": "86a1f3fd9638a65c70fb7892964a396df22409a0",
|
||||
"rev": "0c90c1aa500dd1da473c474202b38fb82bcb5188",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -574,11 +572,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732466619,
|
||||
"narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
|
||||
"lastModified": 1733951536,
|
||||
"narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f3111f62a23451114433888902a55cf0692b408d",
|
||||
"rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -612,11 +610,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732032028,
|
||||
"narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=",
|
||||
"lastModified": 1733859890,
|
||||
"narHash": "sha256-HnA6z2l2W38TJBarvWCcxjTjcpz7JrDj2u2umjYFcEo=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "65dc04371cf914c9af4f073638821e4787303005",
|
||||
"rev": "77ffd839fd9d60d139dc4a2ad6b6d526f4ad5a17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -628,11 +626,11 @@
|
||||
"lepton": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731757089,
|
||||
"narHash": "sha256-vvCu9LQxi9Sfh2kjfipLu01tO/XOTUsMYR40ubiXL8E=",
|
||||
"lastModified": 1732916886,
|
||||
"narHash": "sha256-8sRUGrKcSBDzqIjACR7eRfn4VzFbL3zfRB8GDsNKO5A=",
|
||||
"owner": "black7375",
|
||||
"repo": "Firefox-UI-Fix",
|
||||
"rev": "190aa839e659c4975d91f80f19cd493021f8bc7a",
|
||||
"rev": "e5eff553fd4e33750157232a262d6430a7610e87",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -641,30 +639,14 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"linux-surface": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729447945,
|
||||
"narHash": "sha256-DmYbfi7scxWDHlqZA7ZidCnpMexC34+T4DA7yTs5GAI=",
|
||||
"owner": "linux-surface",
|
||||
"repo": "linux-surface",
|
||||
"rev": "260b202ade51ae01f4bf5f4a5516559bd5f04973",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "linux-surface",
|
||||
"repo": "linux-surface",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lmod": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732128616,
|
||||
"narHash": "sha256-uAN5MKOmiKZk4djyRPwvd8euLM/LE5yykzQjlhVL8ZU=",
|
||||
"lastModified": 1734125811,
|
||||
"narHash": "sha256-eytDTLzRIbQ2M0wn4IVJkmOetoljX/SsdSnDU00i1GE=",
|
||||
"owner": "TACC",
|
||||
"repo": "Lmod",
|
||||
"rev": "b46bcc82b9b37700b84bb0283cec172eda01e5eb",
|
||||
"rev": "1dce13ccf52af75d952e3eb3268716af6e2d7882",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -742,11 +724,11 @@
|
||||
"nc4nix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732503843,
|
||||
"narHash": "sha256-w3BMcrXpwwp0RZApDMNqs8KEQepzQ5N2roliMgN5wT8=",
|
||||
"lastModified": 1734145476,
|
||||
"narHash": "sha256-NaOMdgIQN2iyYeyY+vuFKPmkWqHmq2Ha4vPH+XlGaqc=",
|
||||
"owner": "helsinki-systems",
|
||||
"repo": "nc4nix",
|
||||
"rev": "8368895f664e4fe300183ebd965629ac79378be6",
|
||||
"rev": "f85fa25b1e66bc64eeac126b6a354583bf0e8117",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -757,11 +739,11 @@
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1732304879,
|
||||
"narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=",
|
||||
"lastModified": 1734128415,
|
||||
"narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "c84579946c03c996916be0fb6e1340f444c277af",
|
||||
"rev": "8bdc2540da516006d07b04019eb57ae0781a04b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -793,27 +775,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"poetry2nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729742964,
|
||||
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -821,11 +782,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732519917,
|
||||
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
|
||||
"lastModified": 1733629314,
|
||||
"narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
|
||||
"rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -842,11 +803,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732519917,
|
||||
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
|
||||
"lastModified": 1733629314,
|
||||
"narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
|
||||
"rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -864,31 +825,17 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732499683,
|
||||
"narHash": "sha256-Hw95rpgNiyAL4v9pJF2756PMud6O0p/1XQixs5f/Shk=",
|
||||
"lastModified": 1733536536,
|
||||
"narHash": "sha256-gTlpRSELDSHMRa1/BwZR7eX5mka5y3YQbb1efLuyovs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "b376bfa567fd25f9f22b6f51ffaa4f84d0b7c72f",
|
||||
"rev": "7aa26ebccf778efe880fda1290db9c1da56ffa4f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1732536142,
|
||||
"narHash": "sha256-DlwQrOBZET55+tOy2eO3DdAmH9B5xSQzj0TcuWClyF8=",
|
||||
"owner": "CHN-beta",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "20d99c009ced76a49be02d7ba709b2ce5378c806",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "CHN-beta",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "7aa26ebccf778efe880fda1290db9c1da56ffa4f",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@@ -926,11 +873,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1732698814,
|
||||
"narHash": "sha256-YY5C05PuviuPbNwNvgE31B4vCY0frFVDaKkJJOPeVUk=",
|
||||
"lastModified": 1734506497,
|
||||
"narHash": "sha256-QUO9YrOn10xSfc4Ov84GqbQclQPZwi4SPZC644HdNDc=",
|
||||
"owner": "CHN-beta",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "118675e11354b79593944bbd2a14f752bee02695",
|
||||
"rev": "94a86525c9e4fe0221191f6d6aa01d6186e0628b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -958,11 +905,11 @@
|
||||
},
|
||||
"nixpkgs-23.11": {
|
||||
"locked": {
|
||||
"lastModified": 1716265408,
|
||||
"narHash": "sha256-i5aFF2iw707QrRvLNiLG936p3GXXulDMTKSknhBGwYI=",
|
||||
"lastModified": 1735377590,
|
||||
"narHash": "sha256-U9W9H/HYoaKa5wzSL2IBmnFDhxlesuKAcKi/hl5xPvE=",
|
||||
"owner": "CHN-beta",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c64afe35ab605d20caf19e4bff3ff816b1944c24",
|
||||
"rev": "0c3e74a65634ae3f43be7d0f6c3b5156ac54747b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -974,11 +921,11 @@
|
||||
},
|
||||
"nixpkgs-24_05": {
|
||||
"locked": {
|
||||
"lastModified": 1731797254,
|
||||
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
|
||||
"lastModified": 1734017764,
|
||||
"narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
|
||||
"rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -990,14 +937,14 @@
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1730504152,
|
||||
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
||||
"lastModified": 1733096140,
|
||||
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
@@ -1019,11 +966,11 @@
|
||||
"nu-scripts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732251065,
|
||||
"narHash": "sha256-8w9//q58zPhGXCfXZeI7FS1UUD2JgBw49X62uFEI7jw=",
|
||||
"lastModified": 1734012351,
|
||||
"narHash": "sha256-2pFJyrPdyxlXNYVhDUOD2q/XW11rwrpELy8TCcSK2oM=",
|
||||
"owner": "nushell",
|
||||
"repo": "nu_scripts",
|
||||
"rev": "dee0e7efcd9387da8e94f35c38472b9d4e7c225f",
|
||||
"rev": "cc62dd7f0f9905d75baff0d892fb273fa718ff70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1046,11 +993,11 @@
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732386739,
|
||||
"narHash": "sha256-87sRkBmTkL72K04IoxiwexeYfq35hS5FEbE/6AIAk+c=",
|
||||
"lastModified": 1734072047,
|
||||
"narHash": "sha256-xS5y5L7jq92SLvbxG6Cd2c0CaeGRhGOOANKUkCrsEgI=",
|
||||
"owner": "linyinfeng",
|
||||
"repo": "nur-packages",
|
||||
"rev": "11589e3ac45c5e16a3bb25a24f851bae284957dc",
|
||||
"rev": "c93b951be69e03e6efebb2241d91ccbafcfa845c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1072,11 +1019,11 @@
|
||||
"treefmt-nix": "treefmt-nix_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732529571,
|
||||
"narHash": "sha256-x7rE2y5xTurtDcdKQIkg/6agZ+yJS/KkNOCg4fs5Qc4=",
|
||||
"lastModified": 1734175698,
|
||||
"narHash": "sha256-7p7OJ2lN55VZ877xS6LPGGxDhMUlfAVGzqNSGks63Z4=",
|
||||
"owner": "xddxdd",
|
||||
"repo": "nur-packages",
|
||||
"rev": "9e811ec5e489bb1a338bf53a2b8c0e2bcb0ef986",
|
||||
"rev": "fb21a3226365ba09f00f2b497be7d62a5f01f9e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1101,11 +1048,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732172653,
|
||||
"narHash": "sha256-GVjVivAz2AW7WNqpWTA5Uy9vN8Wh/3pjuZRFhsGVk24=",
|
||||
"lastModified": 1732501185,
|
||||
"narHash": "sha256-Z0BpHelaGQsE5VD9hBsBHsvMU9h+Xt0kfkDJyFivZOU=",
|
||||
"owner": "berberman",
|
||||
"repo": "nvfetcher",
|
||||
"rev": "15778ffefbeed7224594301161b0a204a76177bb",
|
||||
"rev": "bdb14eab6fe9cefc29efe01e60c3a3f616d6b62a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1164,11 +1111,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732465698,
|
||||
"narHash": "sha256-xiue+Kj2Jm8PwyZQcHl4CaYmMIgo5oi37hVHqiw2Unk=",
|
||||
"lastModified": 1733858086,
|
||||
"narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=",
|
||||
"owner": "pjones",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "16d65cd02b5de665d1bcfec1616c02c71a1014a6",
|
||||
"rev": "7e2010249529931a3848054d5ff0dbf24675ab68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1180,11 +1127,11 @@
|
||||
"pocketfft": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722531938,
|
||||
"narHash": "sha256-1kfMW9xGHtYiiCD4Qh4rXEuAi9EIzJ4lR+YLGjqzoaU=",
|
||||
"lastModified": 1732968445,
|
||||
"narHash": "sha256-Fu786IHiU6Bl66gZ/UJmqOROjlya3viLyzOxwdZVi9c=",
|
||||
"owner": "mreineck",
|
||||
"repo": "pocketfft",
|
||||
"rev": "bb87ca50df0478415a12d9011dc374eeed4e9d93",
|
||||
"rev": "0fa0ef591e38c2758e3184c6c23e497b9f732ffa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1193,30 +1140,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"poetry2nix": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nix-github-actions": "nix-github-actions_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_5",
|
||||
"treefmt-nix": "treefmt-nix_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731205797,
|
||||
"narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_5",
|
||||
@@ -1228,11 +1151,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732021966,
|
||||
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
|
||||
"lastModified": 1733665616,
|
||||
"narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
|
||||
"rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1244,11 +1167,11 @@
|
||||
"py4vasp": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731589693,
|
||||
"narHash": "sha256-Y+Y9xzxHZ4+qZgXSCSVILqcTp6Z9n8TM2NxHlIMm2xY=",
|
||||
"lastModified": 1733761634,
|
||||
"narHash": "sha256-3Q8WCAZksmlfVKP6YtvG1iA9tbN5Wq0/ztba5OrZlZY=",
|
||||
"owner": "vasp-dev",
|
||||
"repo": "py4vasp",
|
||||
"rev": "3596b6ab92df6618426f3fdfce1da614f085c712",
|
||||
"rev": "ac58bf6b4d842b1ab93ac46bf9aee607ef836f43",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1264,11 +1187,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732453966,
|
||||
"narHash": "sha256-gjNXCgbBT+XTe+EHuX2JCW2I/L46MGT0ZfYMCZYkoSg=",
|
||||
"lastModified": 1734082636,
|
||||
"narHash": "sha256-MPfWOIp1XOYQRh6XGDE72kbkmP5Hlp4/XZnOONulu1k=",
|
||||
"owner": "Nix-QChem",
|
||||
"repo": "NixOS-QChem",
|
||||
"rev": "bf677ae4ceaf4f3a3f2a4f203f9f46126c579910",
|
||||
"rev": "c9240e243c59bd3999458cd565507ab2796074df",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1291,6 +1214,7 @@
|
||||
"date": "date",
|
||||
"eigen": "eigen",
|
||||
"envfs": "envfs",
|
||||
"fancy-motd": "fancy-motd",
|
||||
"git-lfs-transfer": "git-lfs-transfer",
|
||||
"gricad": "gricad",
|
||||
"hextra": "hextra",
|
||||
@@ -1298,7 +1222,6 @@
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
"lepton": "lepton",
|
||||
"linux-surface": "linux-surface",
|
||||
"lmod": "lmod",
|
||||
"matplotplusplus": "matplotplusplus",
|
||||
"misskey": "misskey",
|
||||
@@ -1308,7 +1231,6 @@
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-wallpaper": "nixos-wallpaper",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-23.05": "nixpkgs-23.05",
|
||||
@@ -1319,7 +1241,6 @@
|
||||
"openxlsx": "openxlsx",
|
||||
"plasma-manager": "plasma-manager",
|
||||
"pocketfft": "pocketfft",
|
||||
"poetry2nix": "poetry2nix",
|
||||
"py4vasp": "py4vasp",
|
||||
"qchem": "qchem",
|
||||
"rsshub": "rsshub",
|
||||
@@ -1341,11 +1262,11 @@
|
||||
"rsshub": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732525101,
|
||||
"narHash": "sha256-9gsT7wtMnYGgNSkeLj9Qbt3spGoFHomsqD/iLV3/xpo=",
|
||||
"lastModified": 1734135595,
|
||||
"narHash": "sha256-D0mAiHuAFLMBZvBzspbqAlqXXdhYG45fhrYVkCdmA48=",
|
||||
"owner": "DIYgod",
|
||||
"repo": "RSSHub",
|
||||
"rev": "d17b40b53931892fcdf986a1e14e67759f7ed558",
|
||||
"rev": "3a8d34ee3f8cc38907296e74e923754297e249d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1357,11 +1278,11 @@
|
||||
"rycee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732479769,
|
||||
"narHash": "sha256-barZy95JsQt4G9EDZ7RNrjgTneelXXfSzRLJJvokjsI=",
|
||||
"lastModified": 1734149010,
|
||||
"narHash": "sha256-KZytuAK2m+YTXnRY88sIMmVLJTpxc8yGWukkJlQiad4=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "80bf66046d8b8624c5991a0c8e512b211acce2b2",
|
||||
"rev": "a51fd7b8d7221a806c1ece4bcca2db387d555ba1",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -1409,11 +1330,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732186149,
|
||||
"narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
|
||||
"lastModified": 1733965552,
|
||||
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
|
||||
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1457,11 +1378,11 @@
|
||||
"stickerpicker": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1718796561,
|
||||
"narHash": "sha256-RKAAHve17lrJokgAPkM2k/E+f9djencwwg3Xcd70Yfw=",
|
||||
"lastModified": 1733177811,
|
||||
"narHash": "sha256-1n7bPSCRw7keTCIu4tJGnUlkoId6H1+dPsTPzKo3Rrk=",
|
||||
"owner": "maunium",
|
||||
"repo": "stickerpicker",
|
||||
"rev": "333567f481e60443360aa7199d481e1a45b3a523",
|
||||
"rev": "89d3aece041c85ebe5a1ad4e620388af5227cbb0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1530,35 +1451,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_5": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "systems",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"systems_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tgbot-cpp": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -1604,11 +1496,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732292307,
|
||||
"narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
|
||||
"lastModified": 1733761991,
|
||||
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "705df92694af7093dfbb27109ce16d828a79155f",
|
||||
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1625,32 +1517,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732292307,
|
||||
"narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
|
||||
"lastModified": 1733761991,
|
||||
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "705df92694af7093dfbb27109ce16d828a79155f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_4": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"poetry2nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730120726,
|
||||
"narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
|
||||
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1662,11 +1533,11 @@
|
||||
"ufo": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732177086,
|
||||
"narHash": "sha256-zmrzTQGXkR54igJUhYp0pFqS2RdV69Wi/wgyFME/K+E=",
|
||||
"lastModified": 1735033622,
|
||||
"narHash": "sha256-9/stVpqNKMUXEQHQWuU1mKVe8ODVpOjL5BYIdfY0P8A=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "28e4d29f2c70d1f3b80a092b75b81a4793455980",
|
||||
"revCount": 65,
|
||||
"rev": "d4578c7991e48140b6f885b2acb110776b56040c",
|
||||
"revCount": 76,
|
||||
"type": "git",
|
||||
"url": "https://git.chn.moe/chn/ufo.git"
|
||||
},
|
||||
@@ -1711,7 +1582,7 @@
|
||||
"winapps": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_6",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
||||
10
flake.nix
10
flake.nix
@@ -10,7 +10,11 @@
|
||||
sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
nix-vscode-extensions =
|
||||
{
|
||||
url = "github:nix-community/nix-vscode-extensions?rev=7aa26ebccf778efe880fda1290db9c1da56ffa4f";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
qchem = { url = "github:Nix-QChem/NixOS-QChem/master"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
plasma-manager =
|
||||
@@ -19,7 +23,6 @@
|
||||
inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
|
||||
};
|
||||
nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
nixos-hardware.url = "github:CHN-beta/nixos-hardware";
|
||||
envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak";
|
||||
chaotic =
|
||||
@@ -30,7 +33,6 @@
|
||||
gricad = { url = "github:Gricad/nur-packages"; flake = false; };
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
bscpkgs = { url = "git+https://git.chn.moe/chn/bscpkgs.git"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
poetry2nix = { url = "github:nix-community/poetry2nix"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
winapps = { url = "github:winapps-org/winapps/feat-nix-packaging"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
aagl = { url = "github:ezKEa/aagl-gtk-on-nix/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
|
||||
@@ -48,7 +50,6 @@
|
||||
rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; };
|
||||
blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; flake = false; };
|
||||
slate = { url = "github:TheBigWazz/Slate"; flake = false; };
|
||||
linux-surface = { url = "github:linux-surface/linux-surface"; flake = false; };
|
||||
lepton = { url = "github:black7375/Firefox-UI-Fix"; flake = false; };
|
||||
lmod = { url = "github:TACC/Lmod"; flake = false; };
|
||||
mumax = { url = "github:CHN-beta/mumax"; flake = false; };
|
||||
@@ -68,6 +69,7 @@
|
||||
ufo = { url = "git+https://git.chn.moe/chn/ufo.git"; flake = false; };
|
||||
highfive = { url = "git+https://github.com/CHN-beta/HighFive?submodules=1"; flake = false; };
|
||||
stickerpicker = { url = "github:maunium/stickerpicker"; flake = false; };
|
||||
fancy-motd = { url = "github:CHN-beta/fancy-motd"; flake = false; };
|
||||
};
|
||||
|
||||
outputs = inputs: let localLib = import ./flake/lib.nix inputs.nixpkgs.lib; in
|
||||
|
||||
@@ -23,7 +23,7 @@ builtins.listToAttrs
|
||||
];
|
||||
};
|
||||
})
|
||||
[ "nas" "pc" "pi3b" "surface" "vps4" "vps6" "vps7" "xmupc1" "xmupc2" ])
|
||||
[ "nas" "pc" "pi3b" "vps6" "vps7" "xmupc1" "xmupc2" "one" ])
|
||||
++ (builtins.map
|
||||
(node:
|
||||
{
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
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; };
|
||||
glaze = pkgs.pkgsStatic.glaze.overrideAttrs
|
||||
(prev: { cmakeFlags = prev.cmakeFlags ++ [ "-Dglaze_ENABLE_FUZZING=OFF" ]; });
|
||||
# pkgsStatic.clangStdenv have a bug
|
||||
# https://github.com/NixOS/nixpkgs/issues/177129
|
||||
biu = pkgs.pkgsStatic.localPackages.biu.override { stdenv = pkgs.pkgsStatic.gcc14Stdenv; };
|
||||
biu = pkgs.pkgsStatic.localPackages.biu.override { stdenv = pkgs.pkgsStatic.gcc14Stdenv; inherit glaze; };
|
||||
in pkgs.pkgsStatic.localPackages.hpcstat.override
|
||||
{
|
||||
inherit openssh duc biu;
|
||||
|
||||
@@ -1,4 +1,39 @@
|
||||
{ inputs }: let inherit (inputs.self.packages.x86_64-linux) pkgs; in
|
||||
{
|
||||
git-lfs-transfer = "sha256-V2cnWCyzxwxlOXXTB8Kz4X4VHvu0H/SqHBzPFwlp73o=";
|
||||
git-lfs-transfer = "sha256-qHQeBI2b8EmUinowixqEuR6iGwNYQy3pSc8iPVfJemE=";
|
||||
nvhpc =
|
||||
{
|
||||
src = pkgs.fetchurl
|
||||
{
|
||||
url = "https://developer.download.nvidia.com/hpc-sdk/24.11/nvhpc_2024_2411_Linux_x86_64_cuda_12.6.tar.gz";
|
||||
sha256 = "080rb89p2z98b75wqssvp3s8x6b5n0556d0zskh3cfapcb08lh1r";
|
||||
};
|
||||
version = "24.11";
|
||||
cudaVersion = "12.6";
|
||||
};
|
||||
iso = pkgs.fetchurl
|
||||
{
|
||||
url = "https://releases.nixos.org/nixos/24.11/nixos-24.11beta709057.0c582677378f"
|
||||
+ "/nixos-plasma6-24.11beta709057.0c582677378f-x86_64-linux.iso";
|
||||
sha256 = "000wmfn6k5awqwsx9qldhdgahv4k09w4yzmvf0djs51qjdpha082";
|
||||
};
|
||||
nglview = pkgs.fetchPypi
|
||||
{
|
||||
pname = "nglview";
|
||||
version = "3.1.2";
|
||||
hash = "sha256-f2cu+itsoNs03paOW1dmsUsbPa3iEtL4oIPGAKETRc4=";
|
||||
};
|
||||
vtst =
|
||||
{
|
||||
patch = pkgs.fetchzip
|
||||
{
|
||||
url = "http://theory.cm.utexas.edu/code/vtstcode-204.tgz";
|
||||
sha256 = "00qpqiabl568fwqjnmwqwr0jwg7s56xd9lv9lw8q4qxqy19cpg62";
|
||||
};
|
||||
script = pkgs.fetchzip
|
||||
{
|
||||
url = "http://theory.cm.utexas.edu/code/vtstscripts.tgz";
|
||||
sha256 = "18gsw2850ig1mg4spp39i0ygfcwx0lqnamysn5whiax22m8d5z67";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,7 +24,6 @@ inputs:
|
||||
[
|
||||
topInputs.qchem.overlays.default
|
||||
topInputs.bscpkgs.overlays.default
|
||||
topInputs.poetry2nix.overlays.default
|
||||
topInputs.aagl.overlays.default
|
||||
(final: prev:
|
||||
{
|
||||
|
||||
@@ -4,8 +4,7 @@ inputs:
|
||||
{
|
||||
hostname = mkOption { type = types.nonEmptyStr; };
|
||||
type = mkOption { type = types.enum [ "minimal" "desktop" "server" ]; default = "minimal"; };
|
||||
# not implemented yet
|
||||
# private = mkOption { type = types.bool; };
|
||||
private = mkOption { type = types.bool; default = false; };
|
||||
cluster = mkOption
|
||||
{
|
||||
type = types.nullOr (types.submodule { options =
|
||||
|
||||
@@ -3,30 +3,23 @@ inputs:
|
||||
imports = inputs.localLib.findModules ./.;
|
||||
options.nixos.packages.packages = let inherit (inputs.lib) mkOption types; in
|
||||
{
|
||||
extraPackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
excludePackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
extraPythonPackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
excludePythonPackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
extraPrebuildPackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
excludePrebuildPackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
_packages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
_pythonPackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
_prebuildPackages = mkOption { type = types.listOf types.unspecified; default = []; };
|
||||
_pythonEnvFlags = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
|
||||
_vscodeEnvFlags = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
|
||||
};
|
||||
config =
|
||||
{
|
||||
environment.systemPackages = with inputs.config.nixos.packages.packages;
|
||||
(inputs.lib.lists.subtractLists excludePackages (_packages ++ extraPackages))
|
||||
_packages
|
||||
++ [
|
||||
(inputs.pkgs.python3.withPackages (pythonPackages:
|
||||
inputs.lib.lists.subtractLists
|
||||
(builtins.concatLists (builtins.map (packageFunction: packageFunction pythonPackages)
|
||||
excludePythonPackages))
|
||||
(builtins.concatLists (builtins.map (packageFunction: packageFunction pythonPackages)
|
||||
(_pythonPackages ++ extraPythonPackages)))))
|
||||
(
|
||||
(inputs.pkgs.python3.withPackages (pythonPackages:
|
||||
builtins.concatLists (builtins.map (packageFunction: packageFunction pythonPackages) _pythonPackages)))
|
||||
.override (prev: { makeWrapperArgs = prev.makeWrapperArgs or [] ++ _pythonEnvFlags; }))
|
||||
(inputs.pkgs.writeTextDir "share/prebuild-packages"
|
||||
(builtins.concatStringsSep "\n" (builtins.map builtins.toString
|
||||
(inputs.lib.lists.subtractLists excludePrebuildPackages (_prebuildPackages ++ extraPrebuildPackages)))))
|
||||
(builtins.concatStringsSep "\n" (builtins.map builtins.toString _prebuildPackages)))
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ inputs:
|
||||
# download
|
||||
qbittorrent nur-xddxdd.baidupcs-go wgetpaste onedrive onedrivegui rclone
|
||||
# editor
|
||||
typora # appflowy notion-app-enhanced joplin-desktop standardnotes logseq
|
||||
typora appflowy notion-app-enhanced joplin-desktop standardnotes logseq
|
||||
# news
|
||||
fluent-reader rssguard newsflash newsboat
|
||||
# nix tools
|
||||
@@ -65,14 +65,14 @@ inputs:
|
||||
google-chrome tor-browser microsoft-edge
|
||||
# office
|
||||
crow-translate zotero pandoc libreoffice-qt texliveFull poppler_utils pdftk pdfchain davinci-resolve
|
||||
ydict texstudio panoply
|
||||
ydict texstudio panoply pspp
|
||||
# matplot++ needs old gnuplot
|
||||
inputs.pkgs."pkgs-23.11".gnuplot
|
||||
# math, physics and chemistry
|
||||
octaveFull root ovito localPackages.vesta localPackages.v-sim jmol mpi localPackages.ufo
|
||||
(mathematica.overrideAttrs (prev: { postInstall = (prev.postInstall or "") + "ln -s ${prev.src} $out/src"; }))
|
||||
octaveFull ovito localPackages.vesta localPackages.v-sim jmol mpi geogebra6 localPackages.ufo
|
||||
(quantum-espresso.override { stdenv = gcc14Stdenv; gfortran = gfortran14;
|
||||
wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; }; })
|
||||
wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; }; })
|
||||
inputs.pkgs."pkgs-23.11".hdfview
|
||||
# virtualization
|
||||
virt-viewer bottles wineWowPackages.stagingFull genymotion playonlinux
|
||||
# media
|
||||
|
||||
13
modules/packages/mathematica.nix
Normal file
13
modules/packages/mathematica.nix
Normal file
@@ -0,0 +1,13 @@
|
||||
inputs:
|
||||
{
|
||||
options.nixos.packages.mathematica = let inherit (inputs.lib) mkOption types; in mkOption
|
||||
{
|
||||
type = types.nullOr (types.submodule {});
|
||||
default = null;
|
||||
};
|
||||
config = let inherit (inputs.config.nixos.packages) mathematica; in inputs.lib.mkIf (mathematica != null)
|
||||
{
|
||||
nixos.packages.packages._packages = [ (inputs.pkgs.mathematica.overrideAttrs
|
||||
(prev: { postInstall = (prev.postInstall or "") + "ln -s ${prev.src} $out/src"; })) ];
|
||||
};
|
||||
}
|
||||
151
modules/packages/root/17253.patch
Normal file
151
modules/packages/root/17253.patch
Normal file
@@ -0,0 +1,151 @@
|
||||
From 1d2acc921853825af02059183b683c35f5075302 Mon Sep 17 00:00:00 2001
|
||||
From: chn <chn@chn.moe>
|
||||
Date: Wed, 11 Dec 2024 22:33:40 +0800
|
||||
Subject: [PATCH] add C++23 support
|
||||
|
||||
---
|
||||
graf3d/eve7/inc/ROOT/REveCaloData.hxx | 4 ++--
|
||||
graf3d/eve7/src/REveCaloData.cxx | 3 +++
|
||||
interpreter/cling/lib/Interpreter/CIFactory.cpp | 15 +++++++++++----
|
||||
.../Interpreter/IncrementalCUDADeviceCompiler.cpp | 2 ++
|
||||
.../cling/tools/Jupyter/kernel/clingkernel.py | 4 ++--
|
||||
.../inc/RooStats/HistFactory/HistRef.h | 3 +--
|
||||
.../inc/RooFit/Detail/NormalizationHelpers.h | 3 +--
|
||||
7 files changed, 22 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/graf3d/eve7/inc/ROOT/REveCaloData.hxx b/graf3d/eve7/inc/ROOT/REveCaloData.hxx
|
||||
index 79d2e7069504c..33152334730f4 100644
|
||||
--- a/graf3d/eve7/inc/ROOT/REveCaloData.hxx
|
||||
+++ b/graf3d/eve7/inc/ROOT/REveCaloData.hxx
|
||||
@@ -174,7 +174,7 @@ protected:
|
||||
|
||||
public:
|
||||
REveCaloData(const char* n="REveCaloData", const char* t="");
|
||||
- ~REveCaloData() override {}
|
||||
+ ~REveCaloData() override;
|
||||
|
||||
void FillImpliedSelectedSet(Set_t& impSelSet, const std::set<int>& sec_idcs) override;
|
||||
|
||||
@@ -220,7 +220,7 @@ public:
|
||||
Bool_t GetWrapTwoPi() const { return fWrapTwoPi; }
|
||||
void SetWrapTwoPi(Bool_t w) { fWrapTwoPi=w; }
|
||||
|
||||
- void SetSelector(REveCaloDataSelector* iSelector) { fSelector.reset(iSelector); }
|
||||
+ void SetSelector(REveCaloDataSelector* iSelector);
|
||||
REveCaloDataSelector* GetSelector() { return fSelector.get(); }
|
||||
|
||||
Int_t WriteCoreJson(nlohmann::json &j, Int_t rnr_offset) override;
|
||||
diff --git a/graf3d/eve7/src/REveCaloData.cxx b/graf3d/eve7/src/REveCaloData.cxx
|
||||
index a5248f3c51d39..dc19d7d1be4a4 100644
|
||||
--- a/graf3d/eve7/src/REveCaloData.cxx
|
||||
+++ b/graf3d/eve7/src/REveCaloData.cxx
|
||||
@@ -129,6 +129,9 @@ REveCaloData::REveCaloData(const char* n, const char* t):
|
||||
// Constructor.
|
||||
}
|
||||
|
||||
+REveCaloData::~REveCaloData() {}
|
||||
+void REveCaloData::SetSelector(REveCaloDataSelector* iSelector) { fSelector.reset(iSelector); }
|
||||
+
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// Process newly selected cells with given select-record.
|
||||
|
||||
diff --git a/interpreter/cling/lib/Interpreter/CIFactory.cpp b/interpreter/cling/lib/Interpreter/CIFactory.cpp
|
||||
index 385c03682575d..d33ce3a0039c5 100644
|
||||
--- a/interpreter/cling/lib/Interpreter/CIFactory.cpp
|
||||
+++ b/interpreter/cling/lib/Interpreter/CIFactory.cpp
|
||||
@@ -61,14 +61,18 @@ using namespace cling;
|
||||
|
||||
namespace {
|
||||
static constexpr unsigned CxxStdCompiledWith() {
|
||||
+ // The value of __cplusplus in GCC < 14 is 202100L when -std=c++2b or
|
||||
+ // -std=c++23 is specified, thus we relax the check to 202100L.
|
||||
+#if __cplusplus >= 202100L
|
||||
+ return 23;
|
||||
+#elif __cplusplus > 201703L
|
||||
+ return 20;
|
||||
+#elif __cplusplus > 201402L
|
||||
+ return 17;
|
||||
// The value of __cplusplus in GCC < 5.0 (e.g. 4.9.3) when
|
||||
// either -std=c++1y or -std=c++14 is specified is 201300L, which fails
|
||||
// the test for C++14 or more (201402L) as previously specified.
|
||||
// I would claim that the check should be relaxed to:
|
||||
-#if __cplusplus > 201703L
|
||||
- return 20;
|
||||
-#elif __cplusplus > 201402L
|
||||
- return 17;
|
||||
#elif __cplusplus > 201103L || (defined(_WIN32) && _MSC_VER >= 1900)
|
||||
return 14;
|
||||
#elif __cplusplus >= 201103L
|
||||
@@ -941,6 +945,8 @@ namespace {
|
||||
// Sanity check that clang delivered the language standard requested
|
||||
if (CompilerOpts.DefaultLanguage(&LangOpts)) {
|
||||
switch (CxxStdCompiledWith()) {
|
||||
+ case 23: assert(LangOpts.CPlusPlus23 && "Language version mismatch");
|
||||
+ LLVM_FALLTHROUGH;
|
||||
case 20: assert(LangOpts.CPlusPlus20 && "Language version mismatch");
|
||||
LLVM_FALLTHROUGH;
|
||||
case 17: assert(LangOpts.CPlusPlus17 && "Language version mismatch");
|
||||
@@ -1343,6 +1349,7 @@ namespace {
|
||||
// and by enforcing the std version now cling is telling clang what to
|
||||
// do, rather than after clang has dedcuded a default.
|
||||
switch (CxxStdCompiledWith()) {
|
||||
+ case 23: argvCompile.emplace_back("-std=c++23"); break;
|
||||
case 20: argvCompile.emplace_back("-std=c++20"); break;
|
||||
case 17: argvCompile.emplace_back("-std=c++17"); break;
|
||||
case 14: argvCompile.emplace_back("-std=c++14"); break;
|
||||
diff --git a/interpreter/cling/lib/Interpreter/IncrementalCUDADeviceCompiler.cpp b/interpreter/cling/lib/Interpreter/IncrementalCUDADeviceCompiler.cpp
|
||||
index ac6bd0e89444e..a492add8a01fc 100644
|
||||
--- a/interpreter/cling/lib/Interpreter/IncrementalCUDADeviceCompiler.cpp
|
||||
+++ b/interpreter/cling/lib/Interpreter/IncrementalCUDADeviceCompiler.cpp
|
||||
@@ -117,6 +117,8 @@ namespace cling {
|
||||
cppStdVersion = "-std=c++1z";
|
||||
if (langOpts.CPlusPlus20)
|
||||
cppStdVersion = "-std=c++20";
|
||||
+ if (langOpts.CPlusPlus23)
|
||||
+ cppStdVersion = "-std=c++23";
|
||||
|
||||
if (cppStdVersion.empty())
|
||||
llvm::errs()
|
||||
diff --git a/interpreter/cling/tools/Jupyter/kernel/clingkernel.py b/interpreter/cling/tools/Jupyter/kernel/clingkernel.py
|
||||
index 17fcbd116ecc6..17b4d24f23d86 100644
|
||||
--- a/interpreter/cling/tools/Jupyter/kernel/clingkernel.py
|
||||
+++ b/interpreter/cling/tools/Jupyter/kernel/clingkernel.py
|
||||
@@ -90,8 +90,8 @@ def _banner_default(self):
|
||||
flush_interval = Float(0.25, config=True)
|
||||
|
||||
std = CaselessStrEnum(default_value='c++11',
|
||||
- values = ['c++11', 'c++14', 'c++1z', 'c++17', 'c++20', 'c++2b'],
|
||||
- help="C++ standard to use, either c++2b, c++20, c++17, c++1z, c++14 or c++11").tag(config=True);
|
||||
+ values = ['c++11', 'c++14', 'c++1z', 'c++17', 'c++20', 'c++2b', 'c++23' ],
|
||||
+ help="C++ standard to use, either c++23, c++2b, c++20, c++17, c++1z, c++14 or c++11").tag(config=True);
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super(ClingKernel, self).__init__(**kwargs)
|
||||
diff --git a/roofit/histfactory/inc/RooStats/HistFactory/HistRef.h b/roofit/histfactory/inc/RooStats/HistFactory/HistRef.h
|
||||
index 7db9765004e0d..5b37542e6bdea 100644
|
||||
--- a/roofit/histfactory/inc/RooStats/HistFactory/HistRef.h
|
||||
+++ b/roofit/histfactory/inc/RooStats/HistFactory/HistRef.h
|
||||
@@ -12,8 +12,7 @@
|
||||
#define HISTFACTORY_HISTREF_H
|
||||
|
||||
#include <memory>
|
||||
-
|
||||
-class TH1;
|
||||
+#include <TH1.h>
|
||||
|
||||
namespace RooStats{
|
||||
namespace HistFactory {
|
||||
diff --git a/roofit/roofitcore/inc/RooFit/Detail/NormalizationHelpers.h b/roofit/roofitcore/inc/RooFit/Detail/NormalizationHelpers.h
|
||||
index c66954d0f0549..a849d7c2c8b4b 100644
|
||||
--- a/roofit/roofitcore/inc/RooFit/Detail/NormalizationHelpers.h
|
||||
+++ b/roofit/roofitcore/inc/RooFit/Detail/NormalizationHelpers.h
|
||||
@@ -70,8 +70,7 @@ template <class T>
|
||||
std::unique_ptr<T> compileForNormSet(T const &arg, RooArgSet const &normSet)
|
||||
{
|
||||
RooFit::Detail::CompileContext ctx{normSet};
|
||||
- std::unique_ptr<RooAbsArg> head = arg.compileForNormSet(normSet, ctx);
|
||||
- return std::unique_ptr<T>{static_cast<T *>(head.release())};
|
||||
+ return std::unique_ptr<T>{static_cast<T *>(arg.compileForNormSet(normSet, ctx).release())};
|
||||
}
|
||||
|
||||
} // namespace Detail
|
||||
22
modules/packages/root/17273.patch
Normal file
22
modules/packages/root/17273.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
From ab80270dd50f4ae08e452daa3fd0eccc7f9f96ee Mon Sep 17 00:00:00 2001
|
||||
From: Danilo Piparo <danilo.piparo@cern.ch>
|
||||
Date: Sat, 14 Dec 2024 07:45:22 +0100
|
||||
Subject: [PATCH 1/2] [CMake] Allow to process cxx23 option
|
||||
|
||||
---
|
||||
cmake/modules/CheckCompiler.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
|
||||
index 883bf0e2daed1..c2ac5df869797 100644
|
||||
--- a/cmake/modules/CheckCompiler.cmake
|
||||
+++ b/cmake/modules/CheckCompiler.cmake
|
||||
@@ -161,7 +161,7 @@ set(CMAKE_CXX_STANDARD ${CXX_STANDARD_STRING} CACHE STRING "")
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
|
||||
set(CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "")
|
||||
|
||||
-if(NOT CMAKE_CXX_STANDARD MATCHES "17|20")
|
||||
+if(NOT CMAKE_CXX_STANDARD MATCHES "17|20|23")
|
||||
message(FATAL_ERROR "Unsupported C++ standard: ${CMAKE_CXX_STANDARD}. Supported standards are: 17, 20.")
|
||||
endif()
|
||||
|
||||
31
modules/packages/root/default.nix
Normal file
31
modules/packages/root/default.nix
Normal file
@@ -0,0 +1,31 @@
|
||||
inputs:
|
||||
{
|
||||
options.nixos.packages.root = let inherit (inputs.lib) mkOption types; in mkOption
|
||||
{ type = types.nullOr (types.submodule {}); default = {}; };
|
||||
config = let inherit (inputs.config.nixos.packages) root; in inputs.lib.mkIf (root != null)
|
||||
{
|
||||
nixos.packages.packages =
|
||||
let
|
||||
root = inputs.pkgs.root.overrideAttrs (prev:
|
||||
{
|
||||
patches = prev.patches or [] ++ [ ./17253.patch ./17273.patch ];
|
||||
cmakeFlags = prev.cmakeFlags ++ [ "-DCMAKE_CXX_STANDARD=23" ];
|
||||
});
|
||||
jupyterPath = inputs.pkgs.jupyter-kernel.create { definitions.root = rec
|
||||
{
|
||||
displayName = "ROOT";
|
||||
language = "c++";
|
||||
argv = [ "/run/current-system/sw/bin/python3" "-m" "JupyROOT.kernel.rootkernel" "-f" "{connection_file}" ];
|
||||
logo64 = "${root}/etc/root/notebook/kernels/root/logo-64x64.png";
|
||||
logo32 = inputs.pkgs.runCommand "logo-32x32.png" {}
|
||||
"${inputs.pkgs.imagemagick}/bin/convert ${logo64} -resize 32x32 $out";
|
||||
};};
|
||||
in
|
||||
{
|
||||
_packages = [ root ];
|
||||
_pythonPackages = [(pythonPackages: with pythonPackages; [ metakernel notebook ])];
|
||||
_pythonEnvFlags = [ "--prefix JUPYTER_PATH : ${jupyterPath}" "--suffix NIX_PYTHONPATH : ${root}/lib" ];
|
||||
_vscodeEnvFlags = [ "--prefix JUPYTER_PATH : ${jupyterPath}" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,7 @@ inputs:
|
||||
[
|
||||
# basic tools
|
||||
beep dos2unix gnugrep pv tmux screen parallel tldr cowsay jq yq zellij ipfetch localPackages.pslist
|
||||
fastfetch reptyr duc ncdu progress libva-utils ksh neofetch
|
||||
fastfetch reptyr duc ncdu progress libva-utils ksh neofetch dateutils
|
||||
# lsxx
|
||||
pciutils usbutils lshw util-linux lsof dmidecode lm_sensors hwloc acpica-tools
|
||||
# top
|
||||
@@ -36,7 +36,7 @@ inputs:
|
||||
# development
|
||||
gdb try inputs.topInputs.plasma-manager.packages.${inputs.pkgs.system}.rc2nix rr hexo-cli gh nix-init hugo
|
||||
# stupid things
|
||||
toilet lolcat localPackages.stickerpicker
|
||||
toilet lolcat localPackages.stickerpicker graph-easy
|
||||
# office
|
||||
pdfgrep ffmpeg-full # todo-txt-cli
|
||||
]
|
||||
|
||||
@@ -7,16 +7,6 @@ inputs:
|
||||
services.openssh.knownHosts =
|
||||
let servers =
|
||||
{
|
||||
vps4 =
|
||||
{
|
||||
ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIF7Y0tjt1XLPjqJ8HEB26W9jVfJafRQ3pv5AbPaxEc/Z";
|
||||
hostnames = [ "vps4.chn.moe" "104.234.37.61" ];
|
||||
};
|
||||
"initrd.vps4" =
|
||||
{
|
||||
ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIJkOPTFvX9f+Fn/KHOIvUgoRiJfq02T42lVGQhpMUGJq";
|
||||
hostnames = [ "initrd.vps4.chn.moe" "104.234.37.61" ];
|
||||
};
|
||||
vps6 =
|
||||
{
|
||||
ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIO5ZcvyRyOnUCuRtqrM/Qf+AdUe3a5bhbnfyhw2FSLDZ";
|
||||
@@ -47,15 +37,15 @@ inputs:
|
||||
ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIAoMu0HEaFQsnlJL0L6isnkNZdRq0OiDXyaX3+fl3NjT";
|
||||
hostnames = [ "initrd.nas.chn.moe" "192.168.1.2" ];
|
||||
};
|
||||
surface =
|
||||
one =
|
||||
{
|
||||
ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIFdm3DcfHdcLP0oSpVrWwIZ/b9lZuakBSPwCFz2BdTJ7";
|
||||
hostnames = [ "192.168.1.4" "wireguard.surface.chn.moe" "192.168.83.5" ];
|
||||
ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIC5i2Z/vK0D5DBRg3WBzS2ejM0U+w3ZPDJRJySdPcJ5d";
|
||||
hostnames = [ "wireguard.one.chn.moe" "192.168.1.4" "192.168.83.5" ];
|
||||
};
|
||||
pc =
|
||||
{
|
||||
ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIMSfREi19OSwQnhdsE8wiNwGSFFJwNGN0M5gN+sdrrLJ";
|
||||
hostnames = [ "wireguard.pc.chn.moe" "[office.chn.moe]:3673" "192.168.1.105" "192.168.83.3" ];
|
||||
hostnames = [ "wireguard.pc.chn.moe" "[office.chn.moe]:3673" "192.168.1.3" "192.168.83.3" ];
|
||||
};
|
||||
hpc =
|
||||
{
|
||||
@@ -131,10 +121,10 @@ inputs:
|
||||
(
|
||||
(builtins.map
|
||||
(host: { name = host; value = { inherit host; hostname = "${host}.chn.moe"; }; })
|
||||
[ "vps4" "vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.nas" ])
|
||||
[ "vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.nas" "wireguard.one" ])
|
||||
++ (builtins.map
|
||||
(host: { name = host; value = { inherit host; hostname = "${host}.chn.moe"; forwardX11 = true; }; })
|
||||
[ "wireguard.pc" "wireguard.surface" "wireguard.xmupc1" "wireguard.xmupc2" "srv1" "wireguard.srv1" ])
|
||||
[ "wireguard.pc" "wireguard.xmupc1" "wireguard.xmupc2" "srv1" "wireguard.srv1" ])
|
||||
++ (builtins.map
|
||||
(host:
|
||||
{
|
||||
@@ -154,7 +144,7 @@ inputs:
|
||||
xmupc2 = { host = "xmupc2"; hostname = "xmupc2.chn.moe"; port = 6394; forwardX11 = true; };
|
||||
nas = { host = "nas"; hostname = "192.168.1.2"; forwardX11 = true; };
|
||||
pc = { host = "pc"; hostname = "192.168.1.3"; forwardX11 = true; };
|
||||
surface = { host = "surface"; hostname = "192.168.1.4"; forwardX11 = true; };
|
||||
one = { host = "one"; hostname = "192.168.1.4"; forwardX11 = true; };
|
||||
gitea = { host = "gitea"; hostname = "ssh.git.chn.moe"; };
|
||||
jykang =
|
||||
{
|
||||
|
||||
@@ -8,12 +8,16 @@ inputs:
|
||||
# TODO: add more options to correctly configure VASP
|
||||
config = let inherit (inputs.config.nixos.packages) vasp; in inputs.lib.mkIf (vasp != null)
|
||||
{
|
||||
nixos.packages.packages._packages = with inputs.pkgs;
|
||||
(
|
||||
[ localPackages.vasp.intel localPackages.vasp.vtstscripts localPackages.py4vasp localPackages.vaspkit wannier90 ]
|
||||
++ (inputs.lib.optional
|
||||
(let inherit (inputs.config.nixos.system.nixpkgs) cuda; in cuda.enable && cuda.capabilities != null)
|
||||
localPackages.vasp.nvidia)
|
||||
);
|
||||
nixos.packages.packages = with inputs.pkgs;
|
||||
{
|
||||
_packages =
|
||||
(
|
||||
[ localPackages.vasp.intel localPackages.vasp.vtst localPackages.vaspkit wannier90 ]
|
||||
++ (inputs.lib.optional
|
||||
(let inherit (inputs.config.nixos.system.nixpkgs) cuda; in cuda.enable && cuda.capabilities != null)
|
||||
localPackages.vasp.nvidia)
|
||||
);
|
||||
_pythonPackages = [(_: [ localPackages.py4vasp ])];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,17 +18,20 @@ inputs:
|
||||
(set:
|
||||
{
|
||||
name = set;
|
||||
value = nix-vscode-extensions.vscode-marketplace.${set} // vscode-extensions.${set} or {};
|
||||
value = vscode-extensions.${set} or {}
|
||||
// nix-vscode-extensions.vscode-marketplace.${set}
|
||||
// nix-vscode-extensions.vscode-marketplace-release.${set} or {};
|
||||
})
|
||||
(inputs.lib.unique
|
||||
(
|
||||
(builtins.attrNames nix-vscode-extensions.vscode-marketplace)
|
||||
++ (builtins.attrNames vscode-extensions)
|
||||
(builtins.attrNames vscode-extensions)
|
||||
++ (builtins.attrNames nix-vscode-extensions.vscode-marketplace)
|
||||
++ (builtins.attrNames nix-vscode-extensions.vscode-marketplace-release)
|
||||
)));
|
||||
in with extensions;
|
||||
(with github; [ copilot github-vscode-theme ])
|
||||
++ (with intellsmi; [ comment-translate ])
|
||||
++ (with ms-vscode; [ cmake-tools cpptools cpptools-extension-pack hexeditor remote-explorer ])
|
||||
++ (with ms-vscode; [ cmake-tools cpptools-extension-pack hexeditor remote-explorer ])
|
||||
++ (with ms-vscode-remote; [ remote-ssh ])
|
||||
++ [
|
||||
donjayamanne.githistory fabiospampinato.vscode-diff
|
||||
@@ -51,10 +54,14 @@ inputs:
|
||||
ms-python.python
|
||||
# theme
|
||||
pkief.material-icon-theme
|
||||
# direnv
|
||||
mkhl.direnv
|
||||
]
|
||||
# jupyter
|
||||
++ (with ms-toolsai;
|
||||
# TODO: use last release
|
||||
++ (with vscode-extensions.ms-toolsai;
|
||||
[ jupyter jupyter-keymap jupyter-renderers vscode-jupyter-cell-tags vscode-jupyter-slideshow ]);
|
||||
extraFlags = builtins.concatStringsSep " " inputs.config.nixos.packages.packages._vscodeEnvFlags;
|
||||
}
|
||||
)];
|
||||
};
|
||||
|
||||
@@ -9,7 +9,11 @@ inputs:
|
||||
enable = true;
|
||||
package = inputs.pkgs.ananicy-cpp;
|
||||
rulesProvider = inputs.pkgs.ananicy-rules-cachyos;
|
||||
extraRules = [{ name = "YuanShen.exe"; type = "Game"; }];
|
||||
extraRules =
|
||||
[
|
||||
{ name = "YuanShen.exe"; type = "Game"; }
|
||||
{ name = "Typora"; type = "Doc-View"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,28 +7,30 @@ inputs:
|
||||
(
|
||||
inputs.lib.mkIf (docker != null)
|
||||
{
|
||||
# system-wide docker is not needed
|
||||
# virtualisation.docker.enable = true;
|
||||
virtualisation.docker.rootless =
|
||||
virtualisation.docker =
|
||||
{
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
daemon.settings =
|
||||
rootless =
|
||||
{
|
||||
features.buildkit = true;
|
||||
# dns 127.0.0.1 make docker not work
|
||||
dns = [ "1.1.1.1" ];
|
||||
# prevent create btrfs subvol
|
||||
storage-driver = "overlay2";
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
daemon.settings =
|
||||
{
|
||||
features.buildkit = true;
|
||||
# dns 127.0.0.1 make docker not work
|
||||
dns = [ "1.1.1.1" ];
|
||||
# prevent create btrfs subvol
|
||||
storage-driver = "overlay2";
|
||||
};
|
||||
};
|
||||
};
|
||||
hardware.nvidia-container-toolkit.enable = inputs.lib.mkIf inputs.config.nixos.system.nixpkgs.cuda.enable true;
|
||||
}
|
||||
)
|
||||
# some docker settings should be set unconditionally, as some services depend on them
|
||||
{
|
||||
virtualisation.docker =
|
||||
{
|
||||
enableNvidia = inputs.lib.mkIf inputs.config.nixos.system.nixpkgs.cuda.enable true;
|
||||
# prevent create btrfs subvol
|
||||
storageDriver = "overlay2";
|
||||
daemon.settings.dns = [ "1.1.1.1" ];
|
||||
|
||||
@@ -16,7 +16,7 @@ inputs:
|
||||
hostName = nextcloud.hostname;
|
||||
appstoreEnable = false;
|
||||
https = true;
|
||||
package = inputs.pkgs.nextcloud29;
|
||||
package = inputs.pkgs.nextcloud30;
|
||||
maxUploadSize = "10G";
|
||||
config =
|
||||
{
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
/config.json
|
||||
/sticker-import.session
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,7 +1,8 @@
|
||||
{
|
||||
"packs": [
|
||||
"Mare_by_WuMingv2Bot.json",
|
||||
"line_191054124446_by_moe_sticker_bot.json"
|
||||
"line_191054124446_by_moe_sticker_bot.json",
|
||||
"Sakurada_Shiro.json"
|
||||
],
|
||||
"homeserver_url": "https://matrix.chn.moe"
|
||||
}
|
||||
@@ -250,6 +250,9 @@ inputs:
|
||||
# nginx will try to redirect https://blog.chn.moe/docs to https://blog.chn.moe:3068/docs/ in default
|
||||
# this make it redirect to /docs/ without hostname
|
||||
absolute_redirect off;
|
||||
# allow realip module to set ip
|
||||
set_real_ip_from 0.0.0.0/0;
|
||||
real_ip_header proxy_protocol;
|
||||
'';
|
||||
proxyTimeout = "1d";
|
||||
recommendedZstdSettings = true;
|
||||
|
||||
@@ -1,51 +1,37 @@
|
||||
inputs:
|
||||
{
|
||||
options.nixos.services.send = let inherit (inputs.lib) mkOption types; in
|
||||
options.nixos.services.send = let inherit (inputs.lib) mkOption types; in mkOption
|
||||
{
|
||||
enable = mkOption { type = types.bool; default = false; };
|
||||
hostname = mkOption { type = types.nonEmptyStr; default = "send.chn.moe"; };
|
||||
};
|
||||
config =
|
||||
let
|
||||
inherit (inputs.lib) mkIf;
|
||||
inherit (inputs.config.nixos.services) send;
|
||||
in mkIf send.enable
|
||||
type = types.nullOr (types.submodule (submoduleInputs: { options =
|
||||
{
|
||||
virtualisation.oci-containers.containers.send =
|
||||
hostname = mkOption { type = types.nonEmptyStr; default = "send.chn.moe"; };
|
||||
};}));
|
||||
default = null;
|
||||
};
|
||||
config = let inherit (inputs.config.nixos.services) send; in inputs.lib.mkIf (send != null)
|
||||
{
|
||||
services.send =
|
||||
{
|
||||
enable = true;
|
||||
baseUrl = "https://${send.hostname}";
|
||||
environment.MAX_FILE_SIZE = "17179869184";
|
||||
redis =
|
||||
{
|
||||
image = "timvisee/send:1ee4951";
|
||||
imageFile = inputs.pkgs.dockerTools.pullImage
|
||||
{
|
||||
imageName = "registry.gitlab.com/timvisee/send";
|
||||
imageDigest = "sha256:1ee495161f176946e6e4077e17be2b8f8634c2d502172cc530a8cd5affd7078f";
|
||||
sha256 = "1dimqga35c2ka4advhv3v60xcsdrhc6c4hh21x36fbyhk90n2vzs";
|
||||
finalImageName = "timvisee/send";
|
||||
finalImageTag = "1ee4951";
|
||||
};
|
||||
ports = [ "127.0.0.1:1443:1443/tcp" ];
|
||||
volumes = [ "send:/uploads" ];
|
||||
extraOptions = [ "--add-host=host.docker.internal:host-gateway" ];
|
||||
environmentFiles = [ inputs.config.sops.templates."send/env".path ];
|
||||
};
|
||||
sops =
|
||||
{
|
||||
templates."send/env".content =
|
||||
''
|
||||
BASE_URL=https://${send.hostname}
|
||||
MAX_FILE_SIZE=17179869184
|
||||
REDIS_HOST=host.docker.internal
|
||||
REDIS_PORT=9184
|
||||
REDIS_PASSWORD=${inputs.config.sops.placeholder."redis/send"}
|
||||
'';
|
||||
};
|
||||
nixos.services =
|
||||
{
|
||||
nginx =
|
||||
{
|
||||
enable = true;
|
||||
https."${send.hostname}".location."/".proxy = { upstream = "http://127.0.0.1:1443"; websocket = true; };
|
||||
};
|
||||
redis.instances.send = { user = "root"; port = 9184; };
|
||||
createLocally = false;
|
||||
host = "127.0.0.1";
|
||||
port = 9184;
|
||||
passwordFile = inputs.config.sops.secrets."redis/send".path;
|
||||
};
|
||||
};
|
||||
systemd.services.send.after = [ "redis-send.service" ];
|
||||
nixos.services =
|
||||
{
|
||||
nginx =
|
||||
{
|
||||
enable = true;
|
||||
https."${send.hostname}".location."/".proxy = { upstream = "http://127.0.0.1:1443"; websocket = true; };
|
||||
};
|
||||
redis.instances.send = { user = "root"; port = 9184; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,8 +15,6 @@ inputs:
|
||||
sockets = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
cores = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
threads = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
mpiThreads = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
openmpThreads = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
};
|
||||
memoryMB = mkOption { type = types.ints.unsigned; default = 1024; };
|
||||
gpus = mkOption { type = types.nullOr (types.attrsOf types.ints.unsigned); default = null; };
|
||||
@@ -25,9 +23,17 @@ inputs:
|
||||
defaultPartition = mkOption { type = types.nonEmptyStr; default = "localhost"; };
|
||||
tui =
|
||||
{
|
||||
cpuMpiThreads = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
cpuOpenmpThreads = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
gpus = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
|
||||
cpuQueues = mkOption
|
||||
{
|
||||
type = types.nonEmptyListOf (types.submodule (submoduleInputs: { options =
|
||||
{
|
||||
name = mkOption { type = types.nonEmptyStr; default = "localhost"; };
|
||||
mpiThreads = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
openmpThreads = mkOption { type = types.ints.unsigned; default = 1; };
|
||||
};}));
|
||||
};
|
||||
gpuIds = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
|
||||
gpuPartition = mkOption { type = types.nonEmptyStr; default = "localhost"; };
|
||||
};
|
||||
# 是否打开防火墙相应端口,对于多节点部署需要打开
|
||||
setupFirewall = mkOption { type = types.bool; default = false; };
|
||||
@@ -125,6 +131,13 @@ inputs:
|
||||
|
||||
# enable task plugins
|
||||
TaskPlugin=task/affinity,task/cgroup
|
||||
|
||||
# omit --mpi=pmix
|
||||
MpiDefault=pmix
|
||||
|
||||
# record more info
|
||||
JobAcctGatherType=jobacct_gather/cgroup
|
||||
AccountingStorageTRES=gres/gpu
|
||||
'';
|
||||
extraConfigPaths =
|
||||
let gpus = slurm.node.${inputs.config.nixos.model.hostname}.gpus or null;
|
||||
@@ -135,6 +148,14 @@ inputs:
|
||||
(inputs.localLib.attrsToList gpus));
|
||||
in [(inputs.pkgs.writeTextDir "gres.conf" "AutoDetect=nvml\n${gpuString}")]
|
||||
);
|
||||
extraCgroupConfig =
|
||||
''
|
||||
ConstrainCores=yes
|
||||
ConstrainDevices=yes
|
||||
ConstrainRAMSpace=yes
|
||||
ConstrainSwapSpace=yes
|
||||
AllowedSwapSpace=20
|
||||
'';
|
||||
};
|
||||
munge = { enable = true; password = inputs.config.sops.secrets."munge.key".path; };
|
||||
};
|
||||
@@ -157,6 +178,7 @@ inputs:
|
||||
networking.firewall =
|
||||
let config = inputs.lib.mkIf slurm.setupFirewall [ 6818 ];
|
||||
in { allowedTCPPorts = config; allowedUDPPorts = config; };
|
||||
environment.sessionVariables.SLURM_HINT = "nomultithread";
|
||||
}
|
||||
# master 配置
|
||||
(inputs.lib.mkIf (slurm.master == inputs.config.nixos.model.hostname)
|
||||
@@ -196,9 +218,11 @@ inputs:
|
||||
};
|
||||
environment.etc."sbatch-tui.yaml".text = builtins.toJSON
|
||||
{
|
||||
CpuMpiThreads = slurm.tui.cpuMpiThreads;
|
||||
CpuOpenmpThreads = slurm.tui.cpuOpenmpThreads;
|
||||
GpuIds = slurm.tui.gpus;
|
||||
GpuIds = slurm.tui.gpuIds;
|
||||
GpuPartition = slurm.tui.gpuPartition;
|
||||
CpuQueues = builtins.map
|
||||
(queue: [ queue.name [ queue.mpiThreads queue.openmpThreads ]])
|
||||
slurm.tui.cpuQueues;
|
||||
};
|
||||
networking.firewall =
|
||||
let config = inputs.lib.mkIf slurm.setupFirewall [ 6817 ];
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
[38;2;39;93;251m [39m[38;2;36;97;249m [39m[38;2;33;102;248m [39m[38;2;30;106;247m [39m[38;2;27;110;245m [39m[38;2;25;114;244m [39m[38;2;22;118;242m [39m[38;2;20;123;240m [39m[38;2;18;127;238m [39m[38;2;16;131;236m [39m[38;2;14;135;233m [39m[38;2;12;140;231m [39m[38;2;10;144;228m [39m[38;2;9;148;226m [39m[38;2;7;152;223m [39m[38;2;6;156;220m [39m[38;2;5;160;217m [39m[38;2;4;164;214m [39m[38;2;3;168;211m [39m[38;2;2;172;208m░[39m[38;2;2;176;205m▒[39m[38;2;1;180;201m▓[39m[38;2;1;184;198m█[39m[38;2;1;188;194m▓[39m[38;2;1;191;191m▒[39m[38;2;1;195;187m░[39m[38;2;1;199;183m [39m[38;2;1;202;179m [39m[38;2;2;206;175m [39m[38;2;2;209;171m [39m[38;2;3;212;167m [39m[38;2;4;215;163m [39m[38;2;5;218;159m░[39m[38;2;6;221;155m▒[39m[38;2;8;224;151m▓[39m[38;2;9;227;147m█[39m[38;2;11;229;143m▓[39m[38;2;12;232;138m▒[39m[38;2;14;234;134m░[39m[38;2;16;236;130m▒[39m[38;2;18;238;126m▓[39m[38;2;21;240;121m█[39m[38;2;23;242;117m█[39m[38;2;25;244;113m█[39m[38;2;28;246;109m█[39m[38;2;31;247;105m█[39m[38;2;34;248;101m█[39m[38;2;36;250;96m█[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m▒[39m[38;2;46;253;84m░[39m[38;2;49;253;80m [39m[38;2;52;254;76m [39m[38;2;56;254;73m[39m
|
||||
[38;2;30;106;247m [39m[38;2;27;110;245m [39m[38;2;25;114;244m [39m[38;2;22;118;242m [39m[38;2;20;123;240m [39m[38;2;18;127;238m [39m[38;2;16;131;236m [39m[38;2;14;135;233m [39m[38;2;12;140;231m [39m[38;2;10;144;228m [39m[38;2;9;148;226m [39m[38;2;7;152;223m [39m[38;2;6;156;220m [39m[38;2;5;160;217m [39m[38;2;4;164;214m [39m[38;2;3;168;211m [39m[38;2;2;172;208m [39m[38;2;2;176;205m [39m[38;2;1;180;201m░[39m[38;2;1;184;198m▒[39m[38;2;1;188;194m▓[39m[38;2;1;191;191m█[39m[38;2;1;195;187m▓[39m[38;2;1;199;183m▒[39m[38;2;1;202;179m░[39m[38;2;2;206;175m [39m[38;2;2;209;171m [39m[38;2;3;212;167m [39m[38;2;4;215;163m [39m[38;2;5;218;159m [39m[38;2;6;221;155m [39m[38;2;8;224;151m░[39m[38;2;9;227;147m▒[39m[38;2;11;229;143m▓[39m[38;2;12;232;138m█[39m[38;2;14;234;134m▓[39m[38;2;16;236;130m▒[39m[38;2;18;238;126m░[39m[38;2;21;240;121m▒[39m[38;2;23;242;117m▓[39m[38;2;25;244;113m█[39m[38;2;28;246;109m▓[39m[38;2;31;247;105m▒[39m[38;2;34;248;101m░[39m[38;2;36;250;96m░[39m[38;2;39;251;92m▒[39m[38;2;43;252;88m▓[39m[38;2;46;253;84m█[39m[38;2;49;253;80m▓[39m[38;2;52;254;76m▒[39m[38;2;56;254;73m░[39m[38;2;59;254;69m [39m[38;2;63;254;65m[39m
|
||||
[38;2;22;118;242m [39m[38;2;20;123;240m [39m[38;2;18;127;238m [39m[38;2;16;131;236m [39m[38;2;14;135;233m [39m[38;2;12;140;231m [39m[38;2;10;144;228m [39m[38;2;9;148;226m [39m[38;2;7;152;223m [39m[38;2;6;156;220m [39m[38;2;5;160;217m [39m[38;2;4;164;214m [39m[38;2;3;168;211m [39m[38;2;2;172;208m [39m[38;2;2;176;205m [39m[38;2;1;180;201m [39m[38;2;1;184;198m [39m[38;2;1;188;194m░[39m[38;2;1;191;191m▒[39m[38;2;1;195;187m▓[39m[38;2;1;199;183m█[39m[38;2;1;202;179m▓[39m[38;2;2;206;175m▒[39m[38;2;2;209;171m░[39m[38;2;3;212;167m [39m[38;2;4;215;163m [39m[38;2;5;218;159m [39m[38;2;6;221;155m [39m[38;2;8;224;151m [39m[38;2;9;227;147m [39m[38;2;11;229;143m░[39m[38;2;12;232;138m▒[39m[38;2;14;234;134m▓[39m[38;2;16;236;130m█[39m[38;2;18;238;126m▓[39m[38;2;21;240;121m▒[39m[38;2;23;242;117m░[39m[38;2;25;244;113m▒[39m[38;2;28;246;109m▓[39m[38;2;31;247;105m█[39m[38;2;34;248;101m▓[39m[38;2;36;250;96m▒[39m[38;2;39;251;92m░[39m[38;2;43;252;88m░[39m[38;2;46;253;84m▒[39m[38;2;49;253;80m▓[39m[38;2;52;254;76m█[39m[38;2;56;254;73m▓[39m[38;2;59;254;69m▒[39m[38;2;63;254;65m░[39m[38;2;67;254;61m [39m[38;2;70;254;58m[39m
|
||||
[38;2;16;131;236m [39m[38;2;14;135;233m [39m[38;2;12;140;231m [39m[38;2;10;144;228m [39m[38;2;9;148;226m [39m[38;2;7;152;223m [39m[38;2;6;156;220m [39m[38;2;5;160;217m [39m[38;2;4;164;214m [39m[38;2;3;168;211m [39m[38;2;2;172;208m [39m[38;2;2;176;205m [39m[38;2;1;180;201m [39m[38;2;1;184;198m [39m[38;2;1;188;194m [39m[38;2;1;191;191m [39m[38;2;1;195;187m░[39m[38;2;1;199;183m▒[39m[38;2;1;202;179m▓[39m[38;2;2;206;175m█[39m[38;2;2;209;171m▓[39m[38;2;3;212;167m▒[39m[38;2;4;215;163m░[39m[38;2;5;218;159m [39m[38;2;6;221;155m [39m[38;2;8;224;151m [39m[38;2;9;227;147m [39m[38;2;11;229;143m [39m[38;2;12;232;138m [39m[38;2;14;234;134m░[39m[38;2;16;236;130m▒[39m[38;2;18;238;126m▓[39m[38;2;21;240;121m█[39m[38;2;23;242;117m▓[39m[38;2;25;244;113m▒[39m[38;2;28;246;109m░[39m[38;2;31;247;105m▒[39m[38;2;34;248;101m▓[39m[38;2;36;250;96m█[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m▒[39m[38;2;46;253;84m░[39m[38;2;49;253;80m░[39m[38;2;52;254;76m▒[39m[38;2;56;254;73m▓[39m[38;2;59;254;69m█[39m[38;2;63;254;65m▓[39m[38;2;67;254;61m▒[39m[38;2;70;254;58m░[39m[38;2;74;254;54m [39m[38;2;78;254;51m[39m
|
||||
[38;2;10;144;228m [39m[38;2;9;148;226m [39m[38;2;7;152;223m [39m[38;2;6;156;220m [39m[38;2;5;160;217m [39m[38;2;4;164;214m [39m[38;2;3;168;211m [39m[38;2;2;172;208m [39m[38;2;2;176;205m [39m[38;2;1;180;201m [39m[38;2;1;184;198m [39m[38;2;1;188;194m [39m[38;2;1;191;191m [39m[38;2;1;195;187m [39m[38;2;1;199;183m [39m[38;2;1;202;179m░[39m[38;2;2;206;175m▒[39m[38;2;2;209;171m▓[39m[38;2;3;212;167m█[39m[38;2;4;215;163m▓[39m[38;2;5;218;159m▒[39m[38;2;6;221;155m░[39m[38;2;8;224;151m [39m[38;2;9;227;147m [39m[38;2;11;229;143m [39m[38;2;12;232;138m [39m[38;2;14;234;134m [39m[38;2;16;236;130m [39m[38;2;18;238;126m░[39m[38;2;21;240;121m▒[39m[38;2;23;242;117m▓[39m[38;2;25;244;113m█[39m[38;2;28;246;109m▓[39m[38;2;31;247;105m▒[39m[38;2;34;248;101m░[39m[38;2;36;250;96m▒[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m█[39m[38;2;46;253;84m▓[39m[38;2;49;253;80m▒[39m[38;2;52;254;76m░[39m[38;2;56;254;73m░[39m[38;2;59;254;69m▒[39m[38;2;63;254;65m▓[39m[38;2;67;254;61m█[39m[38;2;70;254;58m▓[39m[38;2;74;254;54m▒[39m[38;2;78;254;51m░[39m[38;2;82;253;48m [39m[38;2;86;252;44m[39m
|
||||
[38;2;6;156;220m [39m[38;2;5;160;217m [39m[38;2;4;164;214m [39m[38;2;3;168;211m [39m[38;2;2;172;208m [39m[38;2;2;176;205m [39m[38;2;1;180;201m [39m[38;2;1;184;198m [39m[38;2;1;188;194m [39m[38;2;1;191;191m [39m[38;2;1;195;187m [39m[38;2;1;199;183m [39m[38;2;1;202;179m [39m[38;2;2;206;175m [39m[38;2;2;209;171m░[39m[38;2;3;212;167m▒[39m[38;2;4;215;163m▓[39m[38;2;5;218;159m█[39m[38;2;6;221;155m▓[39m[38;2;8;224;151m▒[39m[38;2;9;227;147m░[39m[38;2;11;229;143m [39m[38;2;12;232;138m [39m[38;2;14;234;134m [39m[38;2;16;236;130m [39m[38;2;18;238;126m [39m[38;2;21;240;121m [39m[38;2;23;242;117m░[39m[38;2;25;244;113m▒[39m[38;2;28;246;109m▓[39m[38;2;31;247;105m█[39m[38;2;34;248;101m▓[39m[38;2;36;250;96m▒[39m[38;2;39;251;92m░[39m[38;2;43;252;88m▒[39m[38;2;46;253;84m▓[39m[38;2;49;253;80m█[39m[38;2;52;254;76m▓[39m[38;2;56;254;73m▒[39m[38;2;59;254;69m░[39m[38;2;63;254;65m░[39m[38;2;67;254;61m▒[39m[38;2;70;254;58m▓[39m[38;2;74;254;54m█[39m[38;2;78;254;51m▓[39m[38;2;82;253;48m▒[39m[38;2;86;252;44m░[39m[38;2;90;251;41m [39m[38;2;94;250;38m[39m
|
||||
[38;2;3;168;211m [39m[38;2;2;172;208m [39m[38;2;2;176;205m [39m[38;2;1;180;201m [39m[38;2;1;184;198m [39m[38;2;1;188;194m [39m[38;2;1;191;191m [39m[38;2;1;195;187m [39m[38;2;1;199;183m [39m[38;2;1;202;179m [39m[38;2;2;206;175m [39m[38;2;2;209;171m [39m[38;2;3;212;167m [39m[38;2;4;215;163m░[39m[38;2;5;218;159m▒[39m[38;2;6;221;155m▓[39m[38;2;8;224;151m█[39m[38;2;9;227;147m█[39m[38;2;11;229;143m█[39m[38;2;12;232;138m█[39m[38;2;14;234;134m█[39m[38;2;16;236;130m█[39m[38;2;18;238;126m█[39m[38;2;21;240;121m█[39m[38;2;23;242;117m▓[39m[38;2;25;244;113m▒[39m[38;2;28;246;109m░[39m[38;2;31;247;105m▒[39m[38;2;34;248;101m▓[39m[38;2;36;250;96m█[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m▒[39m[38;2;46;253;84m░[39m[38;2;49;253;80m▒[39m[38;2;52;254;76m▓[39m[38;2;56;254;73m█[39m[38;2;59;254;69m▓[39m[38;2;63;254;65m▒[39m[38;2;67;254;61m░[39m[38;2;70;254;58m░[39m[38;2;74;254;54m▒[39m[38;2;78;254;51m▓[39m[38;2;82;253;48m█[39m[38;2;86;252;44m▓[39m[38;2;90;251;41m▒[39m[38;2;94;250;38m░[39m[38;2;98;249;35m[39m
|
||||
[38;2;1;180;201m[39m
|
||||
[38;2;1;191;191m [39m[38;2;1;195;187m [39m[38;2;1;199;183m [39m[38;2;1;202;179m [39m[38;2;2;206;175m [39m[38;2;2;209;171m [39m[38;2;3;212;167m░[39m[38;2;4;215;163m▒[39m[38;2;5;218;159m▓[39m[38;2;6;221;155m█[39m[38;2;8;224;151m█[39m[38;2;9;227;147m█[39m[38;2;11;229;143m█[39m[38;2;12;232;138m█[39m[38;2;14;234;134m█[39m[38;2;16;236;130m▓[39m[38;2;18;238;126m▒[39m[38;2;21;240;121m░[39m[38;2;23;242;117m░[39m[38;2;25;244;113m▒[39m[38;2;28;246;109m▓[39m[38;2;31;247;105m█[39m[38;2;34;248;101m█[39m[38;2;36;250;96m█[39m[38;2;39;251;92m█[39m[38;2;43;252;88m█[39m[38;2;46;253;84m█[39m[38;2;49;253;80m█[39m[38;2;52;254;76m▓[39m[38;2;56;254;73m▒[39m[38;2;59;254;69m░[39m[38;2;63;254;65m [39m[38;2;67;254;61m░[39m[38;2;70;254;58m▒[39m[38;2;74;254;54m▓[39m[38;2;78;254;51m█[39m[38;2;82;253;48m█[39m[38;2;86;252;44m█[39m[38;2;90;251;41m█[39m[38;2;94;250;38m█[39m[38;2;98;249;35m█[39m[38;2;102;248;32m▓[39m[38;2;106;246;30m▒[39m[38;2;111;245;27m░[39m[38;2;115;243;24m░[39m[38;2;119;241;22m▒[39m[38;2;123;240;20m▓[39m[38;2;128;237;17m█[39m[38;2;132;235;15m▓[39m[38;2;136;233;14m▒[39m[38;2;140;231;12m░[39m[38;2;144;228;10m░[39m[38;2;149;225;8m▒[39m[38;2;153;223;7m▓[39m[38;2;157;220;6m█[39m[38;2;161;217;5m▓[39m[38;2;165;214;4m▒[39m[38;2;169;211;3m░[39m[38;2;173;207;2m▒[39m[38;2;177;204;1m▓[39m[38;2;181;201;1m█[39m[38;2;185;197;1m█[39m[38;2;188;194;1m█[39m[38;2;192;190;1m█[39m[38;2;196;186;1m█[39m[38;2;199;182;1m█[39m[38;2;203;179;1m█[39m[38;2;206;175;2m▓[39m[38;2;209;171;2m▒[39m[38;2;213;167;3m░[39m[38;2;216;163;4m [39m[38;2;219;159;5m [39m[38;2;222;154;7m[39m
|
||||
[38;2;1;202;179m [39m[38;2;2;206;175m [39m[38;2;2;209;171m [39m[38;2;3;212;167m [39m[38;2;4;215;163m░[39m[38;2;5;218;159m▒[39m[38;2;6;221;155m▓[39m[38;2;8;224;151m█[39m[38;2;9;227;147m▓[39m[38;2;11;229;143m▒[39m[38;2;12;232;138m░[39m[38;2;14;234;134m░[39m[38;2;16;236;130m▒[39m[38;2;18;238;126m▓[39m[38;2;21;240;121m█[39m[38;2;23;242;117m▓[39m[38;2;25;244;113m▒[39m[38;2;28;246;109m░[39m[38;2;31;247;105m▒[39m[38;2;34;248;101m▓[39m[38;2;36;250;96m█[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m▒[39m[38;2;46;253;84m░[39m[38;2;49;253;80m░[39m[38;2;52;254;76m▒[39m[38;2;56;254;73m▓[39m[38;2;59;254;69m█[39m[38;2;63;254;65m▓[39m[38;2;67;254;61m▒[39m[38;2;70;254;58m░[39m[38;2;74;254;54m▒[39m[38;2;78;254;51m▓[39m[38;2;82;253;48m█[39m[38;2;86;252;44m▓[39m[38;2;90;251;41m▒[39m[38;2;94;250;38m░[39m[38;2;98;249;35m░[39m[38;2;102;248;32m▒[39m[38;2;106;246;30m▓[39m[38;2;111;245;27m█[39m[38;2;115;243;24m▓[39m[38;2;119;241;22m▒[39m[38;2;123;240;20m░[39m[38;2;128;237;17m▒[39m[38;2;132;235;15m▓[39m[38;2;136;233;14m█[39m[38;2;140;231;12m▓[39m[38;2;144;228;10m▒[39m[38;2;149;225;8m░[39m[38;2;153;223;7m░[39m[38;2;157;220;6m▒[39m[38;2;161;217;5m▓[39m[38;2;165;214;4m█[39m[38;2;169;211;3m▓[39m[38;2;173;207;2m▒[39m[38;2;177;204;1m░[39m[38;2;181;201;1m▒[39m[38;2;185;197;1m▓[39m[38;2;188;194;1m█[39m[38;2;192;190;1m▓[39m[38;2;196;186;1m▒[39m[38;2;199;182;1m░[39m[38;2;203;179;1m░[39m[38;2;206;175;2m▒[39m[38;2;209;171;2m▓[39m[38;2;213;167;3m█[39m[38;2;216;163;4m▓[39m[38;2;219;159;5m▒[39m[38;2;222;154;7m░[39m[38;2;224;150;8m [39m[38;2;227;146;9m[39m
|
||||
[38;2;3;212;167m [39m[38;2;4;215;163m [39m[38;2;5;218;159m [39m[38;2;6;221;155m░[39m[38;2;8;224;151m▒[39m[38;2;9;227;147m▓[39m[38;2;11;229;143m█[39m[38;2;12;232;138m▓[39m[38;2;14;234;134m▒[39m[38;2;16;236;130m░[39m[38;2;18;238;126m [39m[38;2;21;240;121m [39m[38;2;23;242;117m [39m[38;2;25;244;113m [39m[38;2;28;246;109m [39m[38;2;31;247;105m [39m[38;2;34;248;101m░[39m[38;2;36;250;96m▒[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m█[39m[38;2;46;253;84m▓[39m[38;2;49;253;80m▒[39m[38;2;52;254;76m░[39m[38;2;56;254;73m░[39m[38;2;59;254;69m▒[39m[38;2;63;254;65m▓[39m[38;2;67;254;61m█[39m[38;2;70;254;58m▓[39m[38;2;74;254;54m▒[39m[38;2;78;254;51m░[39m[38;2;82;253;48m▒[39m[38;2;86;252;44m▓[39m[38;2;90;251;41m█[39m[38;2;94;250;38m▓[39m[38;2;98;249;35m▒[39m[38;2;102;248;32m░[39m[38;2;106;246;30m░[39m[38;2;111;245;27m▒[39m[38;2;115;243;24m▓[39m[38;2;119;241;22m█[39m[38;2;123;240;20m▓[39m[38;2;128;237;17m▒[39m[38;2;132;235;15m░[39m[38;2;136;233;14m▒[39m[38;2;140;231;12m▓[39m[38;2;144;228;10m█[39m[38;2;149;225;8m▓[39m[38;2;153;223;7m▒[39m[38;2;157;220;6m░[39m[38;2;161;217;5m░[39m[38;2;165;214;4m▒[39m[38;2;169;211;3m▓[39m[38;2;173;207;2m█[39m[38;2;177;204;1m▓[39m[38;2;181;201;1m▒[39m[38;2;185;197;1m░[39m[38;2;188;194;1m▒[39m[38;2;192;190;1m▓[39m[38;2;196;186;1m█[39m[38;2;199;182;1m▓[39m[38;2;203;179;1m▒[39m[38;2;206;175;2m░[39m[38;2;209;171;2m░[39m[38;2;213;167;3m▒[39m[38;2;216;163;4m▓[39m[38;2;219;159;5m█[39m[38;2;222;154;7m▓[39m[38;2;224;150;8m▒[39m[38;2;227;146;9m░[39m[38;2;230;142;11m [39m[38;2;232;138;13m[39m
|
||||
[38;2;6;221;155m [39m[38;2;8;224;151m [39m[38;2;9;227;147m░[39m[38;2;11;229;143m▒[39m[38;2;12;232;138m▓[39m[38;2;14;234;134m█[39m[38;2;16;236;130m▓[39m[38;2;18;238;126m▒[39m[38;2;21;240;121m▒[39m[38;2;23;242;117m▓[39m[38;2;25;244;113m█[39m[38;2;28;246;109m█[39m[38;2;31;247;105m█[39m[38;2;34;248;101m▓[39m[38;2;36;250;96m▒[39m[38;2;39;251;92m░[39m[38;2;43;252;88m▒[39m[38;2;46;253;84m▓[39m[38;2;49;253;80m█[39m[38;2;52;254;76m█[39m[38;2;56;254;73m█[39m[38;2;59;254;69m█[39m[38;2;63;254;65m█[39m[38;2;67;254;61m█[39m[38;2;70;254;58m█[39m[38;2;74;254;54m▓[39m[38;2;78;254;51m▒[39m[38;2;82;253;48m░[39m[38;2;86;252;44m░[39m[38;2;90;251;41m▒[39m[38;2;94;250;38m▓[39m[38;2;98;249;35m█[39m[38;2;102;248;32m▓[39m[38;2;106;246;30m▒[39m[38;2;111;245;27m░[39m[38;2;115;243;24m░[39m[38;2;119;241;22m▒[39m[38;2;123;240;20m▓[39m[38;2;128;237;17m█[39m[38;2;132;235;15m▓[39m[38;2;136;233;14m▒[39m[38;2;140;231;12m░[39m[38;2;144;228;10m▒[39m[38;2;149;225;8m▓[39m[38;2;153;223;7m█[39m[38;2;157;220;6m▓[39m[38;2;161;217;5m▒[39m[38;2;165;214;4m░[39m[38;2;169;211;3m░[39m[38;2;173;207;2m▒[39m[38;2;177;204;1m▓[39m[38;2;181;201;1m█[39m[38;2;185;197;1m▓[39m[38;2;188;194;1m▒[39m[38;2;192;190;1m░[39m[38;2;196;186;1m▒[39m[38;2;199;182;1m▓[39m[38;2;203;179;1m█[39m[38;2;206;175;2m█[39m[38;2;209;171;2m█[39m[38;2;213;167;3m█[39m[38;2;216;163;4m█[39m[38;2;219;159;5m█[39m[38;2;222;154;7m█[39m[38;2;224;150;8m▓[39m[38;2;227;146;9m▒[39m[38;2;230;142;11m░[39m[38;2;232;138;13m [39m[38;2;234;133;15m [39m[38;2;237;129;17m[39m
|
||||
[38;2;11;229;143m [39m[38;2;12;232;138m░[39m[38;2;14;234;134m▒[39m[38;2;16;236;130m▓[39m[38;2;18;238;126m█[39m[38;2;21;240;121m▓[39m[38;2;23;242;117m▒[39m[38;2;25;244;113m░[39m[38;2;28;246;109m░[39m[38;2;31;247;105m▒[39m[38;2;34;248;101m▓[39m[38;2;36;250;96m█[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m▒[39m[38;2;46;253;84m░[39m[38;2;49;253;80m▒[39m[38;2;52;254;76m▓[39m[38;2;56;254;73m█[39m[38;2;59;254;69m▓[39m[38;2;63;254;65m▒[39m[38;2;67;254;61m░[39m[38;2;70;254;58m░[39m[38;2;74;254;54m▒[39m[38;2;78;254;51m▓[39m[38;2;82;253;48m█[39m[38;2;86;252;44m▓[39m[38;2;90;251;41m▒[39m[38;2;94;250;38m░[39m[38;2;98;249;35m▒[39m[38;2;102;248;32m▓[39m[38;2;106;246;30m█[39m[38;2;111;245;27m▓[39m[38;2;115;243;24m▒[39m[38;2;119;241;22m░[39m[38;2;123;240;20m░[39m[38;2;128;237;17m▒[39m[38;2;132;235;15m▓[39m[38;2;136;233;14m█[39m[38;2;140;231;12m▓[39m[38;2;144;228;10m▒[39m[38;2;149;225;8m░[39m[38;2;153;223;7m▒[39m[38;2;157;220;6m▓[39m[38;2;161;217;5m█[39m[38;2;165;214;4m▓[39m[38;2;169;211;3m▒[39m[38;2;173;207;2m░[39m[38;2;177;204;1m░[39m[38;2;181;201;1m▒[39m[38;2;185;197;1m▓[39m[38;2;188;194;1m█[39m[38;2;192;190;1m▓[39m[38;2;196;186;1m▒[39m[38;2;199;182;1m░[39m[38;2;203;179;1m▒[39m[38;2;206;175;2m▓[39m[38;2;209;171;2m█[39m[38;2;213;167;3m▓[39m[38;2;216;163;4m▒[39m[38;2;219;159;5m░[39m[38;2;222;154;7m [39m[38;2;224;150;8m [39m[38;2;227;146;9m [39m[38;2;230;142;11m [39m[38;2;232;138;13m [39m[38;2;234;133;15m [39m[38;2;237;129;17m [39m[38;2;239;125;19m [39m[38;2;241;121;21m[39m
|
||||
[38;2;16;236;130m░[39m[38;2;18;238;126m▒[39m[38;2;21;240;121m▓[39m[38;2;23;242;117m█[39m[38;2;25;244;113m▓[39m[38;2;28;246;109m▒[39m[38;2;31;247;105m░[39m[38;2;34;248;101m░[39m[38;2;36;250;96m▒[39m[38;2;39;251;92m▓[39m[38;2;43;252;88m█[39m[38;2;46;253;84m▓[39m[38;2;49;253;80m▒[39m[38;2;52;254;76m░[39m[38;2;56;254;73m▒[39m[38;2;59;254;69m▓[39m[38;2;63;254;65m█[39m[38;2;67;254;61m▓[39m[38;2;70;254;58m▒[39m[38;2;74;254;54m░[39m[38;2;78;254;51m░[39m[38;2;82;253;48m▒[39m[38;2;86;252;44m▓[39m[38;2;90;251;41m█[39m[38;2;94;250;38m▓[39m[38;2;98;249;35m▒[39m[38;2;102;248;32m░[39m[38;2;106;246;30m▒[39m[38;2;111;245;27m▓[39m[38;2;115;243;24m█[39m[38;2;119;241;22m▓[39m[38;2;123;240;20m▒[39m[38;2;128;237;17m░[39m[38;2;132;235;15m░[39m[38;2;136;233;14m▒[39m[38;2;140;231;12m▓[39m[38;2;144;228;10m█[39m[38;2;149;225;8m▓[39m[38;2;153;223;7m▒[39m[38;2;157;220;6m░[39m[38;2;161;217;5m▒[39m[38;2;165;214;4m▓[39m[38;2;169;211;3m█[39m[38;2;173;207;2m▓[39m[38;2;177;204;1m▒[39m[38;2;181;201;1m░[39m[38;2;185;197;1m░[39m[38;2;188;194;1m▒[39m[38;2;192;190;1m▓[39m[38;2;196;186;1m█[39m[38;2;199;182;1m▓[39m[38;2;203;179;1m▒[39m[38;2;206;175;2m░[39m[38;2;209;171;2m▒[39m[38;2;213;167;3m▓[39m[38;2;216;163;4m█[39m[38;2;219;159;5m▓[39m[38;2;222;154;7m▒[39m[38;2;224;150;8m░[39m[38;2;227;146;9m [39m[38;2;230;142;11m [39m[38;2;232;138;13m [39m[38;2;234;133;15m [39m[38;2;237;129;17m [39m[38;2;239;125;19m [39m[38;2;241;121;21m [39m[38;2;243;117;23m [39m[38;2;244;112;26m[39m
|
||||
[38;2;23;242;117m░[39m[38;2;25;244;113m▒[39m[38;2;28;246;109m▓[39m[38;2;31;247;105m█[39m[38;2;34;248;101m█[39m[38;2;36;250;96m█[39m[38;2;39;251;92m█[39m[38;2;43;252;88m█[39m[38;2;46;253;84m█[39m[38;2;49;253;80m▓[39m[38;2;52;254;76m▒[39m[38;2;56;254;73m░[39m[38;2;59;254;69m░[39m[38;2;63;254;65m▒[39m[38;2;67;254;61m▓[39m[38;2;70;254;58m█[39m[38;2;74;254;54m▓[39m[38;2;78;254;51m▒[39m[38;2;82;253;48m░[39m[38;2;86;252;44m░[39m[38;2;90;251;41m▒[39m[38;2;94;250;38m▓[39m[38;2;98;249;35m█[39m[38;2;102;248;32m▓[39m[38;2;106;246;30m▒[39m[38;2;111;245;27m░[39m[38;2;115;243;24m░[39m[38;2;119;241;22m▒[39m[38;2;123;240;20m▓[39m[38;2;128;237;17m█[39m[38;2;132;235;15m█[39m[38;2;136;233;14m█[39m[38;2;140;231;12m█[39m[38;2;144;228;10m█[39m[38;2;149;225;8m█[39m[38;2;153;223;7m▓[39m[38;2;157;220;6m▒[39m[38;2;161;217;5m░[39m[38;2;165;214;4m [39m[38;2;169;211;3m░[39m[38;2;173;207;2m▒[39m[38;2;177;204;1m▓[39m[38;2;181;201;1m█[39m[38;2;185;197;1m█[39m[38;2;188;194;1m█[39m[38;2;192;190;1m█[39m[38;2;196;186;1m█[39m[38;2;199;182;1m█[39m[38;2;203;179;1m▓[39m[38;2;206;175;2m▒[39m[38;2;209;171;2m░[39m[38;2;213;167;3m░[39m[38;2;216;163;4m▒[39m[38;2;219;159;5m▓[39m[38;2;222;154;7m█[39m[38;2;224;150;8m▓[39m[38;2;227;146;9m▒[39m[38;2;230;142;11m░[39m[38;2;232;138;13m [39m[38;2;234;133;15m [39m[38;2;237;129;17m [39m[38;2;239;125;19m [39m[38;2;241;121;21m [39m[38;2;243;117;23m [39m[38;2;244;112;26m [39m[38;2;246;108;28m [39m[38;2;247;104;31m[39m
|
||||
[38;2;31;247;105m[39m
|
||||
[38;2;39;251;92m [39m[38;2;43;252;88m [39m[38;2;46;253;84m [39m[38;2;49;253;80m [39m[38;2;52;254;76m [39m[38;2;56;254;73m [39m[38;2;59;254;69m [39m[38;2;63;254;65m [39m[38;2;67;254;61m [39m[38;2;70;254;58m [39m[38;2;74;254;54m [39m[38;2;78;254;51m [39m[38;2;82;253;48m [39m[38;2;86;252;44m [39m[38;2;90;251;41m [39m[38;2;94;250;38m┌[39m[38;2;98;249;35m─[39m[38;2;102;248;32m─[39m[38;2;106;246;30m─[39m[38;2;111;245;27m─[39m[38;2;115;243;24m─[39m[38;2;119;241;22m─[39m[38;2;123;240;20m─[39m[38;2;128;237;17m─[39m[38;2;132;235;15m─[39m[38;2;136;233;14m─[39m[38;2;140;231;12m─[39m[38;2;144;228;10m─[39m[38;2;149;225;8m─[39m[38;2;153;223;7m─[39m[38;2;157;220;6m─[39m[38;2;161;217;5m─[39m[38;2;165;214;4m─[39m[38;2;169;211;3m─[39m[38;2;173;207;2m─[39m[38;2;177;204;1m─[39m[38;2;181;201;1m─[39m[38;2;185;197;1m─[39m[38;2;188;194;1m─[39m[38;2;192;190;1m─[39m[38;2;196;186;1m─[39m[38;2;199;182;1m─[39m[38;2;203;179;1m┐[39m[38;2;206;175;2m[39m
|
||||
[38;2;49;253;80m [39m[38;2;52;254;76m [39m[38;2;56;254;73m [39m[38;2;59;254;69m [39m[38;2;63;254;65m [39m[38;2;67;254;61m [39m[38;2;70;254;58m [39m[38;2;74;254;54m [39m[38;2;78;254;51m [39m[38;2;82;253;48m [39m[38;2;86;252;44m [39m[38;2;90;251;41m [39m[38;2;94;250;38m [39m[38;2;98;249;35m [39m[38;2;102;248;32m [39m[38;2;106;246;30m│[39m[38;2;111;245;27mI[39m[38;2;115;243;24mn[39m[38;2;119;241;22mA[39m[38;2;123;240;20ml[39m[38;2;128;237;17mG[39m[38;2;132;235;15ma[39m[38;2;136;233;14mN[39m[38;2;140;231;12m [39m[38;2;144;228;10m [39m[38;2;149;225;8m/[39m[38;2;153;223;7m [39m[38;2;157;220;6m [39m[38;2;161;217;5mS[39m[38;2;165;214;4mi[39m[38;2;169;211;3mC[39m[38;2;173;207;2m│[39m[38;2;177;204;1m[39m
|
||||
[38;2;59;254;69m [39m[38;2;63;254;65m [39m[38;2;67;254;61m [39m[38;2;70;254;58m [39m[38;2;74;254;54m [39m[38;2;78;254;51m [39m[38;2;82;253;48m [39m[38;2;86;252;44m [39m[38;2;90;251;41m [39m[38;2;94;250;38m [39m[38;2;98;249;35m [39m[38;2;102;248;32m [39m[38;2;106;246;30m [39m[38;2;111;245;27m [39m[38;2;115;243;24m [39m[38;2;119;241;22m└[39m[38;2;123;240;20m─[39m[38;2;128;237;17m─[39m[38;2;132;235;15m─[39m[38;2;136;233;14m─[39m[38;2;140;231;12m─[39m[38;2;144;228;10m─[39m[38;2;149;225;8m─[39m[38;2;153;223;7m─[39m[38;2;157;220;6m─[39m[38;2;161;217;5m─[39m[38;2;165;214;4m─[39m[38;2;169;211;3m─[39m[38;2;173;207;2m─[39m[38;2;177;204;1m─[39m[38;2;181;201;1m─[39m[38;2;185;197;1m─[39m[38;2;188;194;1m─[39m[38;2;192;190;1m─[39m[38;2;196;186;1m─[39m[38;2;199;182;1m─[39m[38;2;203;179;1m─[39m[38;2;206;175;2m─[39m[38;2;209;171;2m─[39m[38;2;213;167;3m─[39m[38;2;216;163;4m─[39m[38;2;219;159;5m─[39m[38;2;222;154;7m┘[39m[38;2;224;150;8m[39m
|
||||
@@ -9,25 +9,35 @@ inputs:
|
||||
};});
|
||||
default = null;
|
||||
};
|
||||
config = let inherit (inputs.config.nixos.services) sshd; in inputs.lib.mkIf (sshd != null)
|
||||
{
|
||||
services.openssh =
|
||||
config = let inherit (inputs.config.nixos.services) sshd; in inputs.lib.mkIf (sshd != null) (inputs.lib.mkMerge
|
||||
[
|
||||
{
|
||||
enable = true;
|
||||
settings =
|
||||
services.openssh =
|
||||
{
|
||||
X11Forwarding = true;
|
||||
ChallengeResponseAuthentication = false;
|
||||
PasswordAuthentication = sshd.passwordAuthentication;
|
||||
KbdInteractiveAuthentication = false;
|
||||
UsePAM = true;
|
||||
enable = true;
|
||||
settings =
|
||||
{
|
||||
X11Forwarding = true;
|
||||
ChallengeResponseAuthentication = false;
|
||||
PasswordAuthentication = sshd.passwordAuthentication;
|
||||
KbdInteractiveAuthentication = false;
|
||||
UsePAM = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
nixos.services.xray.client.v2ray-forwarder.noproxyTcpPorts = [ 22 ];
|
||||
# generate from https://patorjk.com/software/taag with font "BlurVision ASCII"
|
||||
# generate using `toilet -f wideterm -F border "InAlGaN / SiC"`
|
||||
# somehow lolcat could not run with these characters, use rendered directly
|
||||
# TODO: move this settings to user
|
||||
users.motdFile = inputs.lib.mkIf sshd.groupBanner ./banner-rendered.txt;
|
||||
};
|
||||
nixos.services.xray.client.v2ray-forwarder.noproxyTcpPorts = [ 22 ];
|
||||
}
|
||||
# 如果是服务器,那么启用 motd
|
||||
(inputs.lib.mkIf (inputs.config.nixos.model.type == "server")
|
||||
{
|
||||
nixos =
|
||||
{
|
||||
packages.packages._packages =
|
||||
[ (inputs.pkgs.fancy-motd.overrideAttrs { src = inputs.topInputs.fancy-motd; }) ];
|
||||
user.sharedModules = [(home-inputs: { config.programs.zsh.loginExtra = "motd"; })];
|
||||
};
|
||||
# generate from https://patorjk.com/software/taag with font "BlurVision ASCII"
|
||||
# generate using `toilet -f wideterm -F border "InAlGaN / SiC"`
|
||||
environment.etc = inputs.lib.mkIf sshd.groupBanner { "fancy-motd/banner".source = ./banner.txt; };
|
||||
})
|
||||
]);
|
||||
}
|
||||
|
||||
48
modules/services/wechat2tg.nix
Normal file
48
modules/services/wechat2tg.nix
Normal file
@@ -0,0 +1,48 @@
|
||||
inputs:
|
||||
{
|
||||
options.nixos.services.wechat2tg = let inherit (inputs.lib) mkOption types; in mkOption
|
||||
{ type = types.nullOr (types.submodule {}); default = null; };
|
||||
config = let inherit (inputs.config.nixos.services) wechat2tg; in inputs.lib.mkIf (wechat2tg != null)
|
||||
{
|
||||
virtualisation.oci-containers.containers.wechat2tg =
|
||||
{
|
||||
image = "finalpi/wechat2tg:v1.3.3";
|
||||
imageFile = inputs.pkgs.dockerTools.pullImage
|
||||
{
|
||||
imageName = "finalpi/wechat2tg";
|
||||
imageDigest = "sha256:48e3aff3f501847f063318b41ca34af7d83278847d2eee40d7ffbf439ee4c194";
|
||||
sha256 = "04hq577d981mdfz0xwklhj9ifgnpbv91d6zkf37awfrbsiqfkrr6";
|
||||
finalImageName = "finalpi/wechat2tg";
|
||||
finalImageTag = "v1.3.3";
|
||||
};
|
||||
volumes = [ "wechat2tg-config:/app/storage" "wechat2tg-files:/app/save-files" ];
|
||||
environmentFiles = [ inputs.config.sops.templates."wechat2tg/env".path ];
|
||||
};
|
||||
sops =
|
||||
{
|
||||
templates."wechat2tg/env".content = let placeholder = inputs.config.sops.placeholder; in
|
||||
''
|
||||
BOT_TOKEN=${placeholder."wechat2tg/token"}
|
||||
# PROXY_HOST: ""
|
||||
# PROXY_PORT: ""
|
||||
# Proxy type: socks5, http, https
|
||||
# PROXY_PROTOCOL: 'socks5'
|
||||
# Optional username and password
|
||||
# PROXY_USERNAME: ""
|
||||
# PROXY_PASSWORD: ""
|
||||
# API_ID: ""
|
||||
# API_HASH: ""
|
||||
ROOM_MESSAGE='<i>🌐#[topic]</i> ---- <b>👤#[(alias)] #[name]: </b>'
|
||||
OFFICIAL_MESSAGE='<b>📣#[name]: </b>'
|
||||
CONTACT_MESSAGE='<b>👤#[alias_first]: </b>'
|
||||
ROOM_MESSAGE_GROUP='<b>👤#[(alias)] #[name]: </b>'
|
||||
OFFICIAL_MESSAGE_GROUP='<b>📣#[name]: </b>'
|
||||
CONTACT_MESSAGE_GROUP='<b>👤#[alias_first]: </b>'
|
||||
CREATE_ROOM_NAME='#[topic]'
|
||||
CREATE_CONTACT_NAME='#[alias]#[[name]]'
|
||||
MESSAGE_DISPLAY='#[identity]#[br]#[body]'
|
||||
'';
|
||||
secrets."wechat2tg/token" = {};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,7 @@ inputs:
|
||||
supportedFilesystems = [ "ntfs" "nfs" "nfsv4" ];
|
||||
# consoleLogLevel = 7;
|
||||
};
|
||||
hardware = { enableAllFirmware = true; bluetooth.enable = true; };
|
||||
hardware = { enableAllFirmware = true; bluetooth.enable = true; sensor.iio.enable = true; };
|
||||
environment =
|
||||
{
|
||||
sessionVariables = rec
|
||||
|
||||
@@ -85,12 +85,11 @@ inputs:
|
||||
# resume
|
||||
(inputs.lib.mkIf (fileSystems.resume != null) { boot =
|
||||
(
|
||||
if builtins.typeOf fileSystems.resume == "string" then
|
||||
{ resumeDevice = fileSystems.resume; }
|
||||
if builtins.typeOf fileSystems.resume == "string" then { resumeDevice = fileSystems.resume; }
|
||||
else
|
||||
{
|
||||
resumeDevice = fileSystems.resume.device;
|
||||
kernelModules = [ "resume_offset=${builtins.toString fileSystems.resume.offset}" ];
|
||||
kernelParams = [ "resume_offset=${builtins.toString fileSystems.resume.offset}" ];
|
||||
}
|
||||
);})
|
||||
# rollingRootfs
|
||||
|
||||
@@ -9,7 +9,7 @@ inputs:
|
||||
[
|
||||
noto-fonts source-han-sans source-han-serif source-code-pro hack-font jetbrains-mono nerdfonts hack-font inter
|
||||
noto-fonts-color-emoji roboto sarasa-gothic source-han-mono wqy_microhei wqy_zenhei noto-fonts-cjk-sans
|
||||
noto-fonts-emoji corefonts vistafonts vistafonts-chs
|
||||
noto-fonts-emoji corefonts vistafonts vistafonts-chs dejavu_fonts
|
||||
];
|
||||
fontconfig.defaultFonts =
|
||||
{
|
||||
|
||||
@@ -4,7 +4,8 @@ inputs:
|
||||
{
|
||||
variant = mkOption
|
||||
{
|
||||
type = types.enum [ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "cachyos-server" "zen" ];
|
||||
type = types.nullOr (types.enum
|
||||
[ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "cachyos-server" "zen" ]);
|
||||
default = "xanmod-lts";
|
||||
};
|
||||
patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
|
||||
@@ -38,7 +39,7 @@ inputs:
|
||||
extraModulePackages = with inputs.config.boot.kernelPackages; [ v4l2loopback zenpower ];
|
||||
extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig;
|
||||
kernelParams = [ "delayacct" ];
|
||||
kernelPackages =
|
||||
kernelPackages = inputs.lib.mkIf (kernel.variant != null)
|
||||
{
|
||||
nixos = inputs.pkgs.linuxPackages;
|
||||
xanmod-lts = inputs.pkgs.linuxPackages_xanmod;
|
||||
@@ -73,45 +74,6 @@ inputs:
|
||||
HZ = inputs.lib.mkForce (freeform "1000");
|
||||
};
|
||||
}];
|
||||
surface =
|
||||
let
|
||||
version =
|
||||
let versionArray = builtins.splitVersion inputs.config.boot.kernelPackages.kernel.version;
|
||||
in "${builtins.elemAt versionArray 0}.${builtins.elemAt versionArray 1}";
|
||||
kernelPatches = builtins.map
|
||||
(file:
|
||||
{
|
||||
name = "surface-${file.name}";
|
||||
patch = "${inputs.topInputs.linux-surface}/patches/${version}/${file.name}";
|
||||
})
|
||||
(builtins.filter
|
||||
(file: file.value == "regular")
|
||||
(inputs.localLib.attrsToList (builtins.readDir
|
||||
"${inputs.topInputs.linux-surface}/patches/${version}")));
|
||||
kernelConfig = builtins.removeAttrs
|
||||
(builtins.listToAttrs (builtins.concatLists (builtins.map
|
||||
(configString:
|
||||
if builtins.match "CONFIG_.*=." configString == [] then
|
||||
(
|
||||
let match = builtins.match "CONFIG_(.*)=(.)" configString; in with inputs.lib.kernel;
|
||||
[{
|
||||
name = builtins.elemAt match 0;
|
||||
value = { m = module; y = yes; }.${builtins.elemAt match 1};
|
||||
}]
|
||||
)
|
||||
else if builtins.match "# CONFIG_.* is not set" configString == [] then
|
||||
[{
|
||||
name = builtins.elemAt (builtins.match "# CONFIG_(.*) is not set" configString) 0;
|
||||
value = inputs.lib.kernel.unset;
|
||||
}]
|
||||
else if builtins.match "#.*" configString == [] then []
|
||||
else if configString == "" then []
|
||||
else throw "could not parse: ${configString}"
|
||||
)
|
||||
(inputs.lib.strings.splitString "\n"
|
||||
(builtins.readFile "${inputs.topInputs.linux-surface}/configs/surface-${version}.config")))))
|
||||
[ "VIDEO_IPU3_IMGU" ];
|
||||
in kernelPatches ++ [{ name = "surface-config"; patch = null; extraStructuredConfig = kernelConfig; }];
|
||||
hibernate-progress =
|
||||
[{
|
||||
name = "hibernate-progress";
|
||||
@@ -127,5 +89,10 @@ inputs:
|
||||
inputs.lib.mkIf (kernel.variant == "rpi3")
|
||||
{ boot.initrd = { systemd.enableTpm2 = false; includeDefaultModules = false; }; }
|
||||
)
|
||||
# enable scx when using cachyos
|
||||
# (
|
||||
# inputs.lib.mkIf (builtins.elem kernel.variant [ "cachyos" "cachyos-lto" "cachyos-server" ])
|
||||
# { services.scx = { enable = true; scheduler = "scx_lavd"; extraArgs = [ "--autopower" ]; }; }
|
||||
# )
|
||||
];
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ inputs:
|
||||
hosts = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
|
||||
};
|
||||
};
|
||||
githubToken.enable = mkOption { type = types.bool; default = false; };
|
||||
githubToken.enable = mkOption { type = types.bool; default = inputs.config.nixos.model.private; };
|
||||
};
|
||||
config = let inherit (inputs.config.nixos.system) nix; in inputs.lib.mkMerge
|
||||
[
|
||||
|
||||
@@ -49,7 +49,7 @@ inputs:
|
||||
{
|
||||
# TODO: change znver4 after update oneapi
|
||||
# TODO: test znver3 do use AVX
|
||||
oneapiArch = let match = { znver3 = "CORE-AVX2"; znver4 = "core-avx2"; };
|
||||
oneapiArch = let match = {};
|
||||
in match.${nixpkgs.march} or nixpkgs.march;
|
||||
nvhpcArch = nixpkgs.march;
|
||||
# contentAddressedByDefault = true;
|
||||
|
||||
12
modules/user/chn/age.nix
Normal file
12
modules/user/chn/age.nix
Normal file
@@ -0,0 +1,12 @@
|
||||
inputs:
|
||||
{
|
||||
config = inputs.lib.mkIf ((builtins.elem "chn" inputs.config.nixos.user.users) && inputs.config.nixos.model.private)
|
||||
{
|
||||
home-manager.users.chn = homeInputs:
|
||||
{
|
||||
config.xdg.configFile."sops/age/keys.txt".source =
|
||||
homeInputs.config.lib.file.mkOutOfStoreSymlink inputs.config.sops.secrets."chn/age".path;
|
||||
};
|
||||
sops.secrets."chn/age".owner = "chn";
|
||||
};
|
||||
}
|
||||
@@ -16,33 +16,7 @@ inputs:
|
||||
{
|
||||
config =
|
||||
{
|
||||
programs =
|
||||
{
|
||||
git = { userName = "chn"; userEmail = "chn@chn.moe"; };
|
||||
ssh =
|
||||
{
|
||||
matchBlocks = rec
|
||||
{
|
||||
# identityFile = "~/.ssh/xmuhk_id_rsa";
|
||||
xmuhk = { host = "xmuhk"; hostname = "10.26.14.56"; user = "xmuhk"; };
|
||||
xmuhk2 = { host = "xmuhk2"; hostname = "183.233.219.132"; user = "xmuhk"; port = 62022; };
|
||||
jykang.setEnv.TERM = "chn_unset_ls_colors:chn_cd:linwei/chn:chn_debug:xterm-256color";
|
||||
"internal.jykang" = jykang;
|
||||
}
|
||||
// (builtins.listToAttrs (builtins.map
|
||||
(system: { name = system; value = { forwardAgent = true; extraOptions.AddKeysToAgent = "yes"; }; })
|
||||
[
|
||||
"vps4" "vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.pc" "nas" "wireguard.nas" "pc"
|
||||
"wireguard.surface" "xmupc1" "wireguard.xmupc1" "xmupc2" "wireguard.xmupc2"
|
||||
]));
|
||||
extraConfig =
|
||||
inputs.lib.mkIf (builtins.elem inputs.config.nixos.model.hostname [ "pc" "surface" ])
|
||||
''
|
||||
IdentityFile ~/.ssh/id_rsa
|
||||
IdentityFile ~/.ssh/id_ed25519_sk
|
||||
'';
|
||||
};
|
||||
};
|
||||
programs.git = { userName = "chn"; userEmail = "chn@chn.moe"; };
|
||||
home =
|
||||
{
|
||||
file.groupshare.enable = false;
|
||||
|
||||
@@ -49,14 +49,14 @@ inputs:
|
||||
};
|
||||
crow-translate = rec
|
||||
{
|
||||
fileName = "io.crow_translate.CrowTranslate.desktop";
|
||||
fileName = "org.kde.CrowTranslate.desktop";
|
||||
path = "${inputs.pkgs.crow-translate}/share/applications/${fileName}";
|
||||
};
|
||||
};
|
||||
devices =
|
||||
{
|
||||
pc = [ "nheko" "kclockd" "yakuake" "telegram" "element" "kmail" "discord" "crow-translate" ];
|
||||
surface = [ "kclockd" "yakuake" "telegram" "element" "crow-translate" ];
|
||||
one = [ "kclockd" "yakuake" "telegram" "element" "kmail" "crow-translate" ];
|
||||
};
|
||||
in builtins.listToAttrs (builtins.map
|
||||
(file:
|
||||
|
||||
@@ -15,7 +15,7 @@ inputs:
|
||||
right = [ "help" "keep-below-windows" "keep-above-windows" "minimize" "maximize" "close" ];
|
||||
left = [ "more-window-actions" ];
|
||||
};
|
||||
virtualDesktops = { rows = 1; number = 6; };
|
||||
virtualDesktops = inputs.lib.mkIf (inputs.config.nixos.model.hostname == "pc") { rows = 2; number = 6; };
|
||||
effects = { shakeCursor.enable = true; desktopSwitching.animation = "slide"; };
|
||||
};
|
||||
windows.allowWindowsToRememberPositions = false;
|
||||
|
||||
@@ -63,10 +63,10 @@ inputs:
|
||||
{
|
||||
kwin =
|
||||
{
|
||||
"Switch One Desktop to the Left" = [ "Ctrl+PgUp" "Ctrl+Num+PgUp" ];
|
||||
"Switch One Desktop to the Right" = [ "Ctrl+PgDown" "Ctrl+Num+PgDown" ];
|
||||
"Window One Desktop to the Left" = [ "Meta+Ctrl+PgUp" "Meta+Ctrl+Num+PgUp" ];
|
||||
"Window One Desktop to the Right" = [ "Meta+Ctrl+PgDown" "Meta+Ctrl+Num+PgDown" ];
|
||||
"Switch to Previous Desktop" = [ "Ctrl+PgUp" "Ctrl+Num+PgUp" ];
|
||||
"Switch to Next Desktop" = [ "Ctrl+PgDown" "Ctrl+Num+PgDown" ];
|
||||
"Window to Previous Desktop" = [ "Meta+Ctrl+PgUp" "Meta+Ctrl+Num+PgUp" ];
|
||||
"Window to Next Desktop" = [ "Meta+Ctrl+PgDown" "Meta+Ctrl+Num+PgDown" ];
|
||||
};
|
||||
}
|
||||
# media
|
||||
|
||||
@@ -6,7 +6,6 @@ inputs:
|
||||
wallpaper =
|
||||
{
|
||||
pc = "${nixos-wallpaper}/pixiv-117612023.png";
|
||||
surface = "${nixos-wallpaper}/fanbox-6682738.png";
|
||||
}.${inputs.config.nixos.model.hostname} or "${nixos-wallpaper}/pixiv-96734339-x2.png";
|
||||
in
|
||||
{
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
inputs:
|
||||
{
|
||||
config = inputs.lib.mkIf
|
||||
(
|
||||
(builtins.elem "chn" inputs.config.nixos.user.users)
|
||||
&& (builtins.elem inputs.config.nixos.model.hostname [ "pc" "surface" ])
|
||||
)
|
||||
{
|
||||
home-manager.users.chn = homeInputs:
|
||||
{
|
||||
config.xdg.configFile."sops/age/keys.txt".source =
|
||||
homeInputs.config.lib.file.mkOutOfStoreSymlink inputs.config.sops.secrets.age.path;
|
||||
};
|
||||
sops.secrets.age.owner = "chn";
|
||||
};
|
||||
}
|
||||
64
modules/user/chn/ssh.nix
Normal file
64
modules/user/chn/ssh.nix
Normal file
@@ -0,0 +1,64 @@
|
||||
inputs:
|
||||
{
|
||||
config = let inherit (inputs.config.nixos) user; in inputs.lib.mkIf (builtins.elem "chn" user.users)
|
||||
{
|
||||
home-manager.users.chn = homeInputs:
|
||||
{
|
||||
config =
|
||||
{
|
||||
programs.ssh =
|
||||
{
|
||||
matchBlocks = rec
|
||||
{
|
||||
xmuhk = { host = "xmuhk"; hostname = "10.26.14.56"; user = "xmuhk"; };
|
||||
xmuhk2 = { host = "xmuhk2"; hostname = "183.233.219.132"; user = "xmuhk"; port = 62022; };
|
||||
jykang.setEnv.TERM = "chn_unset_ls_colors:chn_cd:linwei/chn:chn_debug:xterm-256color";
|
||||
"wireguard.jykang" = jykang;
|
||||
}
|
||||
// (builtins.listToAttrs (builtins.map
|
||||
(system: { name = system; value = { forwardAgent = true; extraOptions.AddKeysToAgent = "yes"; }; })
|
||||
[
|
||||
"vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.pc" "nas" "wireguard.nas" "pc"
|
||||
"xmupc1" "wireguard.xmupc1" "xmupc2" "wireguard.xmupc2" "one" "wireguard.one"
|
||||
]));
|
||||
extraConfig = inputs.lib.mkIf inputs.config.nixos.model.private
|
||||
''
|
||||
IdentityFile ~/.ssh/id_rsa
|
||||
IdentityFile ~/.ssh/xmuhk_id_rsa
|
||||
IdentityFile ~/.ssh/id_ed25519_sk
|
||||
'';
|
||||
};
|
||||
home.file = inputs.lib.mkIf inputs.config.nixos.model.private
|
||||
{
|
||||
".ssh/id_rsa".source =
|
||||
homeInputs.config.lib.file.mkOutOfStoreSymlink inputs.config.sops.secrets."chn/rsa".path;
|
||||
".ssh/id_rsa.pub".text = "ssh-rsa "
|
||||
+ "AAAAB3NzaC1yc2EAAAADAQABAAABAQDXlhoouWG+arWJz02vBP/lxpG2tUjx8jhGBnDeNyMu0OtGcnHMAWcb3YDP0A2XJ"
|
||||
+ "IVFBCCZMM2REwnSNbHRSCl1mTdRbelfjA+7Jqn1wnrDXkAOG3S8WYXryPGpvavu6lgW7p+dIhGiTLWwRbFH+epFTn1hZ3"
|
||||
+ "A1UofVIWTOPdoOnx6k7DpQtIVMWiIXLg0jIkOZiTMr3jKfzLMBAqQ1xbCV2tVwbEY02yxxyxIznbpSPReyn1RDLWyqqLR"
|
||||
+ "d/oqGPzzhEXNGNAZWnSoItkYq9Bxh2AvMBihiTir3FEVPDgDLtS5LUpM93PV1yTr6JyCPAod9UAxpfBYzHKse0KCQFoZH"
|
||||
+ " chn@chn-PC";
|
||||
".ssh/id_rsa.ppk".source =
|
||||
homeInputs.config.lib.file.mkOutOfStoreSymlink inputs.config.sops.secrets."chn/rsa.ppk".path;
|
||||
".ssh/id_ed25519".source =
|
||||
homeInputs.config.lib.file.mkOutOfStoreSymlink inputs.config.sops.secrets."chn/ed25519".path;
|
||||
".ssh/id_ed25519.pub".text =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOH3AvxMlB3omzH6SFQt0Z5+f05x9nMJpFfSLH4OIYV+ chn@pc";
|
||||
".ssh/id_ed25519_sk".source =
|
||||
homeInputs.config.lib.file.mkOutOfStoreSymlink inputs.config.sops.secrets."chn/ed25519_sk".path;
|
||||
".ssh/id_ed25519_sk.pub".source = ./id_ed25519_sk.pub;
|
||||
".ssh/xmuhk_id_rsa".source =
|
||||
homeInputs.config.lib.file.mkOutOfStoreSymlink inputs.config.sops.secrets."chn/xmuhk".path;
|
||||
};
|
||||
};
|
||||
};
|
||||
sops.secrets = inputs.lib.mkIf inputs.config.nixos.model.private
|
||||
{
|
||||
"chn/rsa".owner = "chn";
|
||||
"chn/rsa.ppk".owner = "chn";
|
||||
"chn/ed25519".owner = "chn";
|
||||
"chn/ed25519_sk".owner = "chn";
|
||||
"chn/xmuhk".owner = "chn";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -27,6 +27,7 @@ inputs:
|
||||
GROUPIII-3 = 1013;
|
||||
lly = 1014;
|
||||
yxf = 1015;
|
||||
hss = 1016;
|
||||
misskey-misskey = 2000;
|
||||
misskey-misskey-old = 2001;
|
||||
frp = 2002;
|
||||
|
||||
1
modules/user/hss/id_ed25519.pub
Normal file
1
modules/user/hss/id_ed25519.pub
Normal file
@@ -0,0 +1 @@
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJi6O1Sf1BBV1dYyH1jcHiws+ntwVfV29+6Paq1CQaET hss
|
||||
@@ -27,6 +27,7 @@ find_package(HDF5 REQUIRED)
|
||||
find_package(concurrencpp REQUIRED)
|
||||
find_path(POCKETFFT_INCLUDE_DIR pocketfft.h REQUIRED)
|
||||
find_package(yaml-cpp REQUIRED)
|
||||
find_package(glaze REQUIRED)
|
||||
|
||||
add_library(biu src/common.cpp src/hdf5.cpp src/string.cpp)
|
||||
target_include_directories(biu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
@@ -34,7 +35,7 @@ target_include_directories(biu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_D
|
||||
${LIBBACKTRACE_INCLUDE_DIR} ${POCKETFFT_INCLUDE_DIR})
|
||||
target_link_libraries(biu PUBLIC magic_enum::magic_enum fmt::fmt Boost::headers Boost::iostreams Boost::filesystem
|
||||
range-v3::range-v3 Eigen3::Eigen HighFive TgBot::TgBot ${LIBBACKTRACE_LIBRARY} hdf5::hdf5 concurrencpp::concurrencpp
|
||||
yaml-cpp::yaml-cpp)
|
||||
yaml-cpp::yaml-cpp glaze::glaze)
|
||||
target_compile_features(biu PUBLIC cxx_std_23)
|
||||
target_compile_options(biu PUBLIC -Wno-gnu-string-literal-operator-template)
|
||||
install(TARGETS biu EXPORT biuTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
@@ -83,6 +84,10 @@ set_property(TARGET test-yaml PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON)
|
||||
add_test(NAME test-yaml COMMAND test-yaml)
|
||||
add_executable(test-logger test/logger.cpp)
|
||||
target_link_libraries(test-logger PRIVATE biu)
|
||||
target_compile_definitions(test-logger PRIVATE BIU_LOGGING_DEBUG BIU_LOGGING_SOURCE_ROOT="${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
target_compile_definitions(test-logger PRIVATE BIU_LOGGER_DEBUG BIU_LOGGER_SOURCE_ROOT="${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
set_property(TARGET test-logger PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON)
|
||||
add_test(NAME test-logger COMMAND test-logger)
|
||||
add_executable(test-glaze test/glaze.cpp)
|
||||
target_link_libraries(test-glaze PRIVATE biu)
|
||||
set_property(TARGET test-glaze PROPERTY CXX_STANDARD 23 CXX_STANDARD_REQUIRED ON)
|
||||
add_test(NAME test-glaze COMMAND test-glaze)
|
||||
|
||||
@@ -14,3 +14,4 @@ find_package(HDF5 REQUIRED)
|
||||
find_package(concurrencpp REQUIRED)
|
||||
find_path(POCKETFFT_INCLUDE_DIR pocketfft.h REQUIRED)
|
||||
find_package(yaml-cpp REQUIRED)
|
||||
find_package(glaze REQUIRED)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
stdenv, cmake, lib,
|
||||
magic-enum, fmt, boost, eigen, range-v3, nameof, zpp-bits, highfive, tgbot-cpp, libbacktrace, hdf5, concurrencpp,
|
||||
pocketfft, yaml-cpp
|
||||
pocketfft, yaml-cpp, glaze
|
||||
}: stdenv.mkDerivation rec
|
||||
{
|
||||
name = "biu";
|
||||
@@ -9,7 +9,7 @@
|
||||
buildInputs =
|
||||
[
|
||||
magic-enum fmt boost range-v3 nameof zpp-bits eigen highfive tgbot-cpp libbacktrace hdf5
|
||||
concurrencpp pocketfft yaml-cpp
|
||||
concurrencpp pocketfft yaml-cpp glaze
|
||||
];
|
||||
propagatedBuildInputs = buildInputs;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -15,4 +15,5 @@
|
||||
# include <biu/fft.tpp>
|
||||
# include <biu/yaml.tpp>
|
||||
# include <biu/serialize.tpp>
|
||||
# include <biu/glaze.tpp>
|
||||
# include <range/v3/all.hpp>
|
||||
|
||||
31
packages/biu/include/biu/glaze.hpp
Normal file
31
packages/biu/include/biu/glaze.hpp
Normal file
@@ -0,0 +1,31 @@
|
||||
# pragma once
|
||||
# include <biu/eigen.hpp>
|
||||
# include <glaze/glaze.hpp>
|
||||
|
||||
namespace glz::detail
|
||||
{
|
||||
template <biu::EigenMatrix Matrix> struct from<JSON, Matrix>
|
||||
{
|
||||
template <auto Opts> static void op(Matrix& matrix, auto&&... args);
|
||||
};
|
||||
|
||||
template <biu::EigenMatrix Matrix> struct to<JSON, Matrix>
|
||||
{
|
||||
template <auto Opts> static void op(Matrix& matrix, auto&&... args) noexcept;
|
||||
};
|
||||
}
|
||||
|
||||
template <typename Scalar, int Rows, int Cols, int Options, int MaxRows, int MaxCols>
|
||||
struct glz::meta<Eigen::Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols>>
|
||||
{
|
||||
static constexpr std::string_view name = join_v
|
||||
<
|
||||
chars<"Eigen::Matrix<">, name_v<Scalar>, chars<",">,
|
||||
chars<num_to_string<Rows>::value>, chars<",">,
|
||||
chars<num_to_string<Cols>::value>, chars<",">,
|
||||
chars<num_to_string<Options>::value>, chars<",">,
|
||||
chars<num_to_string<MaxRows>::value>, chars<",">,
|
||||
chars<num_to_string<MaxCols>::value>,
|
||||
chars<">">
|
||||
>;
|
||||
};
|
||||
15
packages/biu/include/biu/glaze.tpp
Normal file
15
packages/biu/include/biu/glaze.tpp
Normal file
@@ -0,0 +1,15 @@
|
||||
# pragma once
|
||||
# include <biu/glaze.hpp>
|
||||
|
||||
template <biu::EigenMatrix Matrix> template <auto Opts> void
|
||||
glz::detail::from<glz::JSON, Matrix>::op(Matrix& matrix, auto&&... args)
|
||||
{
|
||||
decltype(matrix | biu::fromEigen) std_matrix;
|
||||
read<JSON>::op<Opts>(std_matrix, args...);
|
||||
matrix = std_matrix | biu::toEigen<>;
|
||||
}
|
||||
template <biu::EigenMatrix Matrix> template <auto Opts> void
|
||||
glz::detail::to<glz::JSON, Matrix>::op(Matrix& matrix, auto&&... args) noexcept
|
||||
{
|
||||
write<JSON>::op<Opts>(matrix | biu::fromEigen, args...);
|
||||
}
|
||||
@@ -84,8 +84,13 @@ namespace biu
|
||||
auto&& lock = Threads_.lock();
|
||||
if (auto thread_id = get_thread_id(); lock->contains(thread_id)) lock.value()[thread_id]++;
|
||||
else lock->emplace(thread_id, 1);
|
||||
auto try_format = []<typename T>(T&& value) -> std::string
|
||||
{
|
||||
if constexpr (fmt::is_formattable<T, char>::value) return "{}"_f(std::forward<T>(value));
|
||||
else return "({})"_f(nameof::nameof_full_type<T>());
|
||||
};
|
||||
if constexpr (sizeof...(Param) > 0)
|
||||
debug("begin function with {{{}}}."_f(fmt::join({"{}"_f(std::forward<Param>(param))...}, ", ")));
|
||||
debug("begin function with {{{}}}."_f(fmt::join({try_format(std::forward<Param>(param))...}, ", ")));
|
||||
else debug("begin function.");
|
||||
}
|
||||
|
||||
@@ -123,10 +128,10 @@ namespace biu
|
||||
time,
|
||||
get_thread_id() % std::numeric_limits<std::uint16_t>::max(),
|
||||
Indent_,
|
||||
message,
|
||||
source_file.empty() ? "??"s : source_file,
|
||||
stack[0].source_line() == 0 ? "??"s : "{}"_f(stack[0].source_line()),
|
||||
stack[0].name(),
|
||||
message
|
||||
stack[0].name()
|
||||
) << std::flush;
|
||||
# else
|
||||
*lock->Stream << "[ {:%T} {:02x} {:02} ] {}\n"_f
|
||||
|
||||
@@ -24,11 +24,21 @@ namespace YAML
|
||||
static Node encode(const Optional&);
|
||||
static bool decode(const Node& node, Optional&);
|
||||
};
|
||||
template <biu::SpecializationOf<std::unique_ptr> Ptr> struct convert<Ptr>
|
||||
{
|
||||
static Node encode(const Ptr&);
|
||||
static bool decode(const Node& node, Ptr&);
|
||||
};
|
||||
template <biu::Set Set> struct convert<Set>
|
||||
{
|
||||
static Node encode(const Set&);
|
||||
static bool decode(const Node& node, Set&);
|
||||
};
|
||||
template <biu::Enumerable Enum> struct convert<Enum>
|
||||
{
|
||||
static Node encode(const Enum&);
|
||||
static bool decode(const Node& node, Enum&);
|
||||
};
|
||||
template <typename T> struct convert
|
||||
{
|
||||
static Node encode(const T&);
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
# include <biu/eigen.hpp>
|
||||
# include <boost/pfr.hpp>
|
||||
# include <boost/pfr/core_name.hpp>
|
||||
# include <nameof.hpp>
|
||||
# include <magic_enum.hpp>
|
||||
|
||||
namespace YAML
|
||||
{
|
||||
@@ -50,6 +52,23 @@ namespace YAML
|
||||
}
|
||||
return true;
|
||||
}
|
||||
template <biu::SpecializationOf<std::unique_ptr> Ptr> Node convert<Ptr>::encode(const Ptr& ptr)
|
||||
{
|
||||
if (ptr) return convert<typename Ptr::element_type>::encode(*ptr);
|
||||
else return YAML::Node{};
|
||||
}
|
||||
template <biu::SpecializationOf<std::unique_ptr> Ptr> bool convert<Ptr>::decode
|
||||
(const Node& node, Ptr& ptr)
|
||||
{
|
||||
if (!node.IsDefined() || node.IsNull()) ptr = nullptr;
|
||||
else
|
||||
{
|
||||
auto* value = new typename Ptr::element_type;
|
||||
if (!convert<typename Ptr::element_type>::decode(node, *value)) return false;
|
||||
ptr.reset(value);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
template <biu::Set Set> Node convert<Set>::encode(const Set& set)
|
||||
{ return convert<std::vector<typename Set::value_type>>::encode(set | ranges::to_vector); }
|
||||
template <biu::Set Set> bool convert<Set>::decode(const Node& node, Set& set)
|
||||
@@ -59,6 +78,16 @@ namespace YAML
|
||||
set = vec | ranges::to<Set>;
|
||||
return true;
|
||||
}
|
||||
template <biu::Enumerable Enum> Node convert<Enum>::encode(const Enum& e)
|
||||
{ return convert<std::string_view>::encode(nameof::nameof_enum(e)); }
|
||||
template <biu::Enumerable Enum> bool convert<Enum>::decode(const Node& node, Enum& e)
|
||||
{
|
||||
std::string name;
|
||||
if (!convert<std::string>::decode(node, name)) return false;
|
||||
auto optional_value = magic_enum::enum_cast<Enum>(name);
|
||||
if (!optional_value) return false;
|
||||
else { e = *optional_value; return true; }
|
||||
}
|
||||
template <typename T> Node convert<T>::encode(const T& t)
|
||||
{
|
||||
YAML::Node node;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# include <biu.hpp>
|
||||
# include <glaze/glaze.hpp>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
||||
20
packages/biu/test/glaze.cpp
Normal file
20
packages/biu/test/glaze.cpp
Normal file
@@ -0,0 +1,20 @@
|
||||
// # include <biu.hpp>
|
||||
# include <glaze/glaze.hpp>
|
||||
# include <Eigen/Dense>
|
||||
# include <glaze/ext/eigen.hpp>
|
||||
|
||||
struct aaa
|
||||
{
|
||||
int a = 1;
|
||||
double b = 2;
|
||||
std::string c = "3";
|
||||
Eigen::Matrix3d d = Eigen::Matrix3d::Identity();
|
||||
bool operator==(const aaa&) const = default;
|
||||
} bbb;
|
||||
|
||||
int main()
|
||||
{
|
||||
auto result = glz::write_json(bbb.d).value();
|
||||
// auto result2 = glz::read_json<aaa>(result).value();
|
||||
// assert(bbb == result2);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
# include <biu.hpp>
|
||||
int main()
|
||||
{
|
||||
biu::Logger::Guard guard;
|
||||
biu::Logger::Guard log("test", nullptr, std::ofstream());
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ int main()
|
||||
a: [ 1, 2, 3 ]
|
||||
b: [ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 7, 8, 9 ] ]
|
||||
c: [ 1, 2 ]
|
||||
d: null
|
||||
)";
|
||||
auto node = YAML::Load(data);
|
||||
auto a = node["a"].as<Eigen::Vector3i>();
|
||||
@@ -30,12 +31,19 @@ c: [ 1, 2 ]
|
||||
Eigen::Vector3i a;
|
||||
Eigen::Matrix3i b;
|
||||
std::complex<double> c;
|
||||
std::unique_ptr<Eigen::Matrix3d> d;
|
||||
};
|
||||
auto a3 = node.as<A>();
|
||||
assert(a3.a == a);
|
||||
assert(a3.b == b);
|
||||
assert(a3.c == c);
|
||||
assert(a3.d == nullptr);
|
||||
auto e = node["c"].as<std::set<int>>();
|
||||
assert((e == std::set<int>{1, 2}));
|
||||
node["c"] = e;
|
||||
std::string data2 = R"(
|
||||
a: AAA
|
||||
)";
|
||||
enum class E { AAA, BBB, CCC };
|
||||
auto f = YAML::Load(data2)["a"].as<E>();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,6 @@ inputs: rec
|
||||
date = inputs.pkgs.callPackage ./date.nix { src = inputs.topInputs.date; };
|
||||
blurred-wallpaper = inputs.pkgs.callPackage ./blurred-wallpaper.nix { src = inputs.topInputs.blurred-wallpaper; };
|
||||
slate = inputs.pkgs.callPackage ./slate.nix { src = inputs.topInputs.slate; };
|
||||
nvhpc = inputs.pkgs.callPackage ./nvhpc.nix {};
|
||||
lmod = inputs.pkgs.callPackage ./lmod.nix { src = inputs.topInputs.lmod; };
|
||||
vasp = rec
|
||||
{
|
||||
@@ -40,13 +39,15 @@ inputs: rec
|
||||
};
|
||||
nvidia = inputs.pkgs.callPackage ./vasp/nvidia
|
||||
{
|
||||
inherit lmod nvhpc vtst src;
|
||||
hdf5 = hdf5-nvhpc;
|
||||
inherit (nvhpcPackages) stdenv hdf5;
|
||||
inherit src;
|
||||
vtst = inputs.topInputs.self.src.vtst.patch;
|
||||
wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
|
||||
};
|
||||
intel = inputs.pkgs.callPackage ./vasp/intel
|
||||
{
|
||||
inherit vtst src;
|
||||
inherit src;
|
||||
vtst = inputs.topInputs.self.src.vtst.patch;
|
||||
inherit (inputs.pkgs.intelPackages_2023) stdenv;
|
||||
mpi = inputs.pkgs.openmpi.override
|
||||
{
|
||||
@@ -63,9 +64,7 @@ inputs: rec
|
||||
};
|
||||
wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
|
||||
};
|
||||
hdf5-nvhpc = inputs.pkgs.callPackage ./vasp/hdf5-nvhpc { inherit lmod nvhpc; inherit (inputs.pkgs.hdf5) src; };
|
||||
vtst = (inputs.pkgs.callPackage ./vasp/vtst.nix {});
|
||||
vtstscripts = inputs.pkgs.callPackage ./vasp/vtstscripts.nix {};
|
||||
vtst = inputs.pkgs.callPackage ./vasp/vtst.nix { src = inputs.topInputs.self.src.vtst.script; };
|
||||
};
|
||||
mumax = inputs.pkgs.callPackage ./mumax.nix { src = inputs.topInputs.mumax; };
|
||||
biu = inputs.pkgs.callPackage ./biu
|
||||
@@ -92,13 +91,33 @@ inputs: rec
|
||||
sockpp = inputs.pkgs.callPackage ./sockpp.nix { src = inputs.topInputs.sockpp; };
|
||||
git-lfs-transfer = inputs.pkgs.callPackage ./git-lfs-transfer.nix
|
||||
{ src = inputs.topInputs.git-lfs-transfer; hash = inputs.topInputs.self.src.git-lfs-transfer; };
|
||||
py4vasp = inputs.pkgs.callPackage ./py4vasp { src = inputs.topInputs.py4vasp; };
|
||||
py4vasp = inputs.pkgs.python3Packages.callPackage ./py4vasp.nix { src = inputs.topInputs.py4vasp; inherit nglview; };
|
||||
pocketfft = inputs.pkgs.callPackage ./pocketfft.nix { src = inputs.topInputs.pocketfft; };
|
||||
spectroscopy = inputs.pkgs.callPackage ./spectroscopy.nix { src = inputs.topInputs.spectroscopy; };
|
||||
mirism = inputs.pkgs.callPackage ./mirism { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; };
|
||||
vaspberry = inputs.pkgs.callPackage ./vaspberry.nix { src = inputs.topInputs.vaspberry; };
|
||||
nvhpcStdenv = inputs.pkgs.callPackage ./nvhpcStdenv.nix { src = inputs.topInputs.self.src.nvhpc; };
|
||||
nvhpcPackages = inputs.pkgs.lib.makeScope inputs.pkgs.newScope (final:
|
||||
{
|
||||
stdenv = nvhpcStdenv;
|
||||
fmt = (inputs.pkgs.fmt.override { inherit (final) stdenv; }).overrideAttrs { doCheck = false; };
|
||||
hdf5 = inputs.pkgs.hdf5.override
|
||||
{ inherit (final) stdenv; cppSupport = false; fortranSupport = true; enableShared = false; enableStatic = true; };
|
||||
});
|
||||
gccFull = inputs.pkgs.symlinkJoin
|
||||
{
|
||||
name = "gcc";
|
||||
paths = with inputs.pkgs;
|
||||
[
|
||||
# wrapped binaries
|
||||
gcc gfortran glibc glibc.dev binutils iconv
|
||||
# not wrapped binaries
|
||||
gcc.cc gcc.cc.lib gfortran.cc gfortran.cc.lib binutils.bintools
|
||||
];
|
||||
};
|
||||
highfive = inputs.pkgs.callPackage ./highfive.nix { src = inputs.topInputs.highfive; };
|
||||
stickerpicker = inputs.pkgs.python3Packages.callPackage ./stickerpicker.nix { src = inputs.topInputs.stickerpicker; };
|
||||
nglview = inputs.pkgs.python3Packages.callPackage ./nglview.nix { src = inputs.topInputs.self.src.nglview; };
|
||||
|
||||
fromYaml = content: builtins.fromJSON (builtins.readFile
|
||||
(inputs.pkgs.runCommand "toJSON" {}
|
||||
|
||||
1
packages/hpcstat/share/keys/hss
Normal file
1
packages/hpcstat/share/keys/hss
Normal file
@@ -0,0 +1 @@
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJi6O1Sf1BBV1dYyH1jcHiws+ntwVfV29+6Paq1CQaET hss
|
||||
@@ -15,6 +15,7 @@ namespace hpcstat
|
||||
{ "0tIFcYlfj/onVGVJsg9Th4mPtSZ5R+5srl4gxwZgM3k", { "wm", "Man Wang" } },
|
||||
{ "Ciam/qGL/ZrXIQearsg9NvFh/soPZUG4Z8JhOFSTk48", { "lly", "Liyi Luo" } },
|
||||
{ "4C2HKaBqgAzhPLjH/BuQZOjGx85NEeUA+UkkWkRzl8k", { "yxf", "Xiaofang Ye" } },
|
||||
{ "8jCEhKYtIVn4H69+fotWDFUYWHyiRN1+JCGeiDHaf5E", { "hss", "Shanshan He" } },
|
||||
{ "7bmG24muNsaAZkCy7mQ9Nf2HuNafmvUO+Hf1bId9zts", { "00", "Yaping Wu" } },
|
||||
{ "dtx0QxdgFrXn2SYxtIRz43jIAH6rLgJidSdTvuTuews", { "01", "Jing Li" } },
|
||||
{ "8crUO9u4JiVqw3COyjXfzZe87s6XZFhvi0LaY0Mv6bg", { "02", "Huahan Zhan" } },
|
||||
|
||||
@@ -59,12 +59,29 @@ int main(int argc, const char** argv)
|
||||
(percent, disk_stat->Total, disk_stat->Time);
|
||||
if (percent > 80)
|
||||
{
|
||||
std::cout << "Top 3 directories owned by teacher:\n";
|
||||
for (auto& [name, size] : disk_stat->Teacher | ranges::views::take(3))
|
||||
std::cout << " {:.1f}GB {}\n"_f(size, name);
|
||||
std::cout << "Top 3 directories owned by student:\n";
|
||||
for (auto& [name, size] : disk_stat->Student | ranges::views::take(3))
|
||||
std::cout << " {:.1f}GB {}\n"_f(size, name);
|
||||
std::cout << "Directories owned by teacher:\n"
|
||||
<< (
|
||||
disk_stat->Teacher
|
||||
| ranges::views::transform([](auto&& it) { return "{: <30}"_f(" {:.1f}GB {}"_f
|
||||
(it.second, it.first)); })
|
||||
| ranges::views::chunk(2)
|
||||
| ranges::views::transform([](auto&& it) { return it | ranges::views::join(""); })
|
||||
| ranges::views::join('\n')
|
||||
| ranges::to<std::string>()
|
||||
)
|
||||
<< "\n"
|
||||
<< "Top 10 directories owned by student:\n"
|
||||
<< (
|
||||
disk_stat->Student
|
||||
| ranges::views::take(10)
|
||||
| ranges::views::transform([](auto&& it) { return "{: <30}"_f(" {:.1f}GB {}"_f
|
||||
(it.second, it.first)); })
|
||||
| ranges::views::chunk(2)
|
||||
| ranges::views::transform([](auto&& it) { return it | ranges::views::join(""); })
|
||||
| ranges::views::join('\n')
|
||||
| ranges::to<std::string>()
|
||||
)
|
||||
<< "\n";
|
||||
}
|
||||
std::cout << termcolor::reset;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# include <chrono>
|
||||
# include <hpcstat/sql.hpp>
|
||||
# include <hpcstat/env.hpp>
|
||||
# include <hpcstat/keys.hpp>
|
||||
@@ -184,7 +185,7 @@ namespace hpcstat::sql
|
||||
long submit_date = [&]
|
||||
{
|
||||
std::chrono::system_clock::time_point submit_date_with_local;
|
||||
std::stringstream(submit_time) >> date::parse("%b %d %H:%M:%S %Y", submit_date_with_local);
|
||||
std::stringstream(submit_time) >> std::chrono::parse("%b %d %H:%M:%S %Y"s, submit_date_with_local);
|
||||
date::zoned_time submit_date_with_zone
|
||||
(
|
||||
date::current_zone(),
|
||||
|
||||
18
packages/nglview.nix
Normal file
18
packages/nglview.nix
Normal file
@@ -0,0 +1,18 @@
|
||||
# from https://github.com/NixOS/nixpkgs/pull/267893
|
||||
{
|
||||
buildPythonPackage, src,
|
||||
ipywidgets, jupyter-packaging, jupyterlab-widgets, numpy, setuptools, versioneer, wheel, notebook
|
||||
}: buildPythonPackage
|
||||
{
|
||||
name = "nglview";
|
||||
pyproject = true;
|
||||
inherit src;
|
||||
build-system = [ jupyter-packaging setuptools versioneer wheel ];
|
||||
dependencies = [ ipywidgets jupyterlab-widgets numpy notebook ];
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "jupyter_packaging~=0.7.9" "jupyter_packaging" \
|
||||
--replace '"versioneer-518"' ""
|
||||
'';
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
{
|
||||
version ? "24.7",
|
||||
stdenvNoCC, fetchurl, buildFHSEnv,
|
||||
gfortran, flock
|
||||
}:
|
||||
let
|
||||
versions =
|
||||
{
|
||||
"24.7" = "0lzqfpvdjl13vd4hd622jdpgl6zdrg0xs3zskfzvrgf55ym9885z";
|
||||
"24.1" = "1n0x1x7ywvr3623ylvrjagayn44mbvfas3c3062p7y3asmgjx697";
|
||||
"23.1" = "1xg933f4n1bw39y1x1vrjrbzpx36sbmjgvi332hfck3dbx0n982m";
|
||||
};
|
||||
releaseName = version:
|
||||
let versions = builtins.splitVersion version;
|
||||
in "nvhpc_20${builtins.elemAt versions 0}_${builtins.concatStringsSep "" versions}_Linux_x86_64_cuda_multi";
|
||||
builder = buildFHSEnv
|
||||
{
|
||||
name = "builder";
|
||||
targetPkgs = pkgs: with pkgs; [ coreutils ];
|
||||
extraBwrapArgs = [ "--bind" "$out" "$out" ];
|
||||
};
|
||||
in stdenvNoCC.mkDerivation
|
||||
{
|
||||
pname = "nvhpc";
|
||||
inherit version;
|
||||
src = fetchurl
|
||||
{
|
||||
url = "https://developer.download.nvidia.com/hpc-sdk/${version}/${releaseName version}.tar.gz";
|
||||
sha256 = versions.${version};
|
||||
};
|
||||
dontFixup = true;
|
||||
dontBuild = true;
|
||||
buildInputs = [ gfortran flock ];
|
||||
installPhase =
|
||||
''
|
||||
export NVHPC_SILENT=true
|
||||
export NVHPC_INSTALL_TYPE=single
|
||||
export NVHPC_INSTALL_DIR=$out/share/nvhpc
|
||||
# $out should exist before bwrap
|
||||
mkdir -p $out
|
||||
${builder}/bin/builder ./install
|
||||
'';
|
||||
requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" "big-parallel" ];
|
||||
}
|
||||
105
packages/nvhpcStdenv.nix
Normal file
105
packages/nvhpcStdenv.nix
Normal file
@@ -0,0 +1,105 @@
|
||||
{
|
||||
src, stdenv, autoPatchelfHook, wrapCCWith, config, overrideCC, makeSetupHook, writeScript, overrideInStdenv,
|
||||
gcc, glibc, libz, zstd, libxml2, flock, numactl, ncurses, openssl, gmp,
|
||||
libxcrypt-legacy, libfabric, rdma-core, xorg, bash
|
||||
}:
|
||||
let
|
||||
nvhpc = stdenv.mkDerivation
|
||||
{
|
||||
pname = "nvhpc";
|
||||
inherit (src) src version;
|
||||
buildInputs =
|
||||
[ libz libxml2 zstd numactl ncurses openssl gmp libxcrypt-legacy libfabric rdma-core xorg.libpciaccess ];
|
||||
nativeBuildInputs = [ autoPatchelfHook flock ];
|
||||
langFortran = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out
|
||||
|
||||
sed -i 's|/bin/chmod|chmod|g' install_components/install
|
||||
sed -i 's|/sbin/ldconfig|ldconfig|g' install_components/install
|
||||
patchShebangs install_components/Linux_x86_64/${src.version}/compilers/bin/makelocalrc
|
||||
sed -i '/makelocalrc executed by/d' install_components/Linux_x86_64/${src.version}/compilers/bin/makelocalrc
|
||||
|
||||
NVHPC_SILENT=true NVHPC_INSTALL_DIR=$out NVHPC_INSTALL_TYPE=single ./install_components/install
|
||||
|
||||
addAutoPatchelfSearchPath $out/Linux_x86_64/${src.version}/cuda/${src.cudaVersion}/targets/x86_64-linux/lib/stubs
|
||||
addAutoPatchelfSearchPath $out/Linux_x86_64/${src.version}/compilers/lib
|
||||
|
||||
rm -rf $out/Linux_x86_64/${src.version}/cuda/${src.cudaVersion}/bin/cuda-gdb-python*-tui
|
||||
rm -rf $out/Linux_x86_64/${src.version}/profilers
|
||||
rm -rf $out/Linux_x86_64/${src.version}/comm_libs/${src.cudaVersion}/hpcx/hpcx-*/ompi/tests
|
||||
|
||||
# fix /usr/lib/crt1.o impure path used in link
|
||||
cat >> $out/Linux_x86_64/${src.version}/compilers/bin/localrc << EOF
|
||||
|
||||
set DEFLIBDIR=${glibc}/lib;
|
||||
set DEFSTDOBJDIR=${glibc}/lib;
|
||||
EOF
|
||||
'';
|
||||
autoPatchelfIgnoreMissingDeps = [ "libcrypto.so.1.1" "libgdrapi.so.2" "libxpmem.so.0" "libnvidia-ml.so.1" ];
|
||||
passthru = { inherit src cudaCapability buildEnv runEnv; };
|
||||
};
|
||||
compilerDir = "${nvhpc}/Linux_x86_64/${src.version}/compilers";
|
||||
mpiDir = "${nvhpc}/Linux_x86_64/${src.version}/comm_libs/mpi";
|
||||
cudaCapability = builtins.concatStringsSep ","
|
||||
(
|
||||
(builtins.map (cap: "cc${builtins.replaceStrings ["."] [""] cap}") config.cudaCapabilities)
|
||||
++ [ "cuda${src.cudaVersion}" ]
|
||||
);
|
||||
buildEnv = makeSetupHook { name = "nvhpcBuildEnv"; } (writeScript "nvhpcBuildEnv"
|
||||
''
|
||||
addNvhpcEnv() {
|
||||
addToSearchPath PATH ${compilerDir}/bin
|
||||
addToSearchPath PATH ${mpiDir}/bin
|
||||
addToSearchPath PATH ${gcc.cc}/bin
|
||||
}
|
||||
addEnvHooks "$hostOffset" addNvhpcEnv
|
||||
'');
|
||||
runEnv = writeScript "nvhpcRunEnv"
|
||||
''
|
||||
#!${bash}/bin/bash
|
||||
# make mpirun and nvaccelinfo accessible
|
||||
export PATH=${compilerDir}/bin:${mpiDir}/bin''${PATH:+:$PATH}
|
||||
# NVPL need this to load libgomp.so (actually libnvomp.so) from nvhpc instead of from gcc
|
||||
# https://docs.nvidia.com/nvpl/
|
||||
export LD_LIBRARY_PATH=${compilerDir}/lib''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
# allow access to libcuda.so
|
||||
export LD_LIBRARY_PATH=/run/opengl-driver/lib''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
exec "$@"
|
||||
'';
|
||||
wrapper = (wrapCCWith
|
||||
{
|
||||
cc = nvhpc;
|
||||
extraBuildCommands =
|
||||
''
|
||||
# provide libgcc_s.so but not libgomp.so
|
||||
echo "-L${gcc.cc.libgcc}/lib" >> $out/nix-support/cc-ldflags
|
||||
|
||||
echo "-tp=${config.nvhpcArch}" >> $out/nix-support/cc-cflags-before
|
||||
echo "-gpu=${cudaCapability}" >> $out/nix-support/cc-cflags-before
|
||||
|
||||
echo "-noswitcherror" >> $out/nix-support/cc-cflags
|
||||
|
||||
# print verbose output for debugging
|
||||
# echo "-v" >> $out/nix-support/cc-cflags
|
||||
|
||||
# echo "" > $out/nix-support/add-hardening.sh
|
||||
|
||||
# substitute -idirafter in libc-cflags
|
||||
# somehow -isystem does not work
|
||||
sed -i 's/-idirafter/-I/g' $out/nix-support/libc-cflags
|
||||
|
||||
for i in nvc nvc++ nvcc nvfortran; do
|
||||
wrap $i $wrapper ${nvhpc}/Linux_x86_64/${nvhpc.version}/compilers/bin/$i
|
||||
done
|
||||
'';
|
||||
}).overrideAttrs (prev: { installPhase = prev.installPhase +
|
||||
''
|
||||
export named_cc=nvc
|
||||
export named_cxx=nvc++
|
||||
export named_fc=nvfortran
|
||||
'';});
|
||||
in overrideInStdenv (overrideCC stdenv wrapper) [ buildEnv ]
|
||||
11
packages/py4vasp.nix
Normal file
11
packages/py4vasp.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{
|
||||
src, buildPythonPackage,
|
||||
poetry-core, numpy, h5py, pandas, ase, plotly, kaleido, ipython, scipy, nglview
|
||||
}: buildPythonPackage
|
||||
{
|
||||
name = "py4vasp";
|
||||
pyproject = true;
|
||||
inherit src;
|
||||
build-system = [ poetry-core ];
|
||||
dependencies = [ numpy h5py pandas ase plotly kaleido ipython scipy nglview ];
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
{ src, poetry2nix, runCommand }:
|
||||
let
|
||||
package = poetry2nix.mkPoetryApplication
|
||||
{
|
||||
projectDir = src;
|
||||
overrides = poetry2nix.overrides.withDefaults (final: prev:
|
||||
{ numpy = prev.numpy.overridePythonAttrs { patches = prev.patches or [] ++ [ ./numpy.patch ]; }; });
|
||||
};
|
||||
python = package.python.withPackages (p: [ package p.mdtraj ]);
|
||||
in runCommand "py4vasp" {} "mkdir -p $out/bin; ln -s ${python}/bin/python $out/bin/py4vasp"
|
||||
@@ -1,70 +0,0 @@
|
||||
From f391623a00aff45f510bf815ddfb1817ae833059 Mon Sep 17 00:00:00 2001
|
||||
From: Katie Rust <katie@ktpanda.org>
|
||||
Date: Mon, 16 Sep 2024 13:04:22 -0500
|
||||
Subject: [PATCH] BUG: Stub out `get_build_msvc_version` if
|
||||
`distutils.msvccompiler` cannot be imported (fixes #27405)
|
||||
|
||||
---
|
||||
numpy/distutils/mingw32ccompiler.py | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
|
||||
index 39905a784088..2599a9e9a807 100644
|
||||
--- a/numpy/distutils/mingw32ccompiler.py
|
||||
+++ b/numpy/distutils/mingw32ccompiler.py
|
||||
@@ -24,7 +24,13 @@
|
||||
|
||||
import distutils.cygwinccompiler
|
||||
from distutils.unixccompiler import UnixCCompiler
|
||||
-from distutils.msvccompiler import get_build_version as get_build_msvc_version
|
||||
+
|
||||
+try:
|
||||
+ from distutils.msvccompiler import get_build_version as get_build_msvc_version
|
||||
+except ImportError:
|
||||
+ def get_build_msvc_version():
|
||||
+ return None
|
||||
+
|
||||
from distutils.errors import UnknownFileError
|
||||
from numpy.distutils.misc_util import (msvc_runtime_library,
|
||||
msvc_runtime_version,
|
||||
diff --git a/numpy/distutils/msvccompiler.py b/numpy/distutils/msvccompiler.py
|
||||
index 2b93221baa..d1fae7b6ca 100644
|
||||
--- a/numpy/distutils/msvccompiler.py
|
||||
+++ b/numpy/distutils/msvccompiler.py
|
||||
@@ -1,5 +1,4 @@
|
||||
import os
|
||||
-from distutils.msvccompiler import MSVCCompiler as _MSVCCompiler
|
||||
|
||||
from .system_info import platform_bits
|
||||
|
||||
@@ -36,27 +35,12 @@ def _merge(old, new):
|
||||
return ';'.join([old, new])
|
||||
|
||||
|
||||
-class MSVCCompiler(_MSVCCompiler):
|
||||
+class MSVCCompiler:
|
||||
def __init__(self, verbose=0, dry_run=0, force=0):
|
||||
- _MSVCCompiler.__init__(self, verbose, dry_run, force)
|
||||
+ pass
|
||||
|
||||
def initialize(self):
|
||||
- # The 'lib' and 'include' variables may be overwritten
|
||||
- # by MSVCCompiler.initialize, so save them for later merge.
|
||||
- environ_lib = os.getenv('lib', '')
|
||||
- environ_include = os.getenv('include', '')
|
||||
- _MSVCCompiler.initialize(self)
|
||||
-
|
||||
- # Merge current and previous values of 'lib' and 'include'
|
||||
- os.environ['lib'] = _merge(environ_lib, os.environ['lib'])
|
||||
- os.environ['include'] = _merge(environ_include, os.environ['include'])
|
||||
-
|
||||
- # msvc9 building for 32 bits requires SSE2 to work around a
|
||||
- # compiler bug.
|
||||
- if platform_bits == 32:
|
||||
- self.compile_options += ['/arch:SSE2']
|
||||
- self.compile_options_debug += ['/arch:SSE2']
|
||||
-
|
||||
+ pass
|
||||
|
||||
def lib_opts_if_msvc(build_cmd):
|
||||
""" Add flags if we are using MSVC compiler
|
||||
5
packages/qd.nix
Normal file
5
packages/qd.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
{ src, stdenv }: stdenv.mkDerivation
|
||||
{
|
||||
name = "qd";
|
||||
inherit src;
|
||||
}
|
||||
@@ -11,36 +11,92 @@ int main()
|
||||
|
||||
struct Device
|
||||
{
|
||||
unsigned CpuMpiThreads, CpuOpenmpThreads;
|
||||
// Queue : { CpuMpiThreads, CpuOpenmpThreads }
|
||||
std::vector<std::pair<std::string, std::pair<int, int>>> CpuQueues;
|
||||
std::optional<std::vector<std::string>> GpuIds;
|
||||
std::string GpuPartition;
|
||||
};
|
||||
auto device = YAML::LoadFile("/etc/sbatch-tui.yaml").as<Device>();
|
||||
|
||||
// 需要绑定到界面上的变量
|
||||
struct
|
||||
{
|
||||
int vasp_version_selected = 0;
|
||||
std::vector<std::string> vasp_version_entries = { "std", "gam", "ncl" };
|
||||
int device_type_selected = 0;
|
||||
std::vector<std::string> device_type_entries;
|
||||
int gpu_selected = 0;
|
||||
std::vector<std::string> gpu_entries;
|
||||
std::string job_name = std::filesystem::current_path().filename().string();
|
||||
std::string output_file = "output.txt";
|
||||
// 第一行,要选择的程序
|
||||
int program_selected = 0;
|
||||
std::vector<std::string> program_entries; // 稍后初始化
|
||||
int vasp_selected = 0;
|
||||
std::vector<std::string> vasp_entries = { "std", "gam", "ncl" };
|
||||
|
||||
// 第二行,如果是CPU,要选择的队列,和队列的参数
|
||||
int queue_selected = 0;
|
||||
std::vector<std::string> queue_entries; // 稍后初始化
|
||||
std::string mpi_threads;
|
||||
std::string openmp_threads;
|
||||
|
||||
// 第二行,如果是GPU,要选择的方案和设备
|
||||
int gpu_scheme_selected = 0;
|
||||
std::vector<std::string> gpu_scheme_entries = { "manually select a GPU", "any single GPU" };
|
||||
int gpu_selected = 0;
|
||||
std::vector<std::string> gpu_entries; // 稍后初始化
|
||||
|
||||
// 第三行和第四行,任务名和输出文件
|
||||
std::string job_name = std::filesystem::current_path().filename().string();
|
||||
std::string output_file = "output.txt";
|
||||
|
||||
// 用户选定的操作
|
||||
std::string user_command;
|
||||
|
||||
// 生成的提交命令
|
||||
std::string submit_command;
|
||||
} state;
|
||||
if (device.GpuIds)
|
||||
} state =
|
||||
{
|
||||
state.device_type_entries = { "manually select GPU", "any single GPU", "CPU" };
|
||||
state.gpu_entries = *device.GpuIds;
|
||||
.program_entries = [&]
|
||||
{
|
||||
std::vector<std::string> entries;
|
||||
if (device.GpuIds) entries.push_back("VASP(GPU)");
|
||||
entries.push_back("VASP(CPU)");
|
||||
return entries;
|
||||
}(),
|
||||
.queue_entries = device.CpuQueues | ranges::views::keys | ranges::to_vector,
|
||||
.gpu_entries = device.GpuIds.value_or(std::vector<std::string>{})
|
||||
};
|
||||
|
||||
// 尝试从配置文件中读取设置
|
||||
try
|
||||
{
|
||||
auto config = YAML::LoadFile("{}/.config/sbatch-tui/config.yaml"_f(getenv("HOME")));
|
||||
auto saved_state = config.as<decltype(state)>();
|
||||
// 比较时会提升到 unsigned,所以不需要额外判断是否小于 0
|
||||
if (saved_state.program_selected < state.program_entries.size())
|
||||
state.program_selected = saved_state.program_selected;
|
||||
if (saved_state.vasp_selected < state.vasp_entries.size())
|
||||
state.vasp_selected = saved_state.vasp_selected;
|
||||
if (saved_state.queue_selected < state.queue_entries.size())
|
||||
{
|
||||
state.queue_selected = saved_state.queue_selected;
|
||||
state.mpi_threads = saved_state.mpi_threads;
|
||||
state.openmp_threads = saved_state.openmp_threads;
|
||||
}
|
||||
if (saved_state.gpu_scheme_selected < state.gpu_scheme_entries.size())
|
||||
state.gpu_scheme_selected = saved_state.gpu_scheme_selected;
|
||||
if (saved_state.gpu_selected < state.gpu_entries.size())
|
||||
state.gpu_selected = saved_state.gpu_selected;
|
||||
}
|
||||
else state.device_type_entries = { "CPU" };
|
||||
state.mpi_threads = std::to_string(device.CpuMpiThreads);
|
||||
state.openmp_threads = std::to_string(device.CpuOpenmpThreads);
|
||||
catch (...) {}
|
||||
|
||||
// 刷新状态
|
||||
auto refresh_state = [&]
|
||||
{
|
||||
// 如果选择了 CPU 程序,那么按照选定的队列刷新 MPI 和 OpenMP 线程数
|
||||
if (state.program_entries[state.program_selected] == "VASP(CPU)")
|
||||
{
|
||||
auto it = ranges::find_if(device.CpuQueues,
|
||||
[&](auto &x){ return x.first == state.queue_entries[state.queue_selected]; });
|
||||
auto [mpi_threads, openmp_threads] = it->second;
|
||||
state.mpi_threads = std::to_string(mpi_threads);
|
||||
state.openmp_threads = std::to_string(openmp_threads);
|
||||
}
|
||||
};
|
||||
|
||||
// 为组件增加标题栏和分割线
|
||||
auto with_title = [](std::string title)
|
||||
@@ -68,53 +124,88 @@ int main()
|
||||
auto screen = ftxui::ScreenInteractive::Fullscreen();
|
||||
auto request_interface = ftxui::Container::Vertical
|
||||
({
|
||||
ftxui::Menu(&state.vasp_version_entries, &state.vasp_version_selected)
|
||||
| with_title("Select VASP version:"),
|
||||
// 第一行:选择程序
|
||||
ftxui::Container::Horizontal
|
||||
({
|
||||
ftxui::Menu(&state.device_type_entries, &state.device_type_selected),
|
||||
ftxui::Menu(&state.gpu_entries, &state.gpu_selected)
|
||||
| with_separator
|
||||
| ftxui::Maybe([&]
|
||||
{ return state.device_type_entries[state.device_type_selected] == "manually select GPU"; }),
|
||||
ftxui::Container::Vertical
|
||||
// 左侧:选择程序
|
||||
ftxui::Menu(&state.program_entries, &state.program_selected, ftxui::MenuOption{.on_change = refresh_state}),
|
||||
// 右侧:选择 VASP 版本
|
||||
ftxui::Menu(&state.vasp_entries, &state.vasp_selected) | with_separator
|
||||
}) | with_title("Program:"),
|
||||
// 第二行
|
||||
ftxui::Container::Horizontal
|
||||
({
|
||||
// 如果是选择 CPU 程序
|
||||
ftxui::Container::Horizontal
|
||||
({
|
||||
ftxui::Input(&state.mpi_threads) | ftxui::size(ftxui::WIDTH, ftxui::GREATER_THAN, 3)
|
||||
| with_subtitle("MPI threads: "),
|
||||
ftxui::Input(&state.openmp_threads) | ftxui::size(ftxui::WIDTH, ftxui::GREATER_THAN, 3)
|
||||
| with_subtitle("OpenMP threads: ")
|
||||
})
|
||||
| with_separator
|
||||
| ftxui::Maybe([&]{ return state.device_type_entries[state.device_type_selected] == "CPU"; }),
|
||||
}) | with_title("Select device:"),
|
||||
// 左侧:选择队列
|
||||
ftxui::Menu(&state.queue_entries, &state.queue_selected, ftxui::MenuOption{.on_change = refresh_state}),
|
||||
// 右侧:输入 MPI 和 OpenMP 线程数
|
||||
ftxui::Container::Vertical
|
||||
({
|
||||
ftxui::Input(&state.mpi_threads) | ftxui::size(ftxui::WIDTH, ftxui::GREATER_THAN, 3)
|
||||
| with_subtitle("MPI threads: "),
|
||||
ftxui::Input(&state.openmp_threads) | ftxui::size(ftxui::WIDTH, ftxui::GREATER_THAN, 3)
|
||||
| with_subtitle("OpenMP threads: ")
|
||||
}) | with_separator
|
||||
}) | ftxui::Maybe([&]{ return state.program_entries[state.program_selected] == "VASP(CPU)"; }),
|
||||
// 如果是选择 GPU 程序
|
||||
ftxui::Container::Horizontal
|
||||
({
|
||||
// 左侧:选择方案
|
||||
ftxui::Menu(&state.gpu_scheme_entries, &state.gpu_scheme_selected,
|
||||
ftxui::MenuOption{.on_change = refresh_state}),
|
||||
// 右侧:选择 GPU
|
||||
ftxui::Menu(&state.gpu_entries, &state.gpu_selected) | with_separator
|
||||
| ftxui::Maybe([&]{ return state.gpu_scheme_entries[state.gpu_scheme_selected] == "manually select a GPU"; }),
|
||||
}) | ftxui::Maybe([&]{ return state.program_entries[state.program_selected] == "VASP(GPU)"; }),
|
||||
}) | with_title("Resource allocation parameters:"),
|
||||
// 第三行:任务名
|
||||
ftxui::Input(&state.job_name) | with_title("Job name:"),
|
||||
// 第四行:输出文件
|
||||
ftxui::Input(&state.output_file) | with_title("Output file:"),
|
||||
// 操作按钮
|
||||
ftxui::Container::Horizontal
|
||||
({
|
||||
ftxui::Button("Continue",
|
||||
ftxui::Button("Continue (Enter)",
|
||||
[&]{ state.user_command = "continue"; screen.ExitLoopClosure()(); }),
|
||||
ftxui::Button("Quit",
|
||||
[&]{ state.user_command = "quit"; screen.ExitLoopClosure()(); })
|
||||
})
|
||||
}) | ftxui::borderHeavy | with_padding;
|
||||
}) | ftxui::borderHeavy | with_padding | ftxui::CatchEvent([&](ftxui::Event event)
|
||||
{
|
||||
if (event == ftxui::Event::Return) { state.user_command = "continue"; screen.ExitLoopClosure()(); }
|
||||
return event == ftxui::Event::Return;
|
||||
});
|
||||
auto confirm_interface = ftxui::Container::Vertical
|
||||
({
|
||||
ftxui::Input(&state.submit_command, "", ftxui::InputOption{.multiline = true})
|
||||
| with_title("Double check & modify submit command:"),
|
||||
ftxui::Container::Horizontal
|
||||
({
|
||||
ftxui::Button("Submit",
|
||||
ftxui::Button("Submit (Enter)",
|
||||
[&]{state.user_command = "submit"; screen.ExitLoopClosure()();}),
|
||||
ftxui::Button("Quit",
|
||||
[&]{state.user_command = "quit"; screen.ExitLoopClosure()();}),
|
||||
ftxui::Button("Back",
|
||||
[&]{state.user_command = "back"; screen.ExitLoopClosure()();})
|
||||
})
|
||||
}) | ftxui::borderHeavy | with_padding;
|
||||
}) | ftxui::borderHeavy | with_padding | ftxui::CatchEvent([&](ftxui::Event event)
|
||||
{
|
||||
if (event == ftxui::Event::Return) { state.user_command = "submit"; screen.ExitLoopClosure()(); }
|
||||
return event == ftxui::Event::Return;
|
||||
});
|
||||
|
||||
// 实际投递任务
|
||||
auto submit = [](std::string submit_command)
|
||||
auto submit = [&](std::string submit_command)
|
||||
{
|
||||
// 保存设置
|
||||
try
|
||||
{
|
||||
std::filesystem::create_directories("{}/.config/sbatch-tui"_f(std::getenv("HOME")));
|
||||
std::ofstream("{}/.config/sbatch-tui/config.yaml"_f(std::getenv("HOME"))) << YAML::Node(state);
|
||||
}
|
||||
catch (...) {}
|
||||
// replace \n with space
|
||||
boost::replace_all(submit_command, "\n", " ");
|
||||
biu::exec<{.DirectStdout = true, .DirectStderr = true, .SearchPath = true}>
|
||||
@@ -125,31 +216,38 @@ int main()
|
||||
while (true)
|
||||
{
|
||||
screen.Loop(request_interface);
|
||||
if (state.user_command == "quit") return EXIT_FAILURE;
|
||||
else if (state.device_type_entries[state.device_type_selected] == "any single GPU")
|
||||
state.submit_command =
|
||||
"sbatch --ntasks=1\n--gpus=1\n--job-name='{}'\n--output='{}'\nvasp-nvidia-{}"_f
|
||||
(state.job_name, state.output_file, state.vasp_version_entries[state.vasp_version_selected]);
|
||||
else if (state.device_type_entries[state.device_type_selected] == "manually select GPU")
|
||||
state.submit_command =
|
||||
"sbatch --ntasks=1\n--gres=gpu:{}:1\n--job-name='{}'\n--output='{}'\nvasp-nvidia-{}"_f
|
||||
if (state.user_command == "quit") return 0;
|
||||
else if (state.user_command == "continue")
|
||||
{
|
||||
if (state.program_entries[state.program_selected] == "VASP(GPU)")
|
||||
if (state.gpu_scheme_entries[state.gpu_scheme_selected] == "any single GPU")
|
||||
state.submit_command =
|
||||
"sbatch --partition={}\n--ntasks=1 --gpus=1\n--job-name='{}' --output='{}'\n"
|
||||
"--wrap=\"vasp-nvidia mpirun vasp-{}\""_f
|
||||
(device.GpuPartition, state.job_name, state.output_file, state.vasp_entries[state.vasp_selected]);
|
||||
else
|
||||
state.submit_command =
|
||||
"sbatch --partition={}\n--ntasks=1 --gpus={}:1\n--job-name='{}' --output='{}'\n"
|
||||
"--wrap=\"vasp-nvidia mpirun vasp-{}\""_f
|
||||
(
|
||||
device.GpuPartition, state.gpu_entries[state.gpu_selected],
|
||||
state.job_name, state.output_file, state.vasp_entries[state.vasp_selected]
|
||||
);
|
||||
else state.submit_command =
|
||||
"sbatch --partition={} --nodes=1-1\n--ntasks={} --cpus-per-task={}\n--job-name='{}' --output='{}'\n"
|
||||
"--wrap=\"vasp-intel srun vasp-{}\""_f
|
||||
(
|
||||
state.gpu_entries[state.gpu_selected],
|
||||
state.job_name, state.output_file, state.vasp_version_entries[state.vasp_version_selected]
|
||||
state.queue_entries[state.queue_selected],
|
||||
state.mpi_threads, state.openmp_threads, state.job_name, state.output_file,
|
||||
state.vasp_entries[state.vasp_selected]
|
||||
);
|
||||
else state.submit_command =
|
||||
"sbatch --ntasks={}\n--cpus-per-task={}\n"
|
||||
"--export=ALL,OMP_NUM_THREADS={},OMP_STACKSIZE=512m\n--hint=nomultithread\n--job-name='{}'\n"
|
||||
"--output='{}'\n--wrap=\"vasp-intel srun --mpi=pmix vasp-{}\""_f
|
||||
(
|
||||
state.mpi_threads, state.openmp_threads, state.openmp_threads, state.job_name, state.output_file,
|
||||
state.vasp_version_entries[state.vasp_version_selected]
|
||||
);
|
||||
|
||||
state.user_command.clear();
|
||||
}
|
||||
else return EXIT_FAILURE;
|
||||
screen.Loop(confirm_interface);
|
||||
if (state.user_command == "quit") return EXIT_FAILURE;
|
||||
else if (state.user_command == "back") continue;
|
||||
submit(state.submit_command);
|
||||
break;
|
||||
if (state.user_command == "quit") return 0;
|
||||
else if (state.user_command == "back") { state.user_command.clear(); continue; }
|
||||
else if (state.user_command == "submit") { submit(state.submit_command); break; }
|
||||
else return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
buildFHSEnv, writeScript, stdenvNoCC,
|
||||
src,
|
||||
nvhpc, lmod, cmake, gfortran
|
||||
}:
|
||||
let
|
||||
buildEnv = buildFHSEnv
|
||||
{
|
||||
name = "buildEnv";
|
||||
targetPkgs = pkgs: with pkgs; [ zlib ];
|
||||
extraBwrapArgs = [ "--bind" "$out" "$out" ];
|
||||
};
|
||||
buildScript = writeScript "build"
|
||||
''
|
||||
. ${lmod}/share/lmod/lmod/init/bash
|
||||
module use ${nvhpc}/share/nvhpc/modulefiles
|
||||
module load nvhpc
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$out -DHDF5_INSTALL_CMAKE_DIR=$out/lib/cmake \
|
||||
-DHDF5_BUILD_FORTRAN=ON -DHDF5_ENABLE_PARALLEL=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF ..
|
||||
make -j$NIX_BUILD_CORES
|
||||
make install
|
||||
'';
|
||||
in stdenvNoCC.mkDerivation
|
||||
{
|
||||
name = "hdf5-nvhpc";
|
||||
inherit src;
|
||||
dontConfigure = true;
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ cmake gfortran ];
|
||||
buildPhase =
|
||||
''
|
||||
mkdir -p $out
|
||||
${buildEnv}/bin/buildEnv ${buildScript}
|
||||
'';
|
||||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" "big-parallel" ];
|
||||
}
|
||||
@@ -6,13 +6,13 @@ let vasp = stdenv.mkDerivation
|
||||
{
|
||||
name = "vasp-intel";
|
||||
inherit src;
|
||||
# patches = [ ../vtst.patch ];
|
||||
patches = [ ../vtst.patch ];
|
||||
configurePhase =
|
||||
''
|
||||
cp ${./makefile.include} makefile.include
|
||||
chmod +w makefile.include
|
||||
cp ${../constr_cell_relax.F} src/constr_cell_relax.F
|
||||
# cp -r ${vtst}/* src
|
||||
cp -r ${vtst}/vtstcode6.4.3/* src
|
||||
chmod -R +w src
|
||||
'';
|
||||
buildInputs = [ hdf5 wannier90 mkl ];
|
||||
@@ -41,5 +41,19 @@ let vasp = stdenv.mkDerivation
|
||||
in writeShellScriptBin "vasp-intel"
|
||||
''
|
||||
export PATH=${vasp}/bin:${mpi}/bin''${PATH:+:$PATH}
|
||||
|
||||
# set OMP_NUM_THREADS if SLURM_CPUS_PER_TASK is set
|
||||
if [ -z "$OMP_NUM_THREADS" ] && [ -n "$SLURM_CPUS_PER_TASK" ]; then
|
||||
export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
|
||||
fi
|
||||
# set OMP_NUM_THREADS to 1 if not set
|
||||
if [ -z "$OMP_NUM_THREADS" ]; then
|
||||
export OMP_NUM_THREADS=1
|
||||
fi
|
||||
# set OMP_STACKSIZE to 512M if not set
|
||||
if [ -z "$OMP_STACKSIZE" ]; then
|
||||
export OMP_STACKSIZE=512m
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
''
|
||||
|
||||
@@ -1,92 +1,49 @@
|
||||
{
|
||||
buildFHSEnv, writeScript, stdenvNoCC, substituteAll, symlinkJoin, src,
|
||||
config, cudaCapabilities ? config.cudaCapabilities, nvhpcArch ? config.nvhpcArch or "px",
|
||||
nvhpc, lmod, mkl, gfortran, rsync, which, hdf5, wannier90, zlib, vtst
|
||||
stdenv, src, writeShellScriptBin,
|
||||
rsync, which, wannier90, hdf5, vtst, mkl
|
||||
}:
|
||||
let
|
||||
buildEnv = buildFHSEnv { name = "buildEnv"; targetPkgs = _: [ zlib ]; };
|
||||
buildScript = writeScript "build"
|
||||
let vasp = stdenv.mkDerivation
|
||||
{
|
||||
name = "vasp-nvidia";
|
||||
inherit src;
|
||||
patches = [ ../vtst.patch ];
|
||||
configurePhase =
|
||||
''
|
||||
. ${lmod}/share/lmod/lmod/init/bash
|
||||
module use ${nvhpc}/share/nvhpc/modulefiles
|
||||
module load nvhpc
|
||||
make DEPS=1 -j$NIX_BUILD_CORES
|
||||
cp ${./makefile.include} makefile.include
|
||||
chmod +w makefile.include
|
||||
cp ${../constr_cell_relax.F} src/constr_cell_relax.F
|
||||
cp -r ${vtst}/vtstcode6.4.3/* src
|
||||
chmod -R +w src
|
||||
'';
|
||||
include = substituteAll
|
||||
buildInputs = [ hdf5 wannier90 mkl ];
|
||||
nativeBuildInputs = [ rsync which ];
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
for i in std gam ncl; do cp bin/vasp_$i $out/bin/vasp-$i; done
|
||||
mkdir $out/src
|
||||
ln -s ${src} $out/src/vasp
|
||||
ln -s ${vtst} $out/src/vtst
|
||||
'';
|
||||
|
||||
# enable parallel build
|
||||
enableParallelBuilding = true;
|
||||
env =
|
||||
{
|
||||
src = ./makefile.include;
|
||||
cudaCapabilities = builtins.concatStringsSep "," (builtins.map
|
||||
(cap: "cc${builtins.replaceStrings ["."] [""] cap}")
|
||||
cudaCapabilities);
|
||||
inherit nvhpcArch;
|
||||
};
|
||||
vasp = stdenvNoCC.mkDerivation
|
||||
{
|
||||
name = "vasp-nvidia";
|
||||
inherit src;
|
||||
# patches = [ ../vtst.patch ];
|
||||
configurePhase =
|
||||
''
|
||||
cp ${include} makefile.include
|
||||
chmod +w makefile.include
|
||||
cp ${../constr_cell_relax.F} src/constr_cell_relax.F
|
||||
# cp -r ${vtst}/* src
|
||||
chmod -R +w src
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ mkl hdf5 wannier90 ];
|
||||
nativeBuildInputs = [ gfortran rsync which ];
|
||||
DEPS = "1";
|
||||
# vasp directly include headers under ${mkl}/include/fftw
|
||||
MKLROOT = mkl;
|
||||
HDF5_ROOT = hdf5;
|
||||
WANNIER90_ROOT = wannier90;
|
||||
buildPhase = "${buildEnv}/bin/buildEnv ${buildScript}";
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
for i in std gam ncl; do cp bin/vasp_$i $out/bin/vasp-$i; done
|
||||
mkdir $out/src
|
||||
ln -s ${src} $out/src/vasp
|
||||
ln -s ${vtst} $out/src/vtst
|
||||
'';
|
||||
dontFixup = true;
|
||||
requiredSystemFeatures = [ "gccarch-exact-${stdenvNoCC.hostPlatform.gcc.arch}" "big-parallel" ];
|
||||
QD = "${stdenv.cc.cc}/Linux_x86_64/${stdenv.cc.cc.version}/compilers/extras/qd";
|
||||
};
|
||||
startScript = variant: writeScript "vasp-nvidia"
|
||||
''
|
||||
. ${lmod}/share/lmod/lmod/init/bash
|
||||
module use ${nvhpc}/share/nvhpc/modulefiles
|
||||
module load nvhpc
|
||||
};
|
||||
in writeShellScriptBin "vasp-nvidia"
|
||||
''
|
||||
export PATH=${vasp}/bin''${PATH:+:$PATH}
|
||||
|
||||
# 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
|
||||
# set OMP_NUM_THREADS if SLURM_CPUS_PER_TASK is set
|
||||
if [ -z "$OMP_NUM_THREADS" ] && [ -n "$SLURM_CPUS_PER_TASK" ]; then
|
||||
export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
|
||||
fi
|
||||
|
||||
${
|
||||
if variant == "env" then ''exec "$@"''
|
||||
else
|
||||
''
|
||||
if [ -n "''${SLURM_JOB_ID-}" ]; then
|
||||
exec mpirun --bind-to none ${vasp}/bin/vasp-${variant}
|
||||
else
|
||||
exec mpirun -np 1 ${vasp}/bin/vasp-${variant}
|
||||
fi
|
||||
''
|
||||
}
|
||||
'';
|
||||
runEnv = variant: buildFHSEnv
|
||||
{
|
||||
name = "vasp-nvidia${if variant == "" then "" else "-${variant}"}";
|
||||
targetPkgs = _: [ zlib vasp ];
|
||||
runScript = startScript (if variant == "" then "std" else variant);
|
||||
};
|
||||
in symlinkJoin
|
||||
{
|
||||
name = "vasp-nvidia";
|
||||
paths = builtins.map (variant: runEnv variant) [ "" "env" "std" "gam" "ncl" ];
|
||||
}
|
||||
exec ${stdenv.cc.cc.runEnv} "$@"
|
||||
''
|
||||
|
||||
@@ -17,8 +17,8 @@ CPP = nvfortran -Mpreprocess -Mfree -Mextend -E $(CPP_OPTIONS) $*$(FUFFI
|
||||
|
||||
# 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
|
||||
FC = mpif90 -acc -mp
|
||||
FCL = mpif90 -acc -mp -c++libs
|
||||
|
||||
FREE = -Mfree
|
||||
|
||||
@@ -56,8 +56,6 @@ CXX_PARS = nvc++ --no_warnings
|
||||
##
|
||||
# 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
|
||||
|
||||
@@ -1,8 +1,19 @@
|
||||
{ fetchzip, lib }:
|
||||
let
|
||||
src = fetchzip
|
||||
{
|
||||
url = "http://theory.cm.utexas.edu/code/vtstcode-199.tgz";
|
||||
sha256 = "06c9f14a90ka3p396q6spr25xwkih4n01nm1qjj9fnvqzxlp9k9y";
|
||||
};
|
||||
in "${src}/vtstcode6.4"
|
||||
{ src, stdenv, autoPatchelfHook, perl, writeScriptBin }:
|
||||
let vtst = stdenv.mkDerivation
|
||||
{
|
||||
name = "vtst";
|
||||
inherit src;
|
||||
buildInputs = [ autoPatchelfHook perl ];
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/lib/vtst
|
||||
cp -r * $out/lib/vtst
|
||||
patchShebangs $out/lib/vtst
|
||||
'';
|
||||
};
|
||||
in writeScriptBin "vtst"
|
||||
''
|
||||
export PERL5LIB=${vtst}/lib/vtst''${PERL5LIB:+:$PERL5LIB}
|
||||
export PATH=${vtst}/lib/vtst''${PATH:+:$PATH}
|
||||
exec "$@"
|
||||
''
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
{ fetchzip, stdenv, autoPatchelfHook, perl, writeScriptBin }:
|
||||
let vtstscript-unwrapped = stdenv.mkDerivation
|
||||
{
|
||||
name = "vtstscript-unwrapped";
|
||||
src = fetchzip
|
||||
{
|
||||
url = "http://theory.cm.utexas.edu/code/vtstscripts.tgz";
|
||||
sha256 = "04476wgxvja15jijh9dxbzwy4mdrdqnd93s66jsm26rf73caj7lr";
|
||||
};
|
||||
buildInputs = [ autoPatchelfHook perl ];
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/lib/vtstscripts
|
||||
cp -r * $out/lib/vtstscripts
|
||||
patchShebangs $out/lib/vtstscripts
|
||||
'';
|
||||
};
|
||||
in writeScriptBin "vtstscripts"
|
||||
''
|
||||
# add vtstscript-unwrapped in PERL5LIB
|
||||
export PERL5LIB=${vtstscript-unwrapped}/lib/vtstscripts''${PERL5LIB:+:$PERL5LIB}
|
||||
export PATH=${vtstscript-unwrapped}/lib/vtstscripts''${PATH:+:$PATH}
|
||||
exec "$@"
|
||||
''
|
||||
Reference in New Issue
Block a user