diff --git a/devices/pc/default.nix b/devices/pc/default.nix index dd5f7877..e6bfd71c 100644 --- a/devices/pc/default.nix +++ b/devices/pc/default.nix @@ -49,7 +49,7 @@ inputs: kernel = { variant = "xanmod-latest"; - patches = [ "hibernate-progress" "amdgpu" ]; + patches = [ "hibernate-progress" ]; modules.modprobeConfig = [ "options iwlwifi power_save=0" "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ]; }; diff --git a/flake.lock b/flake.lock index 6ee57e01..43b08d1b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1728233826, - "narHash": "sha256-83/OY95iYtZFvjbDXBKo7SFs2GplDvpR2E5N/DDXSRs=", + "lastModified": 1728524457, + "narHash": "sha256-R+GJ3H1PvRUHLm45muY1KEezhfgIl8l7HJ36DySZMu0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "7b8059162c32fc8a246bfb1736cd620751952fdc", + "rev": "5611dd61df02e0bc5d62bb3f5388821d8854faff", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "blog": { "flake": false, "locked": { - "lastModified": 1728549173, - "narHash": "sha256-j2fKbd38tPnCS9TQNneGwfC8z9tASzrdoZT9iOOpIvc=", + "lastModified": 1728704748, + "narHash": "sha256-3EjbWR/0pCoSLYeury+gPxvM8/2NMfE1i0/+N1FAsAc=", "ref": "refs/heads/main", - "rev": "de2438b2894cd89c1e3626a8b78566e6c2b6d497", - "revCount": 23, + "rev": "dd49995b4e610de537a30e359797cfb8f0971fe5", + "revCount": 24, "type": "git", "url": "https://git.chn.moe/chn/blog.git" }, @@ -40,11 +40,11 @@ "blurred-wallpaper": { "flake": false, "locked": { - "lastModified": 1721745357, - "narHash": "sha256-+MjnVsGHqitQytxiAH39Kx9SXuTEFfIC14Ayzu4yE4I=", + "lastModified": 1727825457, + "narHash": "sha256-P/N7g/cl2K0R4NKebfqZnr9WQkHPSvHNbKbWiOxs76k=", "owner": "bouteillerAlan", "repo": "blurredwallpaper", - "rev": "661a067215a2a9efffc6846bc166405d0a90da96", + "rev": "09f8a0812fa45321fe29a1491809a39e884c8989", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1724469296, - "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -90,7 +90,6 @@ }, "chaotic": { "inputs": { - "compare-to": "compare-to", "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": [ @@ -99,16 +98,14 @@ "jovian": "jovian", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems", - "yafas": "yafas" + ] }, "locked": { - "lastModified": 1724689493, - "narHash": "sha256-fNjxhUlj1/tsz4NmVvGiomEhnRlzRNi4/FUmYr7QO5I=", + "lastModified": 1728835058, + "narHash": "sha256-GbcJ90E8+wBkBh9C1HxBTwKsOkGU41CRaPrd1ksFPtA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9fbc509c51ab1e49b5c54a8c06d492830f6d8437", + "rev": "ec6b449d3d096a0e79db5f8c4a321ea9ec836e40", "type": "github" }, "original": { @@ -133,20 +130,6 @@ "type": "github" } }, - "compare-to": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" - } - }, "concurrencpp": { "flake": false, "locked": { @@ -182,11 +165,11 @@ "date": { "flake": false, "locked": { - "lastModified": 1715694668, - "narHash": "sha256-0dlwfPFUpIUp45KxfJIcD7J7ls6csPGx//qSt9Wp2CI=", + "lastModified": 1727878317, + "narHash": "sha256-MyyRfkm7cYwRZELiZQl6vqWZlbmsk+NGunVBrnoyeYA=", "owner": "HowardHinnant", "repo": "date", - "rev": "1ead6715dec030d340a316c927c877a3c4e5a00c", + "rev": "dd8affc6de5755e07638bf0a14382d29549d6ee9", "type": "github" }, "original": { @@ -203,11 +186,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -219,11 +202,11 @@ "eigen": { "flake": false, "locked": { - "lastModified": 1724459406, - "narHash": "sha256-CzysP5sq15+5U/hBBrP9lLecAa09OJH6a1bQ+pmWAVU=", + "lastModified": 1728842156, + "narHash": "sha256-PsdEtibL/FNgVPAJTOCgt83jvPbMRJDm6UdXz1qObZg=", "owner": "libeigen", "repo": "eigen", - "rev": "c5189ac656c2bf5eead9bc967282cf084cbaeb64", + "rev": "820e8a45fb9b8305aeffba63956ac3a6091db4df", "type": "gitlab" }, "original": { @@ -241,11 +224,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724111875, - "narHash": "sha256-Cit1pRfzgq8G1vCMRQ4eE4YdaUJPCxvj0p3EvhIPAUY=", + "lastModified": 1727739145, + "narHash": "sha256-/JJoK3V5wJNsIuFd6Kz7TqiNIJOE03Is90mWi/cIRnQ=", "owner": "Mic92", "repo": "envfs", - "rev": "c8493adca165b700f53a53e06f578f3b9f64bcfc", + "rev": "7e44d605a5017839fb560e22af3b401c79437a77", "type": "github" }, "original": { @@ -263,11 +246,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1724394478, - "narHash": "sha256-JSiv2uwI4UJo/4pxt4255BfzWCiEberJmBC6pCxnzas=", + "lastModified": 1728455642, + "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", "owner": "nix-community", "repo": "fenix", - "rev": "2e7bcdc4ef73aa56abd2f970e5a8b9c0cc87e614", + "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", "type": "github" }, "original": { @@ -378,27 +361,9 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ - "nur-linyinfeng", + "nix-fast-build", "nixpkgs" ] }, @@ -416,16 +381,37 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": [ + "nur-linyinfeng", + "nixpkgs" + ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -436,21 +422,21 @@ }, "flake-schemas": { "locked": { - "lastModified": 1693491534, - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -468,14 +454,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -486,7 +472,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -504,14 +490,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -522,7 +508,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -541,11 +527,11 @@ "git-lfs-transfer": { "flake": false, "locked": { - "lastModified": 1723210978, - "narHash": "sha256-V/IvjUSWmp/QbSuaHzMT0AF4dqam1Ay8Uei5+11cmT8=", + "lastModified": 1728312033, + "narHash": "sha256-YsplPW3i4W1RfkWQI1eGXFXb3JofQwKe+9LbjxeL1cM=", "owner": "charmbracelet", "repo": "git-lfs-transfer", - "rev": "2cab0ea18f7e5c07a6cc5490f861b6815abad119", + "rev": "422d24414fe4b803849b3f6fe7c4d8ab1b40803b", "type": "github" }, "original": { @@ -595,11 +581,11 @@ "hextra": { "flake": false, "locked": { - "lastModified": 1727602023, - "narHash": "sha256-fYfevapv+7x4WmYmte3vhQeOakHMchBGC7eYvOMru+0=", + "lastModified": 1728759339, + "narHash": "sha256-5cITxE5Ib5VMRaPpyxSLfFS9KpRQVLmcw9KARLMZXfE=", "owner": "imfing", "repo": "hextra", - "rev": "94624bcac67cf587ec1006a9c2f0d72fbce9f135", + "rev": "97ea67198b2f5439b5ba727e831ea4f7d30a0df2", "type": "github" }, "original": { @@ -615,11 +601,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1728791962, + "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "64c6325b28ebd708653dd41d88f306023f296184", "type": "github" }, "original": { @@ -630,11 +616,11 @@ }, "impermanence": { "locked": { - "lastModified": 1724489415, - "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", + "lastModified": 1727649413, + "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", + "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e", "type": "github" }, "original": { @@ -652,11 +638,11 @@ ] }, "locked": { - "lastModified": 1724304322, - "narHash": "sha256-/nrlMDubg9oG2VNANRBxsas5RbcJtB6IIDPZC3yHLW8=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "924a18ea8df89a39166dd202f3e73cd022825768", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -668,11 +654,11 @@ "kylin-virtual-keyboard": { "flake": false, "locked": { - "lastModified": 1723713444, - "narHash": "sha256-AvuoCe9ka0tfXtNW0KxInRI6xoSayiyrX+tBlAjGNLY=", + "lastModified": 1728870819, + "narHash": "sha256-ECg3z9fXtOgnRJ4zTVhm+zEuHx0kQMRiSbnCZNDzEXo=", "ref": "refs/heads/upstream", - "rev": "eba6dbbfd5d3d4128cbd300be7e109088cd82858", - "revCount": 162, + "rev": "aa24264254d92040c991001e248c927e9c30f4f2", + "revCount": 173, "type": "git", "url": "https://gitee.com/openkylin/kylin-virtual-keyboard.git" }, @@ -684,11 +670,11 @@ "lepton": { "flake": false, "locked": { - "lastModified": 1724686250, - "narHash": "sha256-Ngof+vfBm/3HFtjsNZGo9sWIHuoAet8v3f/FSMbARr4=", + "lastModified": 1727091413, + "narHash": "sha256-Id3YphCYrnw1vWy/z2psAEM71Tvy0t5q8pVdxneKYRg=", "owner": "black7375", "repo": "Firefox-UI-Fix", - "rev": "c346292707c4507e2ccd890adacba65c85dc62d1", + "rev": "c327fb7fe04949990993f6deb218d144e6b364c4", "type": "github" }, "original": { @@ -700,11 +686,11 @@ "linux-surface": { "flake": false, "locked": { - "lastModified": 1723861744, - "narHash": "sha256-a4rrhMYb75Kk4G7JEZkacJPWI4u7o5xX88hwgty38D8=", + "lastModified": 1726862894, + "narHash": "sha256-Qt3h/JyGXj6nXb8SHv3lWv2vjnbj4lyOXpcuRjidWp4=", "owner": "linux-surface", "repo": "linux-surface", - "rev": "9103a6bf08d622fd583fd9839d2dc4ef9b2a46e2", + "rev": "c863f435d28498fb103d28616ba7d49e30a03d88", "type": "github" }, "original": { @@ -716,11 +702,11 @@ "lmod": { "flake": false, "locked": { - "lastModified": 1724105894, - "narHash": "sha256-MhoKG0QwTAccK0NE8vnm325T8Azqy4VKf77LGaSDNZI=", + "lastModified": 1728781056, + "narHash": "sha256-G+6sRJHoJh8IGEAut3U/nFEBkM+ZqeCEghjT2/GzTcY=", "owner": "TACC", "repo": "Lmod", - "rev": "c7974de5ba3376c7bdc123c42a8e9c3648a84ec4", + "rev": "b2068e6bdfacb69ba43511f5a6b6960a2d7824f4", "type": "github" }, "original": { @@ -732,11 +718,11 @@ "matplotplusplus": { "flake": false, "locked": { - "lastModified": 1712716029, - "narHash": "sha256-R/skGbIyD67f/wGKebFkhqDxsFNw9exIK/tEauqaHCs=", + "lastModified": 1727155016, + "narHash": "sha256-AXO5Qrsnqm1Mo3lE8G5x3ofiXInx3eTPkXU6gUT49a0=", "owner": "alandefreitas", "repo": "matplotplusplus", - "rev": "734e4876611ae6ed216da47a7eb5c4b8e39785ce", + "rev": "e4ce4978db8ddc100dbfa895c38e7c51252a61bb", "type": "github" }, "original": { @@ -782,11 +768,11 @@ "nameof": { "flake": false, "locked": { - "lastModified": 1715807436, - "narHash": "sha256-Mzcmin7p5wlNkbqvLE/GCOHnRu1R7/Dv0bsJe96w58U=", + "lastModified": 1726743126, + "narHash": "sha256-1TPWUHPCVX/JrWuw7+lidMxg/d3UH80h8ZQJTJKei3o=", "owner": "Neargye", "repo": "nameof", - "rev": "174b23d76e81f97766e8350aeab2a7cd49004bc9", + "rev": "3f1664327a3c841198f0a52962c48988d021a7a9", "type": "github" }, "original": { @@ -798,11 +784,11 @@ "nc4nix": { "flake": false, "locked": { - "lastModified": 1724637826, - "narHash": "sha256-/ZI1Bs96JyTxOnG12Rqx2o8aYfwqKxF7IMCUIfLBX3w=", + "lastModified": 1728785059, + "narHash": "sha256-5Ss8bZigvTewWJG/BPg1yLRIQj9TlK9NiEGTfSVTpDk=", "owner": "helsinki-systems", "repo": "nc4nix", - "rev": "c082bb1e4d237090bec9cb845af43627766724a9", + "rev": "2aa951c7ac2f11c3d0178e3a8e26d1f1620c9909", "type": "github" }, "original": { @@ -820,11 +806,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1719475157, - "narHash": "sha256-8zW6eWvE9T03cMpo/hY8RRZIsSCfs1zmsJOkEZzuYwM=", + "lastModified": 1728306776, + "narHash": "sha256-57QXMMEELaEbE+ZVg0ngSC7UGZoyYP2QmDGcQSJ8BnE=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "030e586195c97424844965d2ce680140f6565c02", + "rev": "1775c732071d0ee37c1950ce4ecbf2729487ee71", "type": "github" }, "original": { @@ -835,11 +821,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1721549352, - "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=", + "lastModified": 1728416205, + "narHash": "sha256-t30gsrwiBc2oBsd89DwdsVZuEbMT5ed81PYY57CIOJE=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b", + "rev": "d65dbf59900de4beaaaba8b42a15994f8433c1bc", "type": "github" }, "original": { @@ -879,11 +865,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", "type": "github" }, "original": { @@ -899,11 +885,11 @@ ] }, "locked": { - "lastModified": 1724576102, - "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -920,11 +906,11 @@ ] }, "locked": { - "lastModified": 1723950649, - "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "392828aafbed62a6ea6ccab13728df2e67481805", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -942,11 +928,11 @@ ] }, "locked": { - "lastModified": 1724635787, - "narHash": "sha256-01rsv0PLT/x5BZybqTnrlYipnG1CFF5s7ZX9otCnFlM=", + "lastModified": 1728179514, + "narHash": "sha256-mOGZFPYm9SuEXnYiXhgs/JmLu7RofRaMpAYyJiWudkc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "d1980fd00e84460f6769cc1684899fead5224080", + "rev": "018196c371073d669510fd69dd2f6dc0ec608c41", "type": "github" }, "original": { @@ -957,15 +943,16 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723854545, - "narHash": "sha256-3CE8MTrYLMNzPr90Y09Js3EI9D0MR3JnQtYENVcdKB4=", + "lastModified": 1728391737, + "narHash": "sha256-3jiyIrJzozA/3+nLbaHV/JbJU6Fq0ztWO2OdU82n4KA=", "owner": "CHN-beta", "repo": "nixos-hardware", - "rev": "0b3a6ecaa0be2e528b6a5619cf29aea77b61e5bc", + "rev": "74baa45dfae0905ecc6a87c1c1633a3bc81b9216", "type": "github" }, "original": { "owner": "CHN-beta", + "ref": "next", "repo": "nixos-hardware", "type": "github" } @@ -1004,16 +991,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727884105, - "narHash": "sha256-J4lHJFQp7AFEa+O52KgYMCXkffAgpXWGyD89AU8xeJE=", + "lastModified": 1728876263, + "narHash": "sha256-qb9Pe2IyMJA22pDipl4RotAODgjCqvEDDphDky5g7y8=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "e8db202a0ba0b25d01c01b49ed3025f7b0900d59", + "rev": "7cd275c5592c1c4a31a5b1d52b846ff96e3ed5dc", "type": "github" }, "original": { "owner": "CHN-beta", - "ref": "nixos-unstable", + "ref": "next", "repo": "nixpkgs", "type": "github" } @@ -1084,11 +1071,11 @@ }, "nixpkgs-24_05": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { @@ -1100,26 +1087,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" - } - }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-stable": { @@ -1157,11 +1132,11 @@ "nu-scripts": { "flake": false, "locked": { - "lastModified": 1725014865, - "narHash": "sha256-EmlwDTEby2PAOQBUAhjiBJ8ymVW3H23V78dFaF8DQKw=", + "lastModified": 1728515956, + "narHash": "sha256-50udD/5kQbJX8qW/nrRaRWBEZXGHPFCZR6+EmYJY9e8=", "owner": "nushell", "repo": "nu_scripts", - "rev": "614b0733104a7753ed7d775224fe5918877b71de", + "rev": "c05790d2fca6d39a42bb36d4bfa7442eea3f8c15", "type": "github" }, "original": { @@ -1184,11 +1159,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1724610772, - "narHash": "sha256-XAOnvYuIAMv7V2YVnVLUpMb+kzmxFxaXCaQASyJq7Ho=", + "lastModified": 1728844221, + "narHash": "sha256-DzaJGxyw0aL36SUUPuU16hUtEy+Aa9lPImzO+2IW0Cw=", "owner": "linyinfeng", "repo": "nur-packages", - "rev": "4593675609c0064d9a01e11df2e5c1ff369b98be", + "rev": "d7759623ba4cc519cc1b4e2f7b92e905db894126", "type": "github" }, "original": { @@ -1210,11 +1185,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1724379880, - "narHash": "sha256-PatYnOuctc4rYrY7EqUDXbGkeRbyvhNIC845b0HS+oQ=", + "lastModified": 1728813954, + "narHash": "sha256-ATGDoEkabxlEwfOfIJFWAxHgINu8BmWD4uRbQybz3Gs=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "655aedb45bb67e16c7ac2a116614f28d36eec8b9", + "rev": "1b8ada3fdcd3643ca91b659f0441cad3f8109344", "type": "github" }, "original": { @@ -1302,11 +1277,11 @@ ] }, "locked": { - "lastModified": 1724556439, - "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", + "lastModified": 1728750492, + "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", + "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108", "type": "github" }, "original": { @@ -1338,19 +1313,19 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_5", "treefmt-nix": "treefmt-nix_5" }, "locked": { - "lastModified": 1725358301, - "narHash": "sha256-clY4INR7RjOVKya3FGNYvOhyFyUhd3dGQsnV2Za3rz0=", - "owner": "CHN-beta", + "lastModified": 1728564116, + "narHash": "sha256-BkEqM5zUrYAwRKrfqi7hPOqjgD6+N0NCJvooaY8aQoE=", + "owner": "nix-community", "repo": "poetry2nix", - "rev": "1f803d2b2faa5b785dfd2fafe99b2411731bf08c", + "rev": "8a18db56dd62edd26458a87e4d335b7df84c3f3f", "type": "github" }, "original": { - "owner": "CHN-beta", + "owner": "nix-community", "repo": "poetry2nix", "type": "github" } @@ -1366,11 +1341,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1723803910, - "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1382,11 +1357,11 @@ "py4vasp": { "flake": false, "locked": { - "lastModified": 1718736886, - "narHash": "sha256-uAKhxPwiI3glSKMfynDIUrXQ7s2sfKw/PGVNoP40y00=", + "lastModified": 1728372041, + "narHash": "sha256-J3b0Wl5MLZdWRQYlV13SBM6ga2Jl+rnfWzWxXpKUWdA=", "owner": "vasp-dev", "repo": "py4vasp", - "rev": "661b9efed3824b36e67c559f4120b5ecfd231bce", + "rev": "bf692b9d160526be9772f529963a2080b923bbb6", "type": "github" }, "original": { @@ -1402,11 +1377,11 @@ ] }, "locked": { - "lastModified": 1724664864, - "narHash": "sha256-VEaGrv5sGNIdN6eQADXH9GylMp7X7qKCfOBmX93lsik=", + "lastModified": 1728687370, + "narHash": "sha256-vxGD7+eB74puo7dkXdvu7jkdosA1E6D7PrZUasXZXwg=", "owner": "Nix-QChem", "repo": "NixOS-QChem", - "rev": "7fcab915d585fd3c4261ec21585d4e9e117bc2c9", + "rev": "b3fc913f4ab3aa305f024898aac9cdcabcb5180b", "type": "github" }, "original": { @@ -1482,11 +1457,11 @@ "rsshub": { "flake": false, "locked": { - "lastModified": 1725304080, - "narHash": "sha256-Hq64xQwl6r6bEwJHtQ745Bf8mjid8BfUlix7HRvGaU0=", + "lastModified": 1728846093, + "narHash": "sha256-lglI/PDXZyTFDqI3IxbP5OXHp+dtnmPaailOcWESmJA=", "owner": "DIYgod", "repo": "RSSHub", - "rev": "b5ad2fa0cb08e4a718285de575a97b107152eea1", + "rev": "3cd690ad240d766a052c09e36392c4db6a920281", "type": "github" }, "original": { @@ -1498,11 +1473,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1724345276, - "narHash": "sha256-MKvjkqVL/RJ3QXOA8tSUoK7HHXVGSB2AL+vKxU4Cf+c=", + "lastModified": 1728386838, + "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9b724459b5900c2424f5069023d6596a8617284b", + "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", "type": "github" }, "original": { @@ -1515,11 +1490,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1725783932, - "narHash": "sha256-ZrDE5yqkgiv0F34w1QFz1oZnNnReW0PEA6vjO6gx4Uc=", + "lastModified": 1728809910, + "narHash": "sha256-hG4klxVOUGM567YN3jhq5UjHqpfMPHfVTYWuitdq9qY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "58ac93a2ade218ea5e4dae38246030c7342b1eb4", + "rev": "894c1045607011c9d05cd2228d55d6cede3f2090", "type": "gitlab" }, "original": { @@ -1570,11 +1545,11 @@ ] }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -1602,11 +1577,11 @@ "sqlite-orm": { "flake": false, "locked": { - "lastModified": 1724485979, - "narHash": "sha256-jgRCYOtCyXj2E5J3iYBffX2AyBwvhune+i4Pb2eCBrA=", + "lastModified": 1727880903, + "narHash": "sha256-QLV8pLv+HPUB1LeF4PnHtd474xhRfr1pMEcs3A2nYZI=", "owner": "fnc12", "repo": "sqlite_orm", - "rev": "6630268477b1df9d22a6a563c62aec2c91ee4249", + "rev": "b045f1b9d8be24337a1762e6240deeef5dce994a", "type": "github" }, "original": { @@ -1617,16 +1592,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1676,21 +1651,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1704,7 +1664,7 @@ "type": "indirect" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1722,11 +1682,11 @@ "tgbot-cpp": { "flake": false, "locked": { - "lastModified": 1718267737, - "narHash": "sha256-b63r2SwE1gxL1NBQb7wM7fTRXSKPUB8eZrpbPXFY34E=", + "lastModified": 1728313059, + "narHash": "sha256-6rzNEC0HJQuiBeOg5Zh5XohaLbXWqKb8H1ZxeHBJmsw=", "owner": "reo7sp", "repo": "tgbot-cpp", - "rev": "faafa5e99082aa4c402161e4dc31a8d75a7be0a2", + "rev": "da74ac49daa318569ee634d71299846ef170af79", "type": "github" }, "original": { @@ -1764,11 +1724,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { @@ -1785,11 +1745,11 @@ ] }, "locked": { - "lastModified": 1724338379, - "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -1806,11 +1766,11 @@ ] }, "locked": { - "lastModified": 1723808491, - "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -1827,11 +1787,11 @@ ] }, "locked": { - "lastModified": 1719749022, - "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -1843,11 +1803,11 @@ "v-sim": { "flake": false, "locked": { - "lastModified": 1722003028, - "narHash": "sha256-qGnlSrUwwVhCu3kSlklwQg08S7mFZ/RcfsVv3phuuko=", + "lastModified": 1726128818, + "narHash": "sha256-DsTsqmboCzTjrykPFde4PyQpjQ2ZW0yUmyWQGkZcYmI=", "owner": "l_sim", "repo": "v_sim", - "rev": "1b77971358002d3e92b18021551029e9db33e509", + "rev": "8e6b879bcc513d776b31150d7edb4f60049035eb", "type": "gitlab" }, "original": { @@ -1864,53 +1824,28 @@ ] }, "locked": { - "lastModified": 1728108519, - "narHash": "sha256-JnRyiNR1O79n90TPjDBNpqd/Qh6jnP4t92rCgK/s6qU=", - "owner": "CHN-beta", + "lastModified": 1728114956, + "narHash": "sha256-GM/JZ1JCW3Hs+CLU1PxeuOOyCBwCsUPZQOHtCxzbFyk=", + "owner": "winapps-org", "repo": "winapps", - "rev": "64478a87a49d6093f4d4f3a281bf0eecd2e6f977", + "rev": "e8dc55a83abd3eb6b275990fb19bdb589b6ce13d", "type": "github" }, "original": { - "owner": "CHN-beta", + "owner": "winapps-org", "ref": "feat-nix-packaging", "repo": "winapps", "type": "github" } }, - "yafas": { - "inputs": { - "flake-schemas": [ - "chaotic", - "flake-schemas" - ], - "systems": [ - "chaotic", - "systems" - ] - }, - "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "owner": "UbiqueLambda", - "repo": "yafas", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", - "type": "github" - }, - "original": { - "owner": "UbiqueLambda", - "repo": "yafas", - "type": "github" - } - }, "zpp-bits": { "flake": false, "locked": { - "lastModified": 1721553062, - "narHash": "sha256-rqL/xEhPzgCA16DP/LIix75VtqKpBS5Rm56fb5cxaGo=", + "lastModified": 1726003541, + "narHash": "sha256-VFWJa1gWuKdSpo4swv8qNNsqBVjjcZwUwJsPUK2mVak=", "owner": "eyalz800", "repo": "zpp_bits", - "rev": "81be2fa9652658e7b4a77f9f6ea3970eb3bbef6f", + "rev": "244f9c612f668bd466e2ee378a4998d3c577332c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3d82030..9e50338b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { - nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:CHN-beta/nixpkgs/next"; "nixpkgs-23.11".url = "github:CHN-beta/nixpkgs/nixos-23.11"; "nixpkgs-23.05".url = "github:CHN-beta/nixpkgs/nixos-23.05"; "nixpkgs-22.11".url = "github:NixOS/nixpkgs/nixos-22.11"; @@ -26,7 +26,7 @@ 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"; + nixos-hardware.url = "github:CHN-beta/nixos-hardware/next"; envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-fast-build = { url = "github:/Mic92/nix-fast-build"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-flatpak.url = "github:gmodena/nix-flatpak"; @@ -38,8 +38,8 @@ 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:CHN-beta/poetry2nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - winapps = { url = "github:CHN-beta/winapps/feat-nix-packaging"; 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"; }; misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; }; rsshub = { url = "github:DIYgod/RSSHub"; flake = false; }; diff --git a/flake/src.nix b/flake/src.nix index 560a278f..986e542f 100644 --- a/flake/src.nix +++ b/flake/src.nix @@ -1,2 +1,4 @@ { inputs }: let inherit (inputs.self.packages.x86_64-linux) pkgs; in -{} +{ + git-lfs-transfer = "sha256-1cGlhLdnU6yTqzcB3J1cq3gawncbtdgkb3LFh2ZmXbM="; +} diff --git a/modules/packages/desktop/default.nix b/modules/packages/desktop/default.nix index cf1af2c8..3d7554a0 100644 --- a/modules/packages/desktop/default.nix +++ b/modules/packages/desktop/default.nix @@ -31,43 +31,43 @@ inputs: # color management argyllcms xcalib # networking - remmina putty mtr-gui + remmina # putty mtr-gui # media - mpv nomacs spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio - waifu2x-converter-cpp inkscape blender whalebird paraview + mpv nomacs yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk + waifu2x-converter-cpp inkscape blender paraview vlc whalebird # spotify obs-studio # themes - catppuccin catppuccin-sddm catppuccin-cursors catppuccinifier-gui catppuccinifier-cli catppuccin-plymouth - (catppuccin-kde.override { flavour = [ "latte" ]; }) (catppuccin-kvantum.override { variant = "latte"; }) - klassy - localPackages.slate localPackages.blurred-wallpaper tela-circle-icon-theme + klassy localPackages.slate localPackages.blurred-wallpaper tela-circle-icon-theme + # catppuccin catppuccin-sddm catppuccin-cursors catppuccinifier-gui catppuccinifier-cli catppuccin-plymouth + # (catppuccin-kde.override { flavour = [ "latte" ]; }) (catppuccin-kvantum.override { variant = "latte"; }) # terminal - warp-terminal + # warp-terminal # development - adb-sync scrcpy weston cage openbox krita jetbrains.clion android-studio dbeaver-bin cling fprettify - aircrack-ng + adb-sync scrcpy dbeaver-bin cling aircrack-ng + # weston cage openbox krita jetbrains.clion android-studio fprettify # desktop sharing - rustdesk-flutter + # rustdesk-flutter # password and key management - yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden electrum - jabref - john crunch hashcat + yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden hashcat + # electrum jabref john crunch # download - qbittorrent nur-xddxdd.baidupcs-go wgetpaste onedrive onedrivegui rclone + 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 + # fluent-reader rssguard newsflash newsboat # nix tools nixpkgs-fmt appimage-run nixd nix-serve node2nix nix-prefetch-github prefetch-npm-deps nix-prefetch-docker nix-template nil pnpm-lock-export bundix # instant messager - element-desktop telegram-desktop discord fluffychat zoom-us signal-desktop slack nur-linyinfeng.wemeet - nheko # qq nur-xddxdd.wechat-uos TODO: cinny-desktop + element-desktop telegram-desktop discord zoom-us slack nur-linyinfeng.wemeet nheko + # fluffychat signal-desktop qq nur-xddxdd.wechat-uos cinny-desktop # browser - google-chrome tor-browser microsoft-edge + google-chrome tor-browser # microsoft-edge # office - crow-translate zotero pandoc ydict libreoffice-qt texstudio poppler_utils pdftk pdfchain hdfview - davinci-resolve texliveFull + crow-translate zotero pandoc libreoffice-qt texliveFull poppler_utils pdftk pdfchain davinci-resolve + # TODO: enable in next release + # hdfview + # ydict texstudio # matplot++ needs old gnuplot inputs.pkgs."pkgs-23.11".gnuplot # math, physics and chemistry @@ -75,7 +75,7 @@ inputs: (mathematica.overrideAttrs (prev: { postInstall = (prev.postInstall or "") + "ln -s ${prev.src} $out/src"; })) (quantum-espresso.override { stdenv = gcc14Stdenv; gfortran = gfortran14; }) jmol mpi localPackages.ufo # virtualization - wineWowPackages.stagingFull virt-viewer bottles genymotion playonlinux + virt-viewer bottles # wineWowPackages.stagingFull genymotion playonlinux # media nur-xddxdd.svp # for kdenlive auto subtitle diff --git a/modules/packages/lammps.nix b/modules/packages/lammps.nix index 2c7d6707..3ec952c0 100644 --- a/modules/packages/lammps.nix +++ b/modules/packages/lammps.nix @@ -10,15 +10,12 @@ inputs: nixos.packages.packages._packages = let cuda = let inherit (inputs.config.nixos.system.nixpkgs) cuda; in cuda.enable && cuda.capabilities != null; in - if cuda then [((inputs.pkgs.lammps-mpi.override { stdenv = inputs.pkgs.cudaPackages.backendStdenv; }) + if cuda then [((inputs.pkgs.lammps.override { stdenv = inputs.pkgs.cudaPackages.backendStdenv; }) .overrideAttrs (prev: { - cmakeFlags = prev.cmakeFlags ++ inputs.lib.optionals cuda - [ - "-DPKG_GPU=on" "-DGPU_API=cuda" "-DCMAKE_POLICY_DEFAULT_CMP0146=OLD" - ]; - nativeBuildInputs = prev.nativeBuildInputs ++ inputs.lib.optionals cuda - [ inputs.pkgs.cudaPackages.cudatoolkit ]; + cmakeFlags = prev.cmakeFlags ++ [ "-DPKG_GPU=on" "-DGPU_API=cuda" "-DCMAKE_POLICY_DEFAULT_CMP0146=OLD" ]; + nativeBuildInputs = prev.nativeBuildInputs ++ [ inputs.pkgs.cudaPackages.cudatoolkit ]; + buildInputs = prev.buildInputs ++ [ inputs.pkgs.mpi ]; }))] else [ inputs.pkgs.lammps-mpi ]; }; diff --git a/modules/packages/server.nix b/modules/packages/server.nix index 3c1256c1..f1a20b7d 100644 --- a/modules/packages/server.nix +++ b/modules/packages/server.nix @@ -32,13 +32,13 @@ inputs: # networking ipset iptables iproute2 dig nettools traceroute tcping-go whois tcpdump nmap inetutils wireguard-tools # nix tools - nix-output-monitor nix-tree ssh-to-age (callPackage "${inputs.topInputs.nix-fast-build}" {}) nix-inspect + nix-output-monitor nix-tree ssh-to-age nix-inspect # (callPackage "${inputs.topInputs.nix-fast-build}" {}) # development gdb try inputs.topInputs.plasma-manager.packages.${inputs.pkgs.system}.rc2nix rr hexo-cli gh nix-init hugo # stupid things toilet lolcat # office - todo-txt-cli pdfgrep ffmpeg-full + pdfgrep ffmpeg-full # todo-txt-cli ] ++ (with inputs.config.boot.kernelPackages; [ cpupower usbip ]) ++ (inputs.lib.optional (inputs.config.nixos.system.nixpkgs.arch == "x86_64") rar); diff --git a/modules/services/samba.nix b/modules/services/samba.nix index e6ee457f..b906177e 100644 --- a/modules/services/samba.nix +++ b/modules/services/samba.nix @@ -33,18 +33,7 @@ inputs: enable = true; # TCP 139 445 UDP 137 138 openFirewall = !samba.private; - securityType = "user"; - extraConfig = - '' - workgroup = WORKGROUP - server string = Samba Server - server role = standalone server - hosts allow = ${samba.hostsAllowed} - dns proxy = no - ''; - # obey pam restrictions = yes - # encrypt passwords = no - shares = listToAttrs (map + settings = listToAttrs (map (share: { name = share.name; @@ -60,7 +49,8 @@ inputs: "force directory mode" = "2755"; }; }) - (attrsToList samba.shares)); + (attrsToList samba.shares)) + // { global."hosts allow" = "${samba.hostsAllowed}"; }; }; }; nixos.services.xray.client.v2ray-forwarder = diff --git a/modules/services/xray/default.nix b/modules/services/xray.nix similarity index 98% rename from modules/services/xray/default.nix rename to modules/services/xray.nix index 15a04f9d..e267d2b2 100644 --- a/modules/services/xray/default.nix +++ b/modules/services/xray.nix @@ -56,8 +56,6 @@ inputs: { enable = true; settingsFile = inputs.config.sops.templates."xray-client.json".path; - package = inputs.pkgs.xray.overrideAttrs - (prev: { patches = prev.patches or [] ++ [ ./disable-splice.patch ];}); }; dnsmasq = { @@ -347,8 +345,6 @@ inputs: { enable = true; settingsFile = inputs.config.sops.templates."xray-server.json".path; - package = inputs.pkgs.xray.overrideAttrs - (prev: { patches = prev.patches or [] ++ [ ./disable-splice.patch ];}); }; sops = { diff --git a/modules/services/xray/disable-splice.patch b/modules/services/xray/disable-splice.patch deleted file mode 100644 index acd35218..00000000 --- a/modules/services/xray/disable-splice.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/proxy/proxy.go b/proxy/proxy.go -index db92051..54d36b4 100644 ---- a/proxy/proxy.go -+++ b/proxy/proxy.go -@@ -504,7 +504,8 @@ func CopyRawConnIfExist(ctx context.Context, readerConn net.Conn, writerConn net - splice = false - } - } -- if splice { -+ _ = splice -+ if false { - newError("CopyRawConn splice").WriteToLog(session.ExportIDToError(ctx)) - statWriter, _ := writer.(*dispatcher.SizeStatWriter) - //runtime.Gosched() // necessary diff --git a/modules/system/kernel/0001-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.patch b/modules/system/kernel/0001-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.patch deleted file mode 100644 index 6643f029..00000000 --- a/modules/system/kernel/0001-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 123c4d46272b7e72d7db3fe8b4131a8cc99613fb Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Wed, 14 Aug 2024 10:28:24 -0400 -Subject: [PATCH] drm/amdgpu/sdma5.2: limit wptr workaround to sdma 5.2.1 - -The workaround seems to cause stability issues on other -SDMA 5.2.x IPs. - -Fixes: a03ebf116303 ("drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell") -Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3556 -Signed-off-by: Alex Deucher ---- - drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c -index d740255edf5a..bc9b240a3488 100644 ---- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c -+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c -@@ -225,14 +225,16 @@ static void sdma_v5_2_ring_set_wptr(struct amdgpu_ring *ring) - DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n", - ring->doorbell_index, ring->wptr << 2); - WDOORBELL64(ring->doorbell_index, ring->wptr << 2); -- /* SDMA seems to miss doorbells sometimes when powergating kicks in. -- * Updating the wptr directly will wake it. This is only safe because -- * we disallow gfxoff in begin_use() and then allow it again in end_use(). -- */ -- WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR), -- lower_32_bits(ring->wptr << 2)); -- WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI), -- upper_32_bits(ring->wptr << 2)); -+ if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(5, 2, 1)) { -+ /* SDMA seems to miss doorbells sometimes when powergating kicks in. -+ * Updating the wptr directly will wake it. This is only safe because -+ * we disallow gfxoff in begin_use() and then allow it again in end_use(). -+ */ -+ WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR), -+ lower_32_bits(ring->wptr << 2)); -+ WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI), -+ upper_32_bits(ring->wptr << 2)); -+ } - } else { - DRM_DEBUG("Not using doorbell -- " - "mmSDMA%i_GFX_RB_WPTR == 0x%08x " --- -2.46.0 - diff --git a/modules/system/kernel/btrfs.patch b/modules/system/kernel/btrfs.patch deleted file mode 100644 index 4d3016ce..00000000 --- a/modules/system/kernel/btrfs.patch +++ /dev/null @@ -1,141 +0,0 @@ -From ae1e766f623f7a2a889a0b09eb076dd9a60efbe9 Mon Sep 17 00:00:00 2001 -From: Filipe Manana -Date: Sun, 11 Aug 2024 11:53:42 +0100 -Subject: btrfs: only run the extent map shrinker from kswapd tasks - -Currently the extent map shrinker can be run by any task when attempting -to allocate memory and there's enough memory pressure to trigger it. - -To avoid too much latency we stop iterating over extent maps and removing -them once the task needs to reschedule. This logic was introduced in commit -b3ebb9b7e92a ("btrfs: stop extent map shrinker if reschedule is needed"). - -While that solved high latency problems for some use cases, it's still -not enough because with a too high number of tasks entering the extent map -shrinker code, either due to memory allocations or because they are a -kswapd task, we end up having a very high level of contention on some -spin locks, namely: - -1) The fs_info->fs_roots_radix_lock spin lock, which we need to find - roots to iterate over their inodes; - -2) The spin lock of the xarray used to track open inodes for a root - (struct btrfs_root::inodes) - on 6.10 kernels and below, it used to - be a red black tree and the spin lock was root->inode_lock; - -3) The fs_info->delayed_iput_lock spin lock since the shrinker adds - delayed iputs (calls btrfs_add_delayed_iput()). - -Instead of allowing the extent map shrinker to be run by any task, make -it run only by kswapd tasks. This still solves the problem of running -into OOM situations due to an unbounded extent map creation, which is -simple to trigger by direct IO writes, as described in the changelog -of commit 956a17d9d050 ("btrfs: add a shrinker for extent maps"), and -by a similar case when doing buffered IO on files with a very large -number of holes (keeping the file open and creating many holes, whose -extent maps are only released when the file is closed). - -Reported-by: kzd -Link: https://bugzilla.kernel.org/show_bug.cgi?id=219121 -Reported-by: Octavia Togami -Link: https://lore.kernel.org/linux-btrfs/CAHPNGSSt-a4ZZWrtJdVyYnJFscFjP9S7rMcvEMaNSpR556DdLA@mail.gmail.com/ -Fixes: 956a17d9d050 ("btrfs: add a shrinker for extent maps") -CC: stable@vger.kernel.org # 6.10+ -Tested-by: kzd -Tested-by: Octavia Togami -Signed-off-by: Filipe Manana -Reviewed-by: David Sterba -Signed-off-by: David Sterba ---- - fs/btrfs/extent_map.c | 22 ++++++---------------- - fs/btrfs/super.c | 10 ++++++++++ - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c -index 23b65dc73c0048..10ac5f657e3889 100644 ---- a/fs/btrfs/extent_map.c -+++ b/fs/btrfs/extent_map.c -@@ -1147,8 +1147,7 @@ static long btrfs_scan_inode(struct btrfs_inode *inode, struct btrfs_em_shrink_c - return 0; - - /* -- * We want to be fast because we can be called from any path trying to -- * allocate memory, so if the lock is busy we don't want to spend time -+ * We want to be fast so if the lock is busy we don't want to spend time - * waiting for it - either some task is about to do IO for the inode or - * we may have another task shrinking extent maps, here in this code, so - * skip this inode. -@@ -1191,9 +1190,7 @@ next: - /* - * Stop if we need to reschedule or there's contention on the - * lock. This is to avoid slowing other tasks trying to take the -- * lock and because the shrinker might be called during a memory -- * allocation path and we want to avoid taking a very long time -- * and slowing down all sorts of tasks. -+ * lock. - */ - if (need_resched() || rwlock_needbreak(&tree->lock)) - break; -@@ -1222,12 +1219,7 @@ static long btrfs_scan_root(struct btrfs_root *root, struct btrfs_em_shrink_ctx - if (ctx->scanned >= ctx->nr_to_scan) - break; - -- /* -- * We may be called from memory allocation paths, so we don't -- * want to take too much time and slowdown tasks. -- */ -- if (need_resched()) -- break; -+ cond_resched(); - - inode = btrfs_find_first_inode(root, min_ino); - } -@@ -1285,14 +1277,12 @@ long btrfs_free_extent_maps(struct btrfs_fs_info *fs_info, long nr_to_scan) - ctx.last_ino); - } - -- /* -- * We may be called from memory allocation paths, so we don't want to -- * take too much time and slowdown tasks, so stop if we need reschedule. -- */ -- while (ctx.scanned < ctx.nr_to_scan && !need_resched()) { -+ while (ctx.scanned < ctx.nr_to_scan) { - struct btrfs_root *root; - unsigned long count; - -+ cond_resched(); -+ - spin_lock(&fs_info->fs_roots_radix_lock); - count = radix_tree_gang_lookup(&fs_info->fs_roots_radix, - (void **)&root, -diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c -index 83478deada3bd2..11044e9e2cb110 100644 ---- a/fs/btrfs/super.c -+++ b/fs/btrfs/super.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include "messages.h" - #include "delayed-inode.h" - #include "ctree.h" -@@ -2409,6 +2410,15 @@ static long btrfs_free_cached_objects(struct super_block *sb, struct shrink_cont - const long nr_to_scan = min_t(unsigned long, LONG_MAX, sc->nr_to_scan); - struct btrfs_fs_info *fs_info = btrfs_sb(sb); - -+ /* -+ * We may be called from any task trying to allocate memory and we don't -+ * want to slow it down with scanning and dropping extent maps. It would -+ * also cause heavy lock contention if many tasks concurrently enter -+ * here. Therefore only allow kswapd tasks to scan and drop extent maps. -+ */ -+ if (!current_is_kswapd()) -+ return 0; -+ - return btrfs_free_extent_maps(fs_info, nr_to_scan); - } - --- -cgit 1.2.3-korg - diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index c4f7c579..387b72b3 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -134,21 +134,8 @@ inputs: let version = inputs.lib.versions.majorMinor inputs.config.boot.kernelPackages.kernel.version; in ./hibernate-progress-${version}.patch; }]; - # TODO: remove in 6.11 - btrfs = - [{ - name = "btrfs"; - patch = - let version = inputs.lib.versions.majorMinor inputs.config.boot.kernelPackages.kernel.version; - in if version == "6.10" then ./btrfs.patch else null; - }]; - amdgpu = - [{ - name = "amdgpu"; - patch = ./0001-drm-amdgpu-sdma5.2-limit-wptr-workaround-to-sdma-5.2.patch; - }]; }; - in builtins.concatLists (builtins.map (name: patches.${name}) (kernel.patches ++ [ "btrfs" ])); + in builtins.concatLists (builtins.map (name: patches.${name}) kernel.patches); }; } ( diff --git a/modules/system/kernel/hibernate-progress-6.11.patch b/modules/system/kernel/hibernate-progress-6.11.patch new file mode 100644 index 00000000..1c77688a --- /dev/null +++ b/modules/system/kernel/hibernate-progress-6.11.patch @@ -0,0 +1,128 @@ +diff --git a/kernel/power/swap.c b/kernel/power/swap.c +index 5bc04bfe2db1..6e7b17b97de7 100644 +--- a/kernel/power/swap.c ++++ b/kernel/power/swap.c +@@ -563,7 +563,7 @@ static int save_image(struct swap_map_handle *handle, + + hib_init_batch(&hb); + +- pr_info("Saving image data pages (%u pages)...\n", ++ pr_err("Saving image data pages (%u pages)...\n", + nr_to_write); + m = nr_to_write / 10; + if (!m) +@@ -578,7 +578,7 @@ static int save_image(struct swap_map_handle *handle, + if (ret) + break; + if (!(nr_pages % m)) +- pr_info("Image saving progress: %3d%%\n", ++ pr_err("Image saving progress: %3d%%\n", + nr_pages / m * 10); + nr_pages++; + } +@@ -588,7 +588,7 @@ static int save_image(struct swap_map_handle *handle, + if (!ret) + ret = err2; + if (!ret) +- pr_info("Image saving done\n"); ++ pr_err("Image saving done\n"); + swsusp_show_speed(start, stop, nr_to_write, "Wrote"); + return ret; + } +@@ -795,8 +795,8 @@ static int save_compressed_image(struct swap_map_handle *handle, + */ + handle->reqd_free_pages = reqd_free_pages(); + +- pr_info("Using %u thread(s) for %s compression\n", nr_threads, hib_comp_algo); +- pr_info("Compressing and saving image data (%u pages)...\n", ++ pr_err("Using %u thread(s) for %s compression\n", nr_threads, hib_comp_algo); ++ pr_err("Compressing and saving image data (%u pages)...\n", + nr_to_write); + m = nr_to_write / 10; + if (!m) +@@ -817,7 +817,7 @@ static int save_compressed_image(struct swap_map_handle *handle, + data_of(*snapshot), PAGE_SIZE); + + if (!(nr_pages % m)) +- pr_info("Image saving progress: %3d%%\n", ++ pr_err("Image saving progress: %3d%%\n", + nr_pages / m * 10); + nr_pages++; + } +@@ -888,9 +888,9 @@ static int save_compressed_image(struct swap_map_handle *handle, + if (!ret) + ret = err2; + if (!ret) +- pr_info("Image saving done\n"); ++ pr_err("Image saving done\n"); + swsusp_show_speed(start, stop, nr_to_write, "Wrote"); +- pr_info("Image size after compression: %d kbytes\n", ++ pr_err("Image size after compression: %d kbytes\n", + (atomic_read(&compressed_size) / 1024)); + + out_clean: +@@ -1105,7 +1105,7 @@ static int load_image(struct swap_map_handle *handle, + hib_init_batch(&hb); + + clean_pages_on_read = true; +- pr_info("Loading image data pages (%u pages)...\n", nr_to_read); ++ pr_err("Loading image data pages (%u pages)...\n", nr_to_read); + m = nr_to_read / 10; + if (!m) + m = 1; +@@ -1123,7 +1123,7 @@ static int load_image(struct swap_map_handle *handle, + if (ret) + break; + if (!(nr_pages % m)) +- pr_info("Image loading progress: %3d%%\n", ++ pr_err("Image loading progress: %3d%%\n", + nr_pages / m * 10); + nr_pages++; + } +@@ -1133,7 +1133,7 @@ static int load_image(struct swap_map_handle *handle, + if (!ret) + ret = err2; + if (!ret) { +- pr_info("Image loading done\n"); ++ pr_err("Image loading done\n"); + ret = snapshot_write_finalize(snapshot); + if (!ret && !snapshot_image_loaded(snapshot)) + ret = -ENODATA; +@@ -1328,8 +1328,8 @@ static int load_compressed_image(struct swap_map_handle *handle, + } + want = ring_size = i; + +- pr_info("Using %u thread(s) for %s decompression\n", nr_threads, hib_comp_algo); +- pr_info("Loading and decompressing image data (%u pages)...\n", ++ pr_err("Using %u thread(s) for %s decompression\n", nr_threads, hib_comp_algo); ++ pr_err("Loading and decompressing image data (%u pages)...\n", + nr_to_read); + m = nr_to_read / 10; + if (!m) +@@ -1459,7 +1459,7 @@ static int load_compressed_image(struct swap_map_handle *handle, + data[thr].unc + off, PAGE_SIZE); + + if (!(nr_pages % m)) +- pr_info("Image loading progress: %3d%%\n", ++ pr_err("Image loading progress: %3d%%\n", + nr_pages / m * 10); + nr_pages++; + +@@ -1485,7 +1485,7 @@ static int load_compressed_image(struct swap_map_handle *handle, + } + stop = ktime_get(); + if (!ret) { +- pr_info("Image loading done\n"); ++ pr_err("Image loading done\n"); + ret = snapshot_write_finalize(snapshot); + if (!ret && !snapshot_image_loaded(snapshot)) + ret = -ENODATA; +@@ -1593,7 +1593,7 @@ int swsusp_check(bool exclusive) + } + if (!error && swsusp_header->flags & SF_HW_SIG && + swsusp_header->hw_sig != swsusp_hardware_signature) { +- pr_info("Suspend image hardware signature mismatch (%08x now %08x); aborting resume.\n", ++ pr_err("Suspend image hardware signature mismatch (%08x now %08x); aborting resume.\n", + swsusp_header->hw_sig, swsusp_hardware_signature); + error = -EINVAL; + } diff --git a/packages/default.nix b/packages/default.nix index a6480c08..7e0c67cd 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -11,7 +11,6 @@ inputs: rec nodesoup = inputs.pkgs.callPackage ./nodesoup.nix { src = inputs.topInputs.nodesoup; }; matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix { - inherit glad nodesoup; src = inputs.topInputs.matplotplusplus; stdenv = inputs.pkgs.clang18Stdenv; }; @@ -99,7 +98,8 @@ inputs: rec chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; }; winjob = inputs.pkgs.callPackage ./winjob { stdenv = inputs.pkgs.gcc14Stdenv; }; 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; }; + 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.nix { src = inputs.topInputs.py4vasp; }; pocketfft = inputs.pkgs.callPackage ./pocketfft.nix { src = inputs.topInputs.pocketfft; }; spectroscopy = inputs.pkgs.callPackage ./spectroscopy.nix { src = inputs.topInputs.spectroscopy; }; diff --git a/packages/git-lfs-transfer.nix b/packages/git-lfs-transfer.nix index 75067947..fa3c03a3 100644 --- a/packages/git-lfs-transfer.nix +++ b/packages/git-lfs-transfer.nix @@ -1,6 +1,6 @@ -{ buildGoModule, src }: buildGoModule +{ buildGoModule, src, hash }: buildGoModule { name = "git-lfs-transfer"; inherit src; - vendorHash = "sha256-DYupPz6VnFeFWG4helRv5ahbTDQk+6w6alxwNGU9B9Q="; + vendorHash = hash; } diff --git a/packages/matplotplusplus.nix b/packages/matplotplusplus.nix index 31963aea..ead05f63 100644 --- a/packages/matplotplusplus.nix +++ b/packages/matplotplusplus.nix @@ -1,18 +1,9 @@ { - stdenv, src, cmake, pkg-config, substituteAll, - gnuplot, libjpeg, libtiff, zlib, libpng, lapack, blas, fftw, opencv, nodesoup, cimg, glfw, libGL, python3, glad + stdenv, src, cmake, pkg-config, substituteAll }: stdenv.mkDerivation { name = "matplotplusplus"; inherit src; - cmakeFlags = - [ - "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF" - "-DMATPLOTPP_WITH_SYSTEM_NODESOUP=ON" "-DMATPLOTPP_WITH_SYSTEM_CIMG=ON" - "-DMATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND=ON" "-DGLAD_REPRODUCIBLE=ON" - ]; - buildInputs = [ gnuplot libjpeg libtiff zlib libpng lapack blas fftw opencv nodesoup cimg glfw libGL glad ]; - nativeBuildInputs = [ cmake pkg-config python3 ]; - propagatedBuildInputs = [ libGL glad glfw ]; - propagatedNativeBuildInputs = [ python3 ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF" ]; + nativeBuildInputs = [ cmake pkg-config ]; }