From 61b457a6876bdae65790eee37eb16a32d80b089a Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sat, 21 Jun 2025 23:53:27 +0200 Subject: [PATCH] chore: update flake inputs --- flake.lock | 148 +++++++++++++++--------------------- modules/xserver.nix | 12 ++- users/phundrak/packages.nix | 2 +- 3 files changed, 69 insertions(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index 4ad9df6..f28d685 100644 --- a/flake.lock +++ b/flake.lock @@ -9,16 +9,20 @@ "devenv" ], "git-hooks": [ - "devenv" + "devenv", + "git-hooks" ], - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "devenv", + "nixpkgs" + ] }, "locked": { - "lastModified": 1744206633, - "narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=", + "lastModified": 1748883665, + "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=", "owner": "cachix", "repo": "cachix", - "rev": "8a60090640b96f9df95d1ab99e5763a586be1404", + "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe", "type": "github" }, "original": { @@ -34,14 +38,14 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1747717470, - "narHash": "sha256-tk2mRZAf8C5uOkMVJHemJ3ld09CYVp/z94/lHqsQ8ZA=", + "lastModified": 1751477330, + "narHash": "sha256-LzMVgB8izls/22g69KvWPbuQ8C7PRT9PobbvdV3/raI=", "owner": "cachix", "repo": "devenv", - "rev": "c7f2256ee4a4a4ee9cbf1e82a6e49b253c374995", + "rev": "4ca8cf2e4c35e03dbb3ecf773db5c93ea9cdcfdd", "type": "github" }, "original": { @@ -53,11 +57,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": { @@ -75,11 +79,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -109,7 +113,8 @@ "git-hooks": { "inputs": { "flake-compat": [ - "devenv" + "devenv", + "flake-compat" ], "gitignore": "gitignore", "nixpkgs": [ @@ -118,11 +123,10 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1749636823, "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -141,7 +145,6 @@ }, "locked": { "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", @@ -160,11 +163,11 @@ ] }, "locked": { - "lastModified": 1748134483, - "narHash": "sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4=", + "lastModified": 1751476662, + "narHash": "sha256-eX6wMGQjaTzedR6lz2IpEnAMgLcuQLQezBJNil7yG3s=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1e671036224089937e111e32ea899f59181c383", + "rev": "9347c61bc0cbed0d2062b930144c2cbd557f9189", "type": "github" }, "original": { @@ -173,51 +176,36 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, "nix": { "inputs": { "flake-compat": [ - "devenv" + "devenv", + "flake-compat" ], "flake-parts": "flake-parts", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_2", + "git-hooks-nix": [ + "devenv", + "git-hooks" + ], + "nixpkgs": "nixpkgs", "nixpkgs-23-11": [ "devenv" ], "nixpkgs-regression": [ "devenv" - ], - "pre-commit-hooks": [ - "devenv" ] }, "locked": { - "lastModified": 1745930071, - "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=", - "owner": "domenkozar", + "lastModified": 1750955511, + "narHash": "sha256-IDB/oh/P63ZTdhgSkey2LZHzeNhCdoKk+4j7AaPe1SE=", + "owner": "cachix", "repo": "nix", - "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c", + "rev": "afa41b08df4f67b8d77a8034b037ac28c71c77df", "type": "github" }, "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", + "owner": "cachix", + "ref": "devenv-2.30", "repo": "nix", "type": "github" } @@ -229,11 +217,11 @@ ] }, "locked": { - "lastModified": 1748145500, - "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -244,11 +232,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { @@ -259,22 +247,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1746807397, "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", @@ -290,13 +262,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -335,11 +307,11 @@ ] }, "locked": { - "lastModified": 1749772873, - "narHash": "sha256-ZsFQIs3ZpUud1QmR1TyhAW0LGbjHzCkA79YCLBbJ12A=", + "lastModified": 1751354716, + "narHash": "sha256-bLMNn3gh09gtkIEwZW3USt4ehLrmwmfnb3rqahYBI+4=", "ref": "refs/heads/master", - "rev": "517143adf97fb0df7e9a7584061deecdffb19faf", - "revCount": 576, + "rev": "f681e2016fd71b42985bd520b3a20c62488582e9", + "revCount": 599, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -353,7 +325,7 @@ "devenv": "devenv", "home-manager": "home-manager", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pumo-system-info": "pumo-system-info", "quickshell": "quickshell", "sops-nix": "sops-nix", @@ -388,11 +360,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1750119275, + "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", "type": "github" }, "original": { @@ -423,11 +395,11 @@ ] }, "locked": { - "lastModified": 1748059546, - "narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=", + "lastModified": 1751256876, + "narHash": "sha256-4A8LmE0Hd9RvQwSEPYdITJebpLt7J99VY76IphzqZKc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "716a5af28d686d67146d01b14112c919b6133a84", + "rev": "615b9244dc7ac777b8f0bc3a9cb7290936e4fcf9", "type": "github" }, "original": { diff --git a/modules/xserver.nix b/modules/xserver.nix index 872b60e..ef635b3 100644 --- a/modules/xserver.nix +++ b/modules/xserver.nix @@ -16,8 +16,14 @@ in { }; }; config.services = { - displayManager.sddm.enable = mkIf (cfg.de == "kde") true; - desktopManager.plasma6.enable = mkIf (cfg.de == "kde") true; + displayManager = { + sddm.enable = mkIf (cfg.de == "kde") true; + gdm.enable = mkIf (cfg.de == "gnome") true; + }; + desktopManager = { + plasma6.enable = mkIf (cfg.de == "kde") true; + gnome.enable = mkIf (cfg.de == "gnome") true; + }; gnome = mkIf (cfg.de == "gnome") { gnome-browser-connector.enable = true; @@ -29,8 +35,6 @@ in { xserver = { enable = true; - displayManager.gdm.enable = mkIf (cfg.de == "gnome") true; - desktopManager.gnome.enable = mkIf (cfg.de == "gnome") true; videoDrivers = lists.optional cfg.amdgpu.enable "amdgpu"; xkb = { layout = "fr"; diff --git a/users/phundrak/packages.nix b/users/phundrak/packages.nix index 7a58c5c..3a577b5 100644 --- a/users/phundrak/packages.nix +++ b/users/phundrak/packages.nix @@ -48,7 +48,7 @@ in { ani-cli audacity plexamp - plex-media-player + plex-desktop spicetify-cli spotify