diff --git a/flake.lock b/flake.lock index 13ad8729..a8ddd968 100644 --- a/flake.lock +++ b/flake.lock @@ -316,14 +316,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-MmsSAOnqv1ZampxH6H8xR7Zs7vJpKJI4WrsVMfw9OSI=", - "path": "/home/thiagoko/Projects/nixpkgs", - "type": "path" + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "type": "github" }, "original": { - "path": "/home/thiagoko/Projects/nixpkgs", - "type": "path" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { diff --git a/lib/flake-helpers.nix b/lib/flake-helpers.nix index b15d188b..ad58195a 100644 --- a/lib/flake-helpers.nix +++ b/lib/flake-helpers.nix @@ -72,7 +72,29 @@ in inherit (self.outputs.nixosConfigurations.${hostname}) config pkgs; inherit (nixpkgs.legacyPackages.${system}) applyPatches fetchpatch; - patches = [ ]; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/363922 + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/8ce6a1efacc9092f8e6bcdc649b7b14960f519dc.patch"; + hash = "sha256-H7RXLGDwtWtLeXfrMVSd0Mab89JNoqhumKu/dE3lqVc="; + }) + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/dc737160fdcc4a25f0ae6c6aeedaa050e185084c.patch"; + hash = "sha256-GirvMkd5T1dKDxaQrWWAOqTtSLvHzd7+GhjzYvedI5c="; + }) + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/3e1e64d0438b03c3ae171b78f8ac6977221afe92.patch"; + hash = "sha256-iimCxs7LvJWrFTGWTeFvMzguf0s3ZKRfJfB2hBn0qFQ="; + }) + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/1642dbbc079bc3926b840bbadd5de068bb921650.patch"; + hash = "sha256-nsiKnr8IA87nrVcUZRrHTpgqb26YcYlLvlIDNafK0+Y="; + }) + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/5b57a2ebfe52be0dd935b52692e6a03e1f171b00.patch"; + hash = "sha256-eYhDc4LbpGxk7nvpghivfYYXuZ9Goq9Sf63hy75HItE="; + }) + ]; nixosSystem = args: diff --git a/nixos/system/default.nix b/nixos/system/default.nix index 5a1c6675..7d499666 100644 --- a/nixos/system/default.nix +++ b/nixos/system/default.nix @@ -82,8 +82,6 @@ in }; }; - environment.systemPackages = with pkgs; [ nixos-rebuild-ng ]; - # Enable firmware-linux-nonfree hardware.enableRedistributableFirmware = lib.mkDefault true; @@ -119,6 +117,7 @@ in }; system.configurationRevision = flake.rev or "dirty"; + system.rebuild.enableNg = true; # nixos/modules/misc/version.nix users.motd = lib.mkIf cfg.motd.enable ''Welcome to '${config.networking.hostName}' running NixOS ${config.system.nixos.version}!'';