From 164a672129dca889c6b94e0aaee2e446f5e5c48a Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Thu, 31 Dec 2020 13:42:49 -0700
Subject: [PATCH 1/4] hosts: add unstableModulesPath

---
 hosts/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hosts/default.nix b/hosts/default.nix
index eae99408..3d0eb7e9 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -18,6 +18,11 @@ let
     lib.nixosSystem {
       inherit system;
 
+      specialArgs =
+        {
+          unstableModulesPath = "${master}/nixos/modules";
+        };
+
       modules =
         let
           core = self.nixosModules.profiles.core;

From 73bc694bbbe31ac0736520a751f7f8d99bebd891 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Thu, 31 Dec 2020 13:43:34 -0700
Subject: [PATCH 2/4] simple mechanism to override modules from master

---
 hosts/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hosts/default.nix b/hosts/default.nix
index 3d0eb7e9..81817b25 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -14,6 +14,8 @@ let
   inherit (builtins) attrValues removeAttrs;
   inherit (pkgset) osPkgs unstablePkgs;
 
+  unstableModules = [ ];
+
   config = hostName:
     lib.nixosSystem {
       inherit system;
@@ -27,6 +29,13 @@ let
         let
           core = self.nixosModules.profiles.core;
 
+          modOverrides = { config, unstableModulesPath, ... }: {
+            disabledModules = unstableModules;
+            imports = map
+              (path: "${unstableModulesPath}/${path}")
+              unstableModules;
+          };
+
           global = {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;

From 00b35136c341606eb2428f898b4c8832f331f70d Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Thu, 31 Dec 2020 13:44:57 -0700
Subject: [PATCH 3/4] flake: add pkgs back to overlays

Packages from `pkgs/default.nix` are meant to be exposed to all nixos
configurations. However, #61 removed a redundancy in the output api
which was  relied up to do so.
---
 flake.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 91b990c2..c0c237b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,11 @@
       externModules = [ home.nixosModules.home-manager ];
 
       pkgset =
-        let overlays = (attrValues self.overlays) ++ externOverlays; in
+        let overlays =
+          (attrValues self.overlays)
+          ++ externOverlays
+          ++ [ self.overlay ];
+        in
         genPkgset {
           inherit master nixos overlays system;
         };

From 003ab99e35d9bb9d24e52323278d97fa9b6599e6 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Thu, 31 Dec 2020 13:50:08 -0700
Subject: [PATCH 4/4] niximg: install flakes directly within iso

Fixes #63.
---
 hosts/niximg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/niximg.nix b/hosts/niximg.nix
index 61fbb22a..823eeb60 100644
--- a/hosts/niximg.nix
+++ b/hosts/niximg.nix
@@ -1,10 +1,10 @@
-{ modulesPath, ... }: {
+{ unstableModulesPath, ... }: {
   imports = [
     # passwd is nixos by default
     ../users/nixos
     # passwd is empty by default
     ../users/root
-    "${modulesPath}/installer/cd-dvd/iso-image.nix"
+    "${unstableModulesPath}/installer/cd-dvd/iso-image.nix"
   ];
 
   isoImage.makeEfiBootable = true;