From fc6cf6169868e60c189e4b243330c3717ff159f3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 26 May 2022 13:58:07 +0200
Subject: ...

---
 flake.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 4893cd19..1218ef31 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 fix filter makeOverridable;
+      inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists concatStringsSep fix filter makeOverridable foldr;
       inherit (lib.strings) escapeNixString;
 
       accountUserName = accountName: 
@@ -145,6 +145,7 @@
       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);
+      activateHomeManagerConfigurations = forAllSystems (system: _pkgs: listToAttrs (concatLists (mapAttrsToList (hostName: nixosConfig: mapAttrsToList (userName: userCfg: nameValuePair "${userName}@${hostName}-activate" { type = "app"; program = "${userCfg.home.activationPackage}/activate"; }) nixosConfig.config.home-manager.users) self.nixosConfigurations)));
 
       overlayPaths = nixImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); };
 
@@ -187,7 +188,7 @@
 
         legacyPackages = forAllSystems (system: systemPkgs: systemPkgs.override { overlays = attrValues self.overlays; });
 
-        apps = activateNixosConfigurations;
+        apps = foldr recursiveUpdate {} [activateNixosConfigurations activateHomeManagerConfigurations];
 
         devShells = forAllSystems (system: systemPkgs: { default = import ./shell.nix {
           pkgs = self.legacyPackages.${system};
-- 
cgit v1.2.3