From 6273649dbd2402bdbe6a465ee5056408adc41924 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 23 Mar 2022 20:31:45 +0100 Subject: ... --- flake.nix | 4 ++-- system-profiles/core.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index c8c4c365..a218d2fe 100644 --- a/flake.nix +++ b/flake.nix @@ -166,9 +166,9 @@ homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; }) nixosConfig.config.home-manager.users) self.nixosConfigurations)); overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths; - overlays-path = forAllSystems (system: systemPkgs: toString (systemPkgs.writeText "overlays.nix" '' + overlays-path = forAllSystems (system: systemPkgs: systemPkgs.writeText "overlays.nix" '' map import (builtins.attrValues (builtins.fromJSON ${escapeNixString (toJSON overlayPaths)})) - '')); + ''); packages = mapAttrs (_name: filterAttrs (_name: isDerivation)) packages; packages' = mapAttrs (_name: filterAttrs (_name: value: !(isDerivation value))) packages; diff --git a/system-profiles/core.nix b/system-profiles/core.nix index 81cfa0e9..92e068b4 100644 --- a/system-profiles/core.nix +++ b/system-profiles/core.nix @@ -51,9 +51,9 @@ in { extraOptions = '' experimental-features = nix-command flakes ''; - nixPath = lib.mkForce [ + nixPath = [ "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}" - "nixpkgs-overlays=${flake.overlays-path.${config.nixpkgs.system}}" + # "nixpkgs-overlays=${flake.overlays-path.${config.nixpkgs.system}}" ]; registry = let override = { self = "nixos"; }; -- cgit v1.2.3