diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-03-23 20:31:45 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-03-23 20:31:45 +0100 |
commit | 6273649dbd2402bdbe6a465ee5056408adc41924 (patch) | |
tree | 2da1e8e5c1953a421171ecd368361e16a6b3b995 | |
parent | 5e6421293925721616c97151d6705cb7b2594af3 (diff) | |
download | nixos-6273649dbd2402bdbe6a465ee5056408adc41924.tar nixos-6273649dbd2402bdbe6a465ee5056408adc41924.tar.gz nixos-6273649dbd2402bdbe6a465ee5056408adc41924.tar.bz2 nixos-6273649dbd2402bdbe6a465ee5056408adc41924.tar.xz nixos-6273649dbd2402bdbe6a465ee5056408adc41924.zip |
...
-rw-r--r-- | flake.nix | 4 | ||||
-rw-r--r-- | system-profiles/core.nix | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -166,9 +166,9 @@ | |||
166 | homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; }) nixosConfig.config.home-manager.users) self.nixosConfigurations)); | 166 | homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; }) nixosConfig.config.home-manager.users) self.nixosConfigurations)); |
167 | 167 | ||
168 | overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths; | 168 | overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths; |
169 | overlays-path = forAllSystems (system: systemPkgs: toString (systemPkgs.writeText "overlays.nix" '' | 169 | overlays-path = forAllSystems (system: systemPkgs: systemPkgs.writeText "overlays.nix" '' |
170 | map import (builtins.attrValues (builtins.fromJSON ${escapeNixString (toJSON overlayPaths)})) | 170 | map import (builtins.attrValues (builtins.fromJSON ${escapeNixString (toJSON overlayPaths)})) |
171 | '')); | 171 | ''); |
172 | 172 | ||
173 | packages = mapAttrs (_name: filterAttrs (_name: isDerivation)) packages; | 173 | packages = mapAttrs (_name: filterAttrs (_name: isDerivation)) packages; |
174 | packages' = mapAttrs (_name: filterAttrs (_name: value: !(isDerivation value))) packages; | 174 | 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 { | |||
51 | extraOptions = '' | 51 | extraOptions = '' |
52 | experimental-features = nix-command flakes | 52 | experimental-features = nix-command flakes |
53 | ''; | 53 | ''; |
54 | nixPath = lib.mkForce [ | 54 | nixPath = [ |
55 | "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}" | 55 | "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}" |
56 | "nixpkgs-overlays=${flake.overlays-path.${config.nixpkgs.system}}" | 56 | # "nixpkgs-overlays=${flake.overlays-path.${config.nixpkgs.system}}" |
57 | ]; | 57 | ]; |
58 | registry = | 58 | registry = |
59 | let override = { self = "nixos"; }; | 59 | let override = { self = "nixos"; }; |