diff --git a/flake.lock b/flake.lock index 1f7df8a..19f4d1c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1713629865, - "narHash": "sha256-fsSuh5ZYGYninYR68obMaSqKxnxEnCHIJJFc6igjHGw=", + "lastModified": 1715314394, + "narHash": "sha256-N7NFoDXEafFaIbrTQeGR/A+Tpknx9S3S2TaKHQZ31e0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "b6c28cf87a7a055ffaad410f36852a7b2a9161ff", + "rev": "21c365a625a35db779e59853ce6eaf9e69a8dbc6", "type": "github" }, "original": { @@ -42,11 +42,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1712846731, - "narHash": "sha256-psRAPHgYC6qa+SNVdpD+ZViRBPu6/cqbi92smS6+pQI=", + "lastModified": 1715955315, + "narHash": "sha256-C6ya8PEWtvFH5baizF4miP3iy8ZotpOeDZ+hYNfv6uQ=", "owner": "AtaraxiaSjel", "repo": "nur", - "rev": "2de167b89f40c69b0d4e7297a9ec777a286bc74e", + "rev": "048c6c6e83eca9de3db1afc41aa64932596f4a74", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1665506760, - "narHash": "sha256-Rs3LH5qw91S8pCXBNqT2P+Nl4gI/5OqBJvA6WGun2n4=", + "lastModified": 1714424971, + "narHash": "sha256-FjTfWEMTF1CdjvcoRRGnAthAdykkdyffaFf38xAwk2Y=", "owner": "AtaraxiaSjel", "repo": "base16-nix", - "rev": "96b0826d8baf22873a2e8562a4cfc037e8182486", + "rev": "0b5eb7f6ec966c81ace3481e8b806f859c7566c4", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713632052, - "narHash": "sha256-kPlYLnGx8k6zOtzxws/Eb2OrFJWk6TwvMWiUDfw+nl8=", + "lastModified": 1715346321, + "narHash": "sha256-l65J9y7hH9jASeYG8k7NCLKnwbKcPrUgcO6ZRmG8TQU=", "owner": "cachix", "repo": "devenv", - "rev": "9c134f73b11b298674317b84292fa126744a65fb", + "rev": "61033d861900f36bfa6afcd5b8580f098d65e137", "type": "github" }, "original": { @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1713406758, - "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", + "lastModified": 1715217706, + "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", "owner": "nix-community", "repo": "disko", - "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", + "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", "type": "github" }, "original": { @@ -427,11 +427,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1713713092, - "narHash": "sha256-rvyr6BBtn3cq5B/48rhJlbIOpxprwlO/71663sd9Gik=", + "lastModified": 1715348159, + "narHash": "sha256-nP0PJZ3dR0ols1V+w+sYBki7JlSRFvFJ8J8B00Oa7BM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2846d5230a3c3923618eabb367deaf8885df580f", + "rev": "223743313bab8b0b44a57eaf9573de9f69082b4d", "type": "github" }, "original": { @@ -799,22 +799,20 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], "systems": "systems_5", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713724223, - "narHash": "sha256-yTWdX9aKKoY8s/BBsNY++t0W/0idIp2N4g7nGX+F9cc=", + "lastModified": 1715342341, + "narHash": "sha256-jHCjAwaukNCI7yVsbB8oppl1dUujvFAfRiXaecqWGI0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4954dcbbb352a72d41b43a6ab107388c17a0b21b", + "rev": "38911d6df4977b6b00557cc887eb151d032e505b", "type": "github" }, "original": { @@ -827,10 +825,12 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, @@ -879,11 +879,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -901,11 +901,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1712919696, - "narHash": "sha256-93zNQy4LGFP5h/GrQJctd8cPE0VdCDsWigTOx2effrE=", + "lastModified": 1714910693, + "narHash": "sha256-kkgjq8ZCnxYgqPX7O2kUHdzBm08bRlESCukSzE7XE2g=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "02ee7ff3bbd9cba72f26be7b09dde4a89fc31c21", + "rev": "1e1fc79d84c35a673c52cfa0be1ea9df1aed8442", "type": "github" }, "original": { @@ -926,11 +926,11 @@ ] }, "locked": { - "lastModified": 1713619586, - "narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=", + "lastModified": 1715287423, + "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "9e13e0915273959bfd98a10662f678c15ac71c77", + "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", "type": "github" }, "original": { @@ -1019,11 +1019,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708577783, - "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -1064,11 +1064,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1711950913, - "narHash": "sha256-r750/UygoC2mS3tEVHEXMaitLgLKkH+VKRRHmcZVGmk=", + "lastModified": 1715279591, + "narHash": "sha256-adAKVYQk2S30MSJ1VUmuI2K7i8J0A5iTO2ogL7rJhEA=", "owner": "nix-community", "repo": "nix-direnv", - "rev": "57f831e2e43c6d8a6b11511e40e18eb59ca1f471", + "rev": "45f4a56d9dd57191e42e586aa64806e04002d5dd", "type": "github" }, "original": { @@ -1086,11 +1086,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1709911523, - "narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=", + "lastModified": 1714663357, + "narHash": "sha256-2D2UVkXHivtNUohlJy3GjMaiE7efozJCRgnYOkBbZlY=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "692fe3e98f36b60c678d637235271b57910a7f80", + "rev": "071d44681486271060f938a354ef9ba82ee4f9ea", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ ] }, "locked": { - "lastModified": 1713662650, - "narHash": "sha256-pAAXTH3bUBELrXFGgRjzy/67Lm5trkFB2SXp6epMxX0=", + "lastModified": 1715304237, + "narHash": "sha256-MH9DsolHEmNh5s41tCHDVYOune1pzHK1Qb+QGG+KUEM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "03c7d19b4fbf7dd0f9890c310e809ca04da76c4e", + "rev": "0fe993bf882c7859b363e9b69178977ac845ea0e", "type": "github" }, "original": { @@ -1248,11 +1248,11 @@ ] }, "locked": { - "lastModified": 1712537332, - "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", + "lastModified": 1713783234, + "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", + "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", "type": "github" }, "original": { @@ -1263,11 +1263,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711333969, - "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", - "owner": "NixOS", + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", "type": "github" }, "original": { @@ -1279,29 +1279,23 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-master": { "locked": { - "lastModified": 1713724621, - "narHash": "sha256-1D3L/QuZx78MrXgHDkLHGQ9JyO+tUJMovcad6z6GT80=", + "lastModified": 1715355730, + "narHash": "sha256-g3pj7gLMXUROwm/z2NYKdtdqHgXkmsYqS+dYelkStqs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19081514c247fbe95d0cd9094e530cafd43dbe7f", + "rev": "3bb855986fa24e8ff70f7e8326b464e3b59e56ad", "type": "github" }, "original": { @@ -1393,11 +1387,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1713564160, - "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=", + "lastModified": 1715218190, + "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c", + "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", "type": "github" }, "original": { @@ -1409,11 +1403,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1713638189, - "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", + "lastModified": 1714858427, + "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74574c38577914733b4f7a775dd77d24245081dd", + "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "type": "github" }, "original": { @@ -1441,11 +1435,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1715037484, + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", "type": "github" }, "original": { @@ -1457,11 +1451,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -1473,11 +1467,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1712883908, - "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", + "lastModified": 1714213793, + "narHash": "sha256-Yg5D5LhyAZvd3DZrQQfJAVK8K3TkUYKooFtH1ulM0mw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", + "rev": "d6f6eb2a984f2ba9a366c31e4d36d65465683450", "type": "github" }, "original": { @@ -1505,11 +1499,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1665466769, - "narHash": "sha256-L+qcHpb4Ac3PipMXJY/Ktbu1+KXy23WCZ8pXWmsf7zY=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0b20bf89e0035b6d62ad58f9db8fdbc99c2b01e8", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -1553,11 +1547,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1710796454, - "narHash": "sha256-lQlICw60RhH8sHTDD/tJiiJrlAfNn8FDI9c+7G2F0SE=", + "lastModified": 1713361204, + "narHash": "sha256-TA6EDunWTkc5FvDCqU3W2T3SFn0gRZqh6D/hJnM02MM=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "06fb0f1c643aee3ae6838dda3b37ef0abc3c763b", + "rev": "285676e87ad9f0ca23d8714a6ab61e7e027020c6", "type": "github" }, "original": { @@ -1655,11 +1649,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { @@ -1686,11 +1680,11 @@ ] }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1713954846, + "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f", "type": "github" }, "original": { @@ -1708,11 +1702,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1713582705, - "narHash": "sha256-Tx1XV4HC7KECHRsrAAmFpkmr0oAkEMouocrirh35sf8=", + "lastModified": 1714792305, + "narHash": "sha256-UaL4+bHKb6iVIr2nAL0Ns5EM9s+8EmPbTb8PuUSZHc4=", "owner": "AtaraxiaSjel", "repo": "PrismLauncher", - "rev": "908704caa63e21322390d5aa0361da2ce344da9e", + "rev": "ccf38c3cfeb573e45d6b4e626cbab8c8c84c9deb", "type": "github" }, "original": { @@ -1758,11 +1752,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1713714397, - "narHash": "sha256-lgV7sFIITCN6JHLDqMAt0n9cCEKe836yi9tYy33XXXw=", + "lastModified": 1715355595, + "narHash": "sha256-7GQxBVLahCjHCJtdOucyBpvUlNiyW7JUIt/pchZ/LAg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d804052ce9c82e7bf5a66052c4d2c1a406a8d169", + "rev": "7fd7459e12220af47b956e1e4d925814dcbd55e7", "type": "gitlab" }, "original": { @@ -1779,11 +1773,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1713668495, - "narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=", + "lastModified": 1715244550, + "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "09f1bc8ba3277c0f052f7887ec92721501541938", + "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", "type": "github" }, "original": { @@ -1965,11 +1959,11 @@ ] }, "locked": { - "lastModified": 1711803027, - "narHash": "sha256-Qic3OvsVLpetchzaIe2hJqgliWXACq2Oee6mBXa/IZQ=", + "lastModified": 1714058656, + "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1810d51a015c1730f2fe05a255258649799df416", + "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", "type": "github" }, "original": { @@ -1986,11 +1980,11 @@ ] }, "locked": { - "lastModified": 1698438538, - "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", + "lastModified": 1714058656, + "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", + "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", "type": "github" }, "original": { @@ -2025,11 +2019,11 @@ ] }, "locked": { - "lastModified": 1709622318, - "narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=", + "lastModified": 1713958148, + "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=", "owner": "msteen", "repo": "nixos-vscode-server", - "rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd", + "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc", "type": "github" }, "original": { @@ -2038,29 +2032,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713699467, - "narHash": "sha256-wQ18I2j/lUEz6FELuSphPBgROHx1POz/R2fjLA+QP8A=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "b9063af512a2326d5c519edc6a759da875deab21", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "b9063af512a2326d5c519edc6a759da875deab21", - "type": "github" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -2075,11 +2049,11 @@ ] }, "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", + "lastModified": 1714662532, + "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", + "rev": "1f228ba2f1f254195c0b571302b37482861abee3", "type": "github" }, "original": { diff --git a/machines/AMD-Workstation/boot.nix b/machines/AMD-Workstation/boot.nix index 135fd0a..73c206c 100644 --- a/machines/AMD-Workstation/boot.nix +++ b/machines/AMD-Workstation/boot.nix @@ -3,8 +3,8 @@ let zfs_arc_max = toString (6 * 1024 * 1024 * 1024); in { boot = { - zfs.package = pkgs.zfs_unstable; - kernelPackages = pkgs.linuxPackages_lqx; + # zfs.package = pkgs.zfs_unstable; + kernelPackages = pkgs.linuxPackages_zen; initrd = { supportedFilesystems = [ "zfs" ]; diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix index 0f9efca..b703270 100644 --- a/machines/AMD-Workstation/default.nix +++ b/machines/AMD-Workstation/default.nix @@ -101,7 +101,7 @@ # pkgs.nix-init pkgs.nixpkgs-review pkgs.anydesk - pkgs.winbox + # pkgs.winbox pkgs.devenv pkgs.radeontop pkgs.wayvnc diff --git a/machines/Dell-Laptop/boot.nix b/machines/Dell-Laptop/boot.nix index 5da77c3..3e1cb57 100644 --- a/machines/Dell-Laptop/boot.nix +++ b/machines/Dell-Laptop/boot.nix @@ -3,8 +3,8 @@ let zfs_arc_max = toString (2 * 1024 * 1024 * 1024); in { boot = { - zfs.package = pkgs.zfs_unstable; - kernelPackages = pkgs.linuxPackages_lqx; + # zfs.package = pkgs.zfs_unstable; + kernelPackages = pkgs.linuxPackages_zen; initrd = { supportedFilesystems = [ "zfs" ]; diff --git a/machines/Flakes-ISO/default.nix b/machines/Flakes-ISO/default.nix index 9b9680e..bdeedfa 100644 --- a/machines/Flakes-ISO/default.nix +++ b/machines/Flakes-ISO/default.nix @@ -57,7 +57,7 @@ maxJobs = 8; sshUser = "ataraxia"; sshKey = "/home/nixos/ssh-builder"; - systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + systems = [ "x86_64-linux" "aarch64-linux" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; }]; distributedBuilds = true; diff --git a/machines/Home-Hypervisor/boot.nix b/machines/Home-Hypervisor/boot.nix index ca40280..e7a4e92 100644 --- a/machines/Home-Hypervisor/boot.nix +++ b/machines/Home-Hypervisor/boot.nix @@ -65,7 +65,7 @@ in { "vm.dirty_background_ratio" = 1; "vm.dirty_ratio" = 40; "vm.page-cluster" = 0; - "vm.overcommit_memory" = 1; + "vm.overcommit_memory" = lib.mkForce 1; "net.ipv4.tcp_congestion_control" = "bbr"; "net.core.default_qdisc" = "fq"; diff --git a/modules/headscale-auth.nix b/modules/headscale-auth.nix index d7d3da2..ce6bf70 100644 --- a/modules/headscale-auth.nix +++ b/modules/headscale-auth.nix @@ -2,7 +2,7 @@ with lib; { options.services.headscale-auth = mkOption { - description = mdDoc '' + description = '' Request headscale auth key. ''; type = types.attrsOf (types.submodule ({ ... }: { @@ -10,32 +10,32 @@ with lib; autoStart = mkOption { type = types.bool; default = false; - description = mdDoc "Request auth key on startup."; + description = "Request auth key on startup."; }; ephemeral = mkOption { type = types.bool; default = false; - description = mdDoc "Request ephemeral auth key."; + description = "Request ephemeral auth key."; }; expire = mkOption { type = types.str; default = "1h"; - description = mdDoc "Auth key expiration time."; + description = "Auth key expiration time."; }; user = mkOption { type = types.str; default = "ataraxiadev"; - description = mdDoc "Auth key user."; + description = "Auth key user."; }; outPath = mkOption { type = types.str; default = "/tmp/auth-key"; - description = mdDoc "Where to write down the auth key."; + description = "Where to write down the auth key."; }; before = mkOption { type = with types; listOf str; default = [ ]; - description = mdDoc "Start service before this services."; + description = "Start service before this services."; }; }; })); diff --git a/modules/kiwix-serve.nix b/modules/kiwix-serve.nix index 91279a5..664e9d2 100644 --- a/modules/kiwix-serve.nix +++ b/modules/kiwix-serve.nix @@ -15,27 +15,27 @@ in type = types.package; default = pkgs.kiwix-tools; defaultText = literalExpression "pkgs.kiwix-tools"; - description = lib.mdDoc "The package that provides `bin/kiwix-serve`"; + description = "The package that provides `bin/kiwix-serve`"; }; port = mkOption { type = types.port; default = 80; - description = lib.mdDoc "Port number to listen on"; + description = "Port number to listen on"; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = lib.mdDoc "IP address to listen on"; + description = "IP address to listen on"; }; zimPaths = mkOption { default = null; type = types.nullOr (types.nonEmptyListOf (types.either types.str types.path)); - description = lib.mdDoc "ZIM file path(s)"; + description = "ZIM file path(s)"; }; zimDir = mkOption { default = null; type = types.nullOr (types.either types.str types.path); - description = lib.mdDoc "ZIM directory"; + description = "ZIM directory"; }; }; }; diff --git a/modules/rustic-postgresql.nix b/modules/rustic-postgresql.nix index d1c8152..347d1e6 100644 --- a/modules/rustic-postgresql.nix +++ b/modules/rustic-postgresql.nix @@ -2,7 +2,7 @@ with lib; { options.backups.postgresql = mkOption { - description = mdDoc '' + description = '' Periodic backups of postgresql database to create with Rustic. ''; type = types.attrsOf (types.submodule ({ name, ... }: { diff --git a/modules/s3-sync.nix b/modules/s3-sync.nix index 11d2bc1..1d19c81 100644 --- a/modules/s3-sync.nix +++ b/modules/s3-sync.nix @@ -4,7 +4,7 @@ let inherit (utils.systemdUtils.unitOptions) unitOption; in { options.backups.rclone-sync = mkOption { - description = mdDoc '' + description = '' Sync buckets beetween two storages. ''; type = types.attrsOf (types.submodule ({ ... }: { @@ -12,7 +12,7 @@ in { rcloneConfigFile = mkOption { type = with types; nullOr path; default = null; - description = mdDoc '' + description = '' Path to the file containing rclone configuration. This file must contain configuration for the remotes specified in this backup set and also must be readable by root. @@ -21,7 +21,7 @@ in { syncOpts = mkOption { type = with types; listOf str; default = [ "--checksum" "--fast-list" ]; - description = mdDoc '' + description = '' A list of options for 'rclone sync'. ''; }; @@ -31,17 +31,17 @@ in { source = mkOption { type = types.str; default = ""; - description = mdDoc "Source to sync."; + description = "Source to sync."; }; target = mkOption { type = types.str; default = ""; - description = mdDoc "Target to sync."; + description = "Target to sync."; }; }; }); default = { }; - description = mdDoc '' + description = '' List of sync targets. ''; }; @@ -52,7 +52,7 @@ in { RandomizedDelaySec = "15m"; Persistent = true; }; - description = lib.mdDoc '' + description = '' When to run the backup. See {manpage}`systemd.timer(5)` for details. ''; }; diff --git a/patches/ydotoold.patch b/patches/ydotoold.patch index 7c0a7ae..edfbf87 100644 --- a/patches/ydotoold.patch +++ b/patches/ydotoold.patch @@ -37,7 +37,7 @@ index 0000000000000..f5996059a4c36 + + options = { + programs.ydotool = { -+ enable = lib.mkEnableOption (lib.mdDoc "ydotool, a generic Linux command-line automation tool"); ++ enable = lib.mkEnableOption "ydotool, a generic Linux command-line automation tool"; + }; + }; + diff --git a/patches/zen-kernels.patch b/patches/zen-kernels.patch index 0cde511..e69de29 100644 --- a/patches/zen-kernels.patch +++ b/patches/zen-kernels.patch @@ -1,17 +0,0 @@ -diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix -index 1f36e36..0e4e1ae 100644 ---- a/pkgs/os-specific/linux/kernel/zen-kernels.nix -+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix -@@ -11,9 +11,9 @@ let - }; - # ./update-zen.py lqx - lqxVariant = { -- version = "6.8.6"; #lqx -- suffix = "lqx2"; #lqx -- sha256 = "0mxbl0h8s021m0ab12yy778qyhdlb5789qjbn66l8qxsw0dv4ags"; #lqx -+ version = "6.7.12"; #lqx -+ suffix = "lqx1"; #lqx -+ sha256 = "1kcw2jmqmwb1mfqgiwms8i30sqdqzs8qvjfslyc9bcidpyg6qrqf"; #lqx - isLqx = true; - }; - zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/profiles/boot.nix b/profiles/boot.nix index 07caa60..153a814 100644 --- a/profiles/boot.nix +++ b/profiles/boot.nix @@ -45,7 +45,7 @@ with config.deviceSpecific; { "kvm.report_ignored_msrs=0" ]; - kernelPackages = lib.mkDefault pkgs.linuxPackages_lqx; + kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; consoleLogLevel = 3; kernel.sysctl = if config.zramSwap.enable then { diff --git a/profiles/nix/default.nix b/profiles/nix/default.nix index dffdab1..15b732f 100644 --- a/profiles/nix/default.nix +++ b/profiles/nix/default.nix @@ -1,5 +1,6 @@ -{ config, lib, inputs, ... }: { +{ config, lib, pkgs, inputs, ... }: { nix = { + package = pkgs.nixVersions.latest; nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ]; registry.self.flake = inputs.self; diff --git a/profiles/overlay.nix b/profiles/overlay.nix index d811745..a276435 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -20,7 +20,7 @@ with lib; { inputs.ataraxiasjel-nur.overlays.default inputs.ataraxiasjel-nur.overlays.grub2-argon2 inputs.deploy-rs.overlay - inputs.hyprland.overlays.default + # inputs.hyprland.overlays.default (final: prev: { attic = inputs.attic.packages.${system}.attic; diff --git a/profiles/workspace/hyprland/default.nix b/profiles/workspace/hyprland/default.nix index c439d76..333028c 100644 --- a/profiles/workspace/hyprland/default.nix +++ b/profiles/workspace/hyprland/default.nix @@ -23,12 +23,9 @@ let hyprpaper-pkg = inputs.hyprpaper.packages.${pkgs.hostPlatform.system}.hyprpaper; in with config.deviceSpecific; with lib; { - imports = [ inputs.hyprland.nixosModules.default ]; - programs.ydotool.enable = true; programs.hyprland.enable = true; home-manager.users.${config.mainuser} = { - imports = [ inputs.hyprland.homeManagerModules.default ]; services.udiskie.enable = !isServer; services.gammastep = { enable = !isServer;