From 5e6421293925721616c97151d6705cb7b2594af3 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 23 Mar 2022 20:23:52 +0100 Subject: ... --- flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index ef7b3674..c8c4c365 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,7 @@ 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.strings) escapeNixString; accountUserName = accountName: let @@ -165,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: _: self.legacyPackages.${system}.writeText "overlays.nix" '' - map import (builtins.attrValues (builtins.fromJSON ${self.legacyPackages.${system}.lib.strings.escapeNixString (toJSON overlayPaths)})) - ''); + overlays-path = forAllSystems (system: systemPkgs: toString (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; -- cgit v1.2.3