diff --git a/devices/pc/default.nix b/devices/pc/default.nix index 88f45e4c..69d2b3e8 100644 --- a/devices/pc/default.nix +++ b/devices/pc/default.nix @@ -32,7 +32,7 @@ inputs: sysctl.laptop-mode = 5; kernel.variant = "xanmod-latest"; }; - hardware.gpu.type = "amd"; + hardware = { gpu.type = "amd"; cpu = "amd"; }; services = { samba = @@ -83,7 +83,7 @@ inputs: lumericalLicenseManager.macAddress = "10:5f:ad:10:3e:ca"; }; bugs = [ "xmunet" "amdpstate" "iwlwifi" ]; - packages = { mathematica = {}; vasp = {}; lumerical = {}; }; + # packages = { mathematica = {}; vasp = {}; lumerical = {}; }; user.users = [ "chn" "xly" ]; }; # 允许kvm读取物理硬盘 diff --git a/flake.lock b/flake.lock index 0a152369..b6915d3c 100644 --- a/flake.lock +++ b/flake.lock @@ -5,14 +5,15 @@ "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750597708, - "narHash": "sha256-jpoh3tk4F4C0MZsXYqFt1fqm4qYOcyu3RtJlmpabpDo=", + "lastModified": 1757804696, + "narHash": "sha256-jaxMO693lQQzZOpwSAYazGRIX+sgffvtmwIenN9zNWw=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "5e4851010e05030553f2265ced86b155dfe0bb93", + "rev": "fc6a7063d4e4b9d05f05e9fda3cd980264b5b88b", "type": "github" }, "original": { @@ -87,11 +88,11 @@ ] }, "locked": { - "lastModified": 1748080874, - "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", + "lastModified": 1757929733, + "narHash": "sha256-dzKGtCdGbW7v95MS6pxb97u025JP24QsqCLE5bHAumI=", "owner": "catppuccin", "repo": "nix", - "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", + "rev": "039cd59357bc6fdd8d9848717069fbc9ee609a73", "type": "github" }, "original": { @@ -110,7 +111,7 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1757979374, @@ -161,11 +162,11 @@ "date": { "flake": false, "locked": { - "lastModified": 1742576835, - "narHash": "sha256-Mq7Yd+y8M3JNG9BEScwVEmxGWYEy6gaNNSlTGgR9LB4=", + "lastModified": 1755019662, + "narHash": "sha256-y/tUAZ7HnjSZ+09DyvN5kyIcCcF2bkPT8UpNCMCeDpo=", "owner": "HowardHinnant", "repo": "date", - "rev": "a45ea7c17b4a7f320e199b71436074bd624c9e15", + "rev": "a5db3aecec580bc78b6c01c118f2628676769b69", "type": "github" }, "original": { @@ -235,11 +236,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -283,11 +284,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -318,11 +319,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -336,11 +337,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -442,11 +443,11 @@ "hextra": { "flake": false, "locked": { - "lastModified": 1747959805, - "narHash": "sha256-iQLtU9JZWw67VUbxE9WTIy3fPDOJPO9i7DDOW9PzF30=", + "lastModified": 1757969945, + "narHash": "sha256-ux2WsM5gRD7v57D+etg4eBFIn7ruQEia3/TXCfwM2bg=", "owner": "imfing", "repo": "hextra", - "rev": "72c383ef5c25e8c224c9a6f7c659740eddbde950", + "rev": "708358de80535af94fa07d85ff4a6409cf4daa32", "type": "github" }, "original": { @@ -516,11 +517,11 @@ "lepton": { "flake": false, "locked": { - "lastModified": 1746995100, - "narHash": "sha256-2/hTy4QED2qLaMEz2gYS9IQqFf4AZACorh/8Wb2NZwA=", + "lastModified": 1754834936, + "narHash": "sha256-2AIUzfWp7RhhW5Ku1qYTxr0y+1qpfCIHPVv3wdI2VyU=", "owner": "black7375", "repo": "Firefox-UI-Fix", - "rev": "392556235f1ec732effd4808cf5fd29478f3ec00", + "rev": "b0b977e658c3fbb24d14f44f720fb6272f7760ce", "type": "github" }, "original": { @@ -532,11 +533,11 @@ "mac-style": { "flake": false, "locked": { - "lastModified": 1717900224, - "narHash": "sha256-tYB4fJ87UnYczaW8/w32cBzbwCw1+IDHp8BnHSyqNNg=", + "lastModified": 1756677116, + "narHash": "sha256-bjtQvzupAFX5AYAIyBXSFgWhaG4nP4TvgKDoKyUhZ4U=", "owner": "SergioRibera", "repo": "s4rchiso-plymouth-theme", - "rev": "856bf3b7d239f995e4e9dde8458b9823cf0e96e4", + "rev": "2f782f4b68ce1c00cef3fde6970d7b4241bb97d4", "type": "github" }, "original": { @@ -548,11 +549,11 @@ "matplotplusplus": { "flake": false, "locked": { - "lastModified": 1739795691, - "narHash": "sha256-pJoWvmXyZZjZM6VHKV7mSBegbZH3dslaJFalTa3oQPY=", + "lastModified": 1750413692, + "narHash": "sha256-ORqKo5vjpkhXmRI+Lszm1hU3RGFlYY0VaGQ9TvUyZrA=", "owner": "alandefreitas", "repo": "matplotplusplus", - "rev": "5d01eb3695b07634a2b6642fd423740dea9b026c", + "rev": "a672f65216db529db0d5619d8b98c53524b63b93", "type": "github" }, "original": { @@ -614,11 +615,11 @@ "nc4nix": { "flake": false, "locked": { - "lastModified": 1743386677, - "narHash": "sha256-QzYHmAlhzBag5UDW39bn8kEWbdB7Ala69Dcrq/Xhu+M=", + "lastModified": 1757956114, + "narHash": "sha256-+fGr6UJv3vHHFGLLfblTrScJwW5VErLyAkBeJeQ1PDA=", "owner": "helsinki-systems", "repo": "nc4nix", - "rev": "89b29ff991dfaf72240a12963502d9efeb4e69f8", + "rev": "ed45d094a8b60253b1f78067dd3b551f8576b373", "type": "github" }, "original": { @@ -631,17 +632,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752569955, - "narHash": "sha256-a21pjNhJYJ+OTQmBJ3NluU65PvMb54/mA7aEWJh5s/4=", + "lastModified": 1758006511, + "narHash": "sha256-YmZX6Wydog4Q9p7dRZDFOFkUfCtQfoXRobmJdg3F1dg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fc18813bf6ceaabb3063050819a20807e11279b", + "rev": "0be585b11314ac02804b4fe03196116c4f747d6d", "type": "github" }, "original": { @@ -653,16 +654,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -670,11 +671,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752565554, - "narHash": "sha256-BLLMN6oOarMdIm59AX8uypaXZHBhGfd6L3VURfqQTX8=", + "lastModified": 1758000903, + "narHash": "sha256-FyfB40rl2mbRGIvF2/6Iwv9xHDxOmhaE1MhlV6Efsg4=", "owner": "YaLTeR", "repo": "niri", - "rev": "007d35541db1bae32b7b43891af88831325ba068", + "rev": "c30e5c91851d77d48ff2120f0e710501b19d61b4", "type": "github" }, "original": { @@ -685,11 +686,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1749394952, - "narHash": "sha256-WbWkzIvB0gqAdBLghdmUpGveY7MlAS2iMj3VEJnJ9yE=", + "lastModified": 1754777568, + "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "64c6e53a3999957c19ab95cda78bde466d8374cc", + "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", "type": "github" }, "original": { @@ -728,11 +729,11 @@ ] }, "locked": { - "lastModified": 1747540584, - "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -749,11 +750,11 @@ ] }, "locked": { - "lastModified": 1747540584, - "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -770,11 +771,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1757210216, - "narHash": "sha256-wPFyyAJ9dw3a0W3rUUvMs53YHI1f37/4icFLYRbdBtE=", + "lastModified": 1757987447, + "narHash": "sha256-VbCSJEbiNtt8VTGkhCbSLwIs45013DHCXw2s8O27Xxs=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "a916585d834e4e4bf092adad85e7f90c84ed7ddb", + "rev": "ac15473ac105ddb22395639470ad338e3c4fc7c9", "type": "github" }, "original": { @@ -785,11 +786,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1750646418, - "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -819,16 +820,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -899,11 +900,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -914,11 +915,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1752308619, - "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -946,11 +947,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758027585, - "narHash": "sha256-+so5XM1uC1cMlS7hp85a9W4FXsqxkTAaK6BfDH8s7kM=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1758033839, + "narHash": "sha256-E21mL8edhADz9sTMYZXPhibvC88XBU1ka2CPH4X+OZ0=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "eeeecadbdeeea84b71422bbda9ce3e80e8cbd56c", + "rev": "35d2195c37a47c2f5d8078cbdd7b86df62a247d8", "type": "github" }, "original": { @@ -983,11 +1000,11 @@ "nu-scripts": { "flake": false, "locked": { - "lastModified": 1747930190, - "narHash": "sha256-/LoeL4BILPSOv3jnURcuuQhuRLdE0amBGnEOTB+LLgI=", + "lastModified": 1757504985, + "narHash": "sha256-6yG4X5aMtNJMNW5e0cLJRWFmFdmhR12aBP/+It+paj4=", "owner": "nushell", "repo": "nu_scripts", - "rev": "765555beddc3c81555e6b70abb2542c37a1c0ad6", + "rev": "64a9e01f4e5bdaa536d6f33730c4c8f5103b1aa0", "type": "github" }, "original": { @@ -1010,11 +1027,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751049834, - "narHash": "sha256-xgLH6/ZtQJKWsham0Cj0nKGY8hde2fY8vZgSM5JfRik=", + "lastModified": 1757961532, + "narHash": "sha256-jOr+7DN7gzI//X3Fcz7KaJrVVymDSf8v3hUT47PI/J0=", "owner": "linyinfeng", "repo": "nur-packages", - "rev": "d7a4ee64345bae20e75f40d6f35c705d22c216d4", + "rev": "0a987dd9224268924fd4e896aa319515be1e9146", "type": "github" }, "original": { @@ -1037,11 +1054,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1748081225, - "narHash": "sha256-VSLlglGlw8rwQ3T11fYMKRk0x5DDCHESCVS7DY2GIEo=", + "lastModified": 1758017498, + "narHash": "sha256-t2615sBDehQLPuFM4BvbFDfUw4ZcTz5YuF0JuRJQP28=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "d9cf471493989cbdd2df369177ec7714a400c51f", + "rev": "79b113aaa2fa65c908f33f394b148e6ea57bb8fd", "type": "github" }, "original": { @@ -1122,15 +1139,16 @@ "phono3py": { "flake": false, "locked": { - "lastModified": 1747737021, - "narHash": "sha256-toU/J4Wx+kchFYf60Ewj9jU6zskGi/a6QSBtU/wJI30=", + "lastModified": 1746016609, + "narHash": "sha256-Rcy611E8oLJQ/YtK7t1qaAeLllfJMgF6GwF58mZioNg=", "owner": "phonopy", "repo": "phono3py", - "rev": "d86b3ed24dbdbd8e2a33b5ba06a4deff0933960a", + "rev": "f0c26cec8a98f08d2e7d48dda6467008744c48c9", "type": "github" }, "original": { "owner": "phonopy", + "ref": "v3.15.1", "repo": "phono3py", "type": "github" } @@ -1145,11 +1163,11 @@ ] }, "locked": { - "lastModified": 1742765550, - "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", + "lastModified": 1756632588, + "narHash": "sha256-ydam6eggXf3ZwRutyCABwSbMAlX+5lW6w1SVZQ+kfSo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16", + "rev": "d47428e5390d6a5a8f764808a4db15929347cd77", "type": "github" }, "original": { @@ -1184,11 +1202,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1757974173, + "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "302af509428169db34f268324162712d10559f74", "type": "github" }, "original": { @@ -1200,11 +1218,11 @@ "py4vasp": { "flake": false, "locked": { - "lastModified": 1748018340, - "narHash": "sha256-HBZ3OgM4sXAXhd7w0GgExLWEMGForhblLtDrtN7oJ18=", + "lastModified": 1757089320, + "narHash": "sha256-cUt43FOVwGkOgNzvONLR/QxznyUkDxboyoQyF5/15Zk=", "owner": "vasp-dev", "repo": "py4vasp", - "rev": "d40fa62ccc8a35ca94aa8ce0c4ab91d3cfd94b8b", + "rev": "0f740e49fa51d5ad6f74d01b0606f5f007e0c70e", "type": "github" }, "original": { @@ -1240,7 +1258,7 @@ "nix-index-database": "nix-index-database", "nix4vscode": "nix4vscode", "nixos-wallpaper": "nixos-wallpaper", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2411": "nixpkgs-2411", @@ -1272,11 +1290,11 @@ "rsshub": { "flake": false, "locked": { - "lastModified": 1748095258, - "narHash": "sha256-IpfQnzSTs+gkwfRpN1633mUC3aS7ZOiPQeQGjzt+xzU=", + "lastModified": 1758020674, + "narHash": "sha256-yqPO/dr3vYVUGB5Wfg9y2kbgWJNE7GTkqrj4+ofJvvs=", "owner": "DIYgod", "repo": "RSSHub", - "rev": "3f18e140d9536a411187aa674f905aba0d2a3ab6", + "rev": "bd63108c12c22ba93af60adbb986987af0394e2c", "type": "github" }, "original": { @@ -1286,6 +1304,24 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1754575663, + "narHash": "sha256-afOx8AG0KYtw7mlt6s6ahBBy7eEHZwws3iCRoiuRQS4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "6db0fb0e9cec2e9729dc52bf4898e6c135bb8a0f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "chaotic", @@ -1309,11 +1345,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1748059406, - "narHash": "sha256-KNdeXPT2n4nHKh+kExX7xIXHO//iFot2GdiDFl+Ag4Q=", + "lastModified": 1757995413, + "narHash": "sha256-vaU/7/PXoym6vnspGxhR29V9klGe9iy9zmp6x7w38f8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c6734fa6a82294b57927748b94a98b108e1daab7", + "rev": "4ae8996b3e139926c784acd22824cde46cd28833", "type": "gitlab" }, "original": { @@ -1329,11 +1365,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { @@ -1395,11 +1431,11 @@ "stickerpicker": { "flake": false, "locked": { - "lastModified": 1742926008, - "narHash": "sha256-PQ6Qv7VSumLa05Mrnylh1i8maWAHptd4vKwdElE4Tns=", + "lastModified": 1751213916, + "narHash": "sha256-P6MI+3SfQKpXyqGzZgsLBoZ2aOUbFxHbDhHbr6xJpXc=", "owner": "maunium", "repo": "stickerpicker", - "rev": "4b96d236212b1212976f4c3c60479e7aaed866cb", + "rev": "3366dbc5002046be058a71e7ed310811a122c081", "type": "github" }, "original": { @@ -1472,11 +1508,11 @@ "tgbot-cpp": { "flake": false, "locked": { - "lastModified": 1738523432, - "narHash": "sha256-gCG9FTgGcsZVbYSl/LeNbOpfniO46x1bVymylwbFxK4=", + "lastModified": 1757186324, + "narHash": "sha256-gMTxU0FgtwAzeHHkkOLnA/TujfRi+Q1eaCcz7K507NU=", "owner": "reo7sp", "repo": "tgbot-cpp", - "rev": "1b10d2fb99252027ae65fe782308a27a01adbc19", + "rev": "f52c0b841550a74045e37c9d17a2011c355a08df", "type": "github" }, "original": { @@ -1493,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { @@ -1514,11 +1550,11 @@ ] }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { @@ -1548,11 +1584,11 @@ "v-sim": { "flake": false, "locked": { - "lastModified": 1594997908, - "narHash": "sha256-+iuu2kuVQEt2CTjo4g/5jnk2ZAllspxujnFuyp7CAMw=", + "lastModified": 1750145242, + "narHash": "sha256-1DsiO5rxjDAgRK+PG09wXrLvt8s9K8lyHPJw8WUiV3E=", "owner": "l_sim", "repo": "v_sim", - "rev": "b76501454b489715495a255347d5c7f756e1207f", + "rev": "7f2f095fb0bb53d269a3cb7834bfe05840abbc21", "type": "gitlab" }, "original": { @@ -1565,11 +1601,11 @@ "vaspberry": { "flake": false, "locked": { - "lastModified": 1724474006, - "narHash": "sha256-3cmidQRusbEdEog6e6Qe0IKBRpscrX2ghU/HApaNcys=", + "lastModified": 1754262953, + "narHash": "sha256-z1WkTpx7AQjHN533EPrzyh8Jww0vX7LhEBt9jcyVlKM=", "owner": "Infant83", "repo": "VASPBERRY", - "rev": "3b5efc9ed6b748b1149278748024ffeb140ecfdb", + "rev": "c458c753bfc169e7258472ff191e92d34aba6f96", "type": "github" }, "original": { @@ -1604,16 +1640,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.7", "repo": "xwayland-satellite", "type": "github" } @@ -1621,11 +1657,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1752338000, - "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", + "lastModified": 1757179758, + "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ba78881a68182ce338041846164cbfed0d70935c", + "rev": "970728d0d9d1eada342bb8860af214b601139e58", "type": "github" }, "original": { @@ -1637,11 +1673,11 @@ "zpp-bits": { "flake": false, "locked": { - "lastModified": 1744820414, - "narHash": "sha256-h6HppkoSrwzfcEQsVlrzMGLQ2Sib/U/VUlyDYK5VAM8=", + "lastModified": 1756880187, + "narHash": "sha256-r8DJfI+EtsAJlTacOFZxzHqg/th6m7FllNtPc1ZEsjQ=", "owner": "eyalz800", "repo": "zpp_bits", - "rev": "26c5db44578fd4fb1c8c4688cdebce8ac766f12d", + "rev": "e5ff2b23904cdca8778ab7284bf82257102c8022", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 83778a2c..e90d9cd0 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ stickerpicker = { url = "github:maunium/stickerpicker"; flake = false; }; fancy-motd = { url = "github:CHN-beta/fancy-motd"; flake = false; }; mac-style = { url = "github:SergioRibera/s4rchiso-plymouth-theme?lfs=1"; flake = false; }; - phono3py = { url = "github:phonopy/phono3py"; flake = false; }; + phono3py = { url = "github:phonopy/phono3py/v3.15.1"; flake = false; }; sticker = { url = "git+https://git.chn.moe/chn/sticker.git?lfs=1"; flake = false; }; speedtest = { url = "github:librespeed/speedtest"; flake = false; }; }; diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index d27904a6..26023d5f 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -16,7 +16,7 @@ inputs: # system management # TODO: module should add yubikey-touch-detector into path gparted wayland-utils clinfo glxinfo vulkan-tools dracut yubikey-touch-detector btrfs-assistant snapper-gui - kdePackages.qtstyleplugin-kvantum ventoy-full cpu-x wl-mirror geekbench xpra + kdePackages.qtstyleplugin-kvantum cpu-x wl-mirror geekbench xpra ( writeShellScriptBin "xclip" '' @@ -45,19 +45,18 @@ inputs: # download qbittorrent nur-xddxdd.baidupcs-go wgetpaste onedrive onedrivegui rclone # editor - typora appflowy notion-app-enhanced joplin-desktop standardnotes logseq obsidian code-cursor + typora standardnotes # news fluent-reader rssguard newsflash newsboat follow # nix tools nixpkgs-fmt appimage-run nixd nix-serve node2nix nix-prefetch-github prefetch-npm-deps nix-prefetch-docker nix-template nil bundix # instant messager - element-desktop telegram-desktop discord zoom-us slack nheko hexchat halloy - fluffychat signal-desktop qq nur-xddxdd.wechat-uos-sandboxed cinny-desktop + element-desktop telegram-desktop discord zoom-us slack nheko # browser google-chrome tor-browser # office - crow-translate zotero pandoc texliveFull poppler_utils pdftk pdfchain davinci-resolve + crow-translate zotero pandoc texliveFull poppler_utils pdftk pdfchain ydict texstudio panoply pspp libreoffice-qt6-fresh ocrmypdf typst # paperwork # required by ltex-plus.vscode-ltex-plus ltex-ls ltex-ls-plus diff --git a/modules/packages/extra.nix b/modules/packages/extra.nix index f93c1422..90b32f81 100644 --- a/modules/packages/extra.nix +++ b/modules/packages/extra.nix @@ -4,6 +4,13 @@ inputs: { type = types.nullOr (types.submodule {}); default = null; }; config = let inherit (inputs.config.nixos.packages) extra; in inputs.lib.mkIf (extra != null) { + nixos.packages.packages._packages = with inputs.pkgs; + [ + ventoy-full + davinci-resolve + fluffychat signal-desktop qq nur-xddxdd.wechat-uos-sandboxed cinny-desktop hexchat halloy + appflowy notion-app-enhanced joplin-desktop logseq obsidian code-cursor + ]; programs = { anime-game-launcher = { enable = true; package = inputs.pkgs.anime-game-launcher; }; diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 59cab62f..1186917d 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -40,7 +40,6 @@ inputs: # disk for nas "ahci" "nvme" "igc" ] - ++ (inputs.lib.optionals (kernel.variant != "nixos") [ "crypto_simd" ]) # touchscreen for one ++ (inputs.lib.optionals (inputs.config.nixos.model.arch == "x86_64") [ "pinctrl-tigerlake" ]); extraModulePackages = with inputs.config.boot.kernelPackages; diff --git a/packages/xinli/src/main.cpp b/packages/xinli/src/main.cpp index b64691ff..0d3bd074 100644 --- a/packages/xinli/src/main.cpp +++ b/packages/xinli/src/main.cpp @@ -72,19 +72,20 @@ int main(int argc, char **argv) { std::map> result; for (auto day : get_days(date, dayOfWeek)) + { + auto res = get + ( + "/api/mentality/scheduling/page/week/users", + { + {"campus", Campus[campus].first}, + {"type", Campus[campus].second}, + {"dateStart", day}, + {"dateEnd", day} + } + ); + if (!res) { log.error("failed to fetch date: {}"_f(day)); return {}; } for (auto t : time) { - auto res = get - ( - "/api/mentality/scheduling/page/week/users", - { - {"campus", Campus[campus].first}, - {"type", Campus[campus].second}, - {"dateStart", day}, - {"dateEnd", day} - } - ); - if (!res) { log.error("failed to fetch date: {}"_f(day)); return {}; } bool timeFound = false; for (auto time : YAML::Load(*res)["data"]) if (time["timeQuantumStart"].as() == t) @@ -100,6 +101,7 @@ int main(int argc, char **argv) } if (!timeFound) { log.error("time slot not found: {}"_f(t)); return {}; } } + } return log.rtn(result); }; @@ -129,21 +131,18 @@ int main(int argc, char **argv) std::cin.get(); // 提交增加排班的请求 - for (auto id : *timeId) + auto body = [&] { - auto body = [&] - { - nlohmann::json j; - j["campus"] = Campus[params.Campus].first; - j["type"] = Campus[params.Campus].second; - j["userId"] = *teacherId; - j["isVisual"] = true; - j["dayTimeIds"] = *timeId | ranges::views::keys | ranges::to_vector; - return log.rtn(j.dump()); - }(); - auto res = post("/api/mentality/scheduling/teachers", body); - if (res) std::cout << *res << std::endl; - } + nlohmann::json j; + j["campus"] = Campus[params.Campus].first; + j["type"] = Campus[params.Campus].second; + j["userId"] = *teacherId; + j["isVisual"] = true; + j["dayTimeIds"] = *timeId | ranges::views::keys | ranges::to_vector; + return log.rtn(j.dump()); + }(); + auto res = post("/api/mentality/scheduling/teachers", body); + if (res) std::cout << *res << std::endl; } else if (job.Type == "DelSchedule") { @@ -198,21 +197,21 @@ int main(int argc, char **argv) continue; } } - auto teachers = std::ranges::remove(id.second, *teacherId); + auto teachers = id.second | std::views::filter + ([&](const std::string &x) { return x != *teacherId; }) | std::ranges::to(); auto body = [&] { nlohmann::json j; - j["dateTimeId"] = id.first; + j["dataTimeId"] = id.first; j["isUpdateNext"] = false; - j["changeDate"] = params.Date[0]; j["dayTimeTeachers"] = teachers | std::views::transform ([](const std::string &id) { - nlohmann::json j; - j["user"]["teacherBaseInfo"]["userId"] = id; - return j; - } - ) | std::ranges::to(); + nlohmann::json j; + j["user"]["teacherBaseInfo"]["userId"] = id; + return j; + } + ) | std::ranges::to(); j["isVisual"] = true; return log.rtn(j.dump()); }();