Merge pull request #66 from nrdxp/override-modules

Make modules overridable

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;
         };

hosts/default.nix

@@ -14,14 +14,28 @@ let
   inherit (builtins) attrValues removeAttrs;
   inherit (pkgset) osPkgs unstablePkgs;
 
+  unstableModules = [ ];
+
   config = hostName:
     lib.nixosSystem {
       inherit system;
 
+      specialArgs =
+        {
+          unstableModulesPath = "${master}/nixos/modules";
+        };
+
       modules =
         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;

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;