...

2 files changed, 17 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index e5aa1329..163e7bd5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,7 +57,7 @@
       inherit (nixpkgs) lib;
       utils = import ./utils { inherit lib; };
       inherit (utils) nixImport overrideModule;
-      inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists concatStringsSep;
+      inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists concatStringsSep fix filter makeOverridable;
       inherit (lib.strings) escapeNixString;
 
       accountUserName = accountName: 
@@ -139,7 +139,9 @@
                       // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); });
 
       systemsSelector = "x86_64-linux";
-      forAllSystems = f: mapAttrs f (filterAttrs (system: _systemPkgs: !(isNull (builtins.match systemsSelector system))) nixpkgs.legacyPackages);
+      systems = filter (system: !(isNull (builtins.match systemsSelector system))) nixpkgs.lib.systems.supported.hydra;
+      nixpkgsPackages = localSystem: (makeOverridable (import (nixpkgs.outPath + "/pkgs/top-level"))) { inherit localSystem; };
+      forAllSystems = f: mapAttrs f (genAttrs systems nixpkgsPackages);
       forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts)));
 
       activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations);
@@ -147,7 +149,7 @@
       overlayPaths = nixImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); };
 
       installerProfiles = system:
-        let nixpkgs-path = nixpkgs.legacyPackages.${system}.path;
+        let nixpkgs-path = nixpkgs.outPath;
         in mapAttrs (name: {path, output}: { profile = mkSystemProfile nixpkgs-path path "installer-${name}"; inherit output; })
           { cd-dvd = { path = "nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"; output = out: out.config.system.build.isoImage; };
             netboot = { path = "nixos/modules/installer/netboot/netboot-minimal.nix"; output = out: (self.legacyPackages.${system}.symlinkJoin { name = "netboot"; paths = with out.config.system.build; [ netbootRamdisk kernel netbootIpxeScript ]; preferLocalBuild = true; }); };
@@ -160,7 +162,7 @@
         in forAllSystems (system: _systemPkgs: optionalAttrs (!(isNull installerConfig)) (mkInstallers system));
       installerNixosConfigurations = listToAttrs (concatLists (mapAttrsToList (system: mapAttrsToList (profile: { config, ... }: nameValuePair ("installer-${system}-${profile}") config)) installers));
 
-      packages = forAllSystems (system: systemPkgs: composeManyExtensions (attrValues self.overlays) self.legacyPackages.${system} systemPkgs);
+      # packages = forAllSystems (system: systemPkgs: composeManyExtensions (attrValues self.overlays) self.legacyPackages.${system} systemPkgs);
 
       activateHomeManager = system: base: (deploy-rs.lib.${system}.activate.custom // { dryActivate = "DRY_RUN=1 $PROFILE/activate"; }) base.activationPackage "$PROFILE/activate";
     in
@@ -180,10 +182,10 @@
 
         overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths;
 
-        packages = mapAttrs (_name: filterAttrs (_name: isDerivation)) packages;
-        packages' = mapAttrs (_name: filterAttrs (_name: value: !(isDerivation value))) packages;
+        # packages = mapAttrs (_name: filterAttrs (_name: isDerivation)) packages;
+        # packages' = mapAttrs (_name: filterAttrs (_name: value: !(isDerivation value))) packages;
 
-        legacyPackages = forAllSystems (system: systemPkgs: recursiveUpdate systemPkgs packages.${system});
+        legacyPackages = forAllSystems (system: systemPkgs: systemPkgs.override { overlays = attrValues self.overlays; });
 
         apps = activateNixosConfigurations;
 
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index c808e123..6a38d9ce 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -36,9 +36,9 @@ in {
     networking.hostName = hostName;
     system.configurationRevision = lib.mkIf (flake ? rev) flake.rev;
 
-    nixpkgs.pkgs = import flake.legacyPackages.${config.nixpkgs.system}.path {
-      inherit (config.nixpkgs) system config;
-      overlays = lib.attrValues (lib.filterAttrs (n: _v: n != "default") flake.overlays);
+    nixpkgs.pkgs = flake.legacyPackages.${config.nixpkgs.system}.override {
+      inherit (config.nixpkgs) config;
+      localSystem = config.nixpkgs.system;
     };
 
     nix = {
@@ -52,11 +52,13 @@ in {
         experimental-features = nix-command flakes
       '';
       nixPath = [
-        "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}"
+        "nixpkgs=${flakeInputs.nixpkgs.outPath}"
         "nixpkgs-overlays=${pkgs.writeText "overlays.nix" ''
-          builtins.attrValues (import
+          with builtins;
+
+          attrValues (import
             (
-              let lock = builtins.fromJSON (builtins.readFile ${toString ../flake.lock}); in
+              let lock = fromJSON (readFile ${toString ../flake.lock}); in
               fetchTarball {
                 url = "https://github.com/edolstra/flake-compat/archive/''${lock.nodes.flake-compat.locked.rev}.tar.gz";
                 sha256 = lock.nodes.flake-compat.locked.narHash;