commit 6b15586bef2336894ccd89909670204b3476ea41
author Skyler Grey <skyler3665@gmail.com> Thu Jul 21 00:22:20 2022 +0100
committer Skyler Grey <skyler3665@gmail.com> Thu Jul 21 00:29:28 2022 +0100
tree d4f2c9478199405cb2f0d71911290662820b4773
parent 2aa5251b7ab062347753cdce394145ce44e634ef

Upgrade nix to work with patch

- Additionally, update flake.nix so all inputs are passed to both
  configurations for NixOS and configurations for Home Manager

flake.nix

diff --git a/flake.nix b/flake.nix
index 210ef96..2b30260 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
                 inherit system;
 
                 specialArgs = extraInputs // {
-                  inherit nixpkgs system;
+                  inherit nixpkgs nixpkgs-unstable home-manager pkgs-unstable system;
                 };
 
                 modules = [
@@ -49,7 +49,7 @@
             "${variables.username}" = home-manager.lib.homeManagerConfiguration rec {
                 inherit system pkgs;
 
-                extraSpecialArgs = extraInputs // { inherit pkgs-unstable system; };
+                extraSpecialArgs = extraInputs // { inherit nixpkgs nixpkgs-unstable home-manager pkgs-unstable system; };
 
                 username = variables.username;
                 homeDirectory = "/home/${username}";

src/system.nix

diff --git a/src/system.nix b/src/system.nix
index f909729..4afd43f 100644
--- a/src/system.nix
+++ b/src/system.nix
@@ -1,4 +1,4 @@
-{ pkgs, nurpkgs, lib, modulesPath, config, ... }:
+{ pkgs, pkgs-unstable, nurpkgs, lib, modulesPath, config, ... }:
 let
     nixScripts = import ./utils/nixFilesIn.nix lib ./nix/system;
     nixApps = import ./utils/nixFilesIn.nix lib ./apps/system;
@@ -10,7 +10,7 @@
 
   # Prepare nix flakes
   nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs-unstable.nix;
     extraOptions = ''
       experimental-features = nix-command flakes
       auto-optimise-store = true