diff --git a/flake.lock b/flake.lock index 2e8a50a1..e9f3c780 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1734701201, - "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=", + "lastModified": 1736591904, + "narHash": "sha256-LFO8pSrPKrH8OPq2HaAuBG5skk8/MNJ/9YmK3KsnSks=", "owner": "nix-community", "repo": "disko", - "rev": "2ee76c861af3b895b3b104bae04777b61397485b", + "rev": "33827d2bd16bfe2e21b62956526c72d313595dfd", "type": "github" }, "original": { @@ -79,24 +79,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -125,11 +107,11 @@ ] }, "locked": { - "lastModified": 1734893333, - "narHash": "sha256-0Ft7iTkl3UWAix72teY5nflYQD7GE0KvIiT+ox4wkB8=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f74238a4c8e534a1b6be72cb5153043071ffd17", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -141,11 +123,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734862644, - "narHash": "sha256-04xesW7HITdF5WUmNM39WD4tkEERk3Ez2W1nNvdIvIw=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8516a23524cc9083f5a02a8d64d14770e4c7c09", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -158,15 +140,14 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733854371, - "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", + "lastModified": 1736095716, + "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", + "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "type": "github" }, "original": { @@ -194,11 +175,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1734529975, - "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -208,13 +189,29 @@ "type": "github" } }, - "nixpkgs-master": { + "nixpkgs-2411": { "locked": { - "lastModified": 1735606615, - "narHash": "sha256-j2QeXLGlydjd6gDSyHasBJ0OoPXFDSYgd0KbyVCnE3w=", + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c49743669a58a01d5978bf5cab134d2ae717696c", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-master": { + "locked": { + "lastModified": 1736676754, + "narHash": "sha256-8mBXIWtVDgsHY2TIx1HC4tpG/62DGP9nrKCsJcnhtCI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3cdbf0a9ec6dcb0db3f2987759ce42057d788c24", "type": "github" }, "original": { @@ -242,11 +239,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { @@ -265,6 +262,7 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_3", "nixpkgs-2405": "nixpkgs-2405", + "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-master": "nixpkgs-master" } }, @@ -282,21 +280,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3e2dc51b..0057f400 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-2411.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; diff --git a/nix/hosts/lemp11/configuration.nix b/nix/hosts/lemp11/configuration.nix index 7fb172d8..79485f5d 100644 --- a/nix/hosts/lemp11/configuration.nix +++ b/nix/hosts/lemp11/configuration.nix @@ -86,7 +86,7 @@ services.printing.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; hardware.bluetooth.enable = true; diff --git a/nix/hosts/t490/hardware.nix b/nix/hosts/t490/hardware.nix index 54785de3..3798ca48 100644 --- a/nix/hosts/t490/hardware.nix +++ b/nix/hosts/t490/hardware.nix @@ -1,7 +1,5 @@ { hardware = { bluetooth.enable = true; - - pulseaudio.enable = false; }; } diff --git a/nix/hosts/t490/services/default.nix b/nix/hosts/t490/services/default.nix index c73817ea..4ca3fa92 100644 --- a/nix/hosts/t490/services/default.nix +++ b/nix/hosts/t490/services/default.nix @@ -23,6 +23,7 @@ openssh.enable = true; power-profiles-daemon.enable = false; printing.enable = true; + pulseaudio.enable = false; throttled.enable = true; thermald.enable = true; }; diff --git a/nix/modules/nixos/features/gaming.nix b/nix/modules/nixos/features/gaming.nix index c8f4d40b..abcf78ca 100644 --- a/nix/modules/nixos/features/gaming.nix +++ b/nix/modules/nixos/features/gaming.nix @@ -13,6 +13,6 @@ with lib; config = mkIf config.features.desktop.gaming.enable { programs.steam.enable = true; - environment.systemPackages = with pkgs; [ zeroad ]; + environment.systemPackages = with pkgs; [ nixpkgs-2411.zeroad ]; }; } diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index 6308c47e..7d42c2e8 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -16,5 +16,10 @@ config.allowUnfree = true; system = final.system; }; + + nixpkgs-2411 = import inputs.nixpkgs-2411 { + config.allowUnfree = true; + system = final.system; + }; }; }