From 25838886153aac3477c22f04ddcc621ca3df9086 Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Mon, 25 Nov 2024 19:05:13 -0600 Subject: [PATCH] added darwinConfigurations to homeConfigurations outputs --- flake.nix | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 566102c..152ea63 100644 --- a/flake.nix +++ b/flake.nix @@ -75,9 +75,21 @@ } @ inputs: let util = import ./util {inherit inputs;}; forEachPkgs = util.forEachPkgs; + mkNixosSystem = util.mkNixosSystem; mkDarwinSystem = util.mkDarwinSystem; mkHome = util.mkHome; + + systemsHomes = nixpkgs.lib.attrsets.mergeAttrsList ( + nixpkgs.lib.attrsets.mapAttrsToList (hostname: system: ( + nixpkgs.lib.attrsets.mapAttrs' (user: _: { + name = "${user}@${hostname}"; + value = mkHome user hostname system.pkgs.hostPlatform.system system.config; + }) + system.config.home-manager.users + )) + (inputs.self.nixosConfigurations // inputs.self.darwinConfigurations) + ); in { formatter = forEachPkgs (pkgs: pkgs.alejandra); @@ -111,15 +123,11 @@ hesperium = mkDarwinSystem "hesperium"; }; - homeConfigurations = nixpkgs.lib.attrsets.mergeAttrsList ( - nixpkgs.lib.attrsets.mapAttrsToList (hostname: system: ( - nixpkgs.lib.attrsets.mapAttrs' (user: _: { - name = "${user}@${hostname}"; - value = mkHome user hostname system.pkgs.hostPlatform.system system.config; - }) - system.config.home-manager.users - )) - self.nixosConfigurations - ); + homeConfigurations = + systemsHomes + // { + # stand alone configurations here: + # name = mkHome "name" + }; }; }