diff --git a/flake.nix b/flake.nix index 3213b82..4f9b35f 100644 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,28 @@ let system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { inherit system; }; + pkgs' = (import inputs.nixpkgs { inherit system; }).applyPatches { + name = "nixpkgs-unstable-patched"; + src = inputs.nixpkgs; + patches = [ + (builtins.fetchurl { + url = + "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/369042.patch"; + sha256 = + "sha256:08asxmd34rzaxb8dr4nccy26k3vxnx7psy2imnp40fdplqna0a85"; + }) + (builtins.fetchurl { + url = + "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368790.patch"; + sha256 = + "sha256:1blsawm4l30wkrdkvvq0fw2aki7v921isdwrk9dw8yh09cglbfd9"; + }) + ]; + }; - utils = import ./utils.nix { inherit inputs system; }; + pkgs = import pkgs' { inherit system; }; + + utils = import ./utils.nix { inherit inputs system pkgs; }; in { nixosConfigurations = { # desktop diff --git a/utils.nix b/utils.nix index 13e6ee8..98cf7f2 100644 --- a/utils.nix +++ b/utils.nix @@ -1,12 +1,13 @@ -{ inputs, system, ... }: { - mkHost = host: inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs system; }; +{ inputs, system, pkgs, ... }: { + mkHost = host: + inputs.nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs system pkgs; }; - modules = [ - host - ./modules/nixos - inputs.home-manager.nixosModules.default - inputs.stylix.nixosModules.stylix - ]; - }; + modules = [ + host + ./modules/nixos + inputs.home-manager.nixosModules.default + inputs.stylix.nixosModules.stylix + ]; + }; }