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; }; diff --git a/hosts/default.nix b/hosts/default.nix index eae99408..81817b25 100644 --- a/hosts/default.nix +++ b/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; 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;