export homeConfigurations for all host-user pairs and drop hmActivati…

…onPackages

flake.nix

@@ -48,6 +48,8 @@
               inherit (pkgs) lib;
             });
 
+          homeConfigurations = os.mkHomeConfigurations { inherit self; };
+
           nixosModules =
             let moduleList = import ./modules/module-list.nix;
             in lib.pathsToImportedAttrs moduleList;
@@ -88,9 +90,6 @@
           devShell = import ./shell {
             inherit self system;
           };
-
-          legacyPackages.hmActivationPackages =
-            os.mkHomeActivation { inherit self; };
         }
       );
     in

lib/devos/default.nix

@@ -19,7 +19,7 @@
 
   devosSystem = dev.callLibs ./devosSystem.nix;
 
-  mkHomeActivation = dev.callLibs ./mkHomeActivation.nix;
+  mkHomeConfigurations = dev.callLibs ./mkHomeConfigurations.nix;
 
   mkPackages = dev.callLibs ./mkPackages.nix;
 }

lib/devos/devosSystem.nix

@@ -21,10 +21,19 @@ lib.nixosSystem (args // {
             })
           ];
         })).config;
+      hmConfig = (lib.nixosSystem
+        (args // {
+          modules = modules ++ [
+            ({ config, ... }: {
+              home-manager.useUserPackages = lib.mkForce false;
+            })
+          ];
+        })).config;
     in
     modules ++ [{
       system.build = {
         iso = isoConfig.system.build.isoImage;
+        homes = hmConfig.home-manager.users;
       };
     }];
 })

lib/devos/mkHomeConfigurations.nix

@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{ self }:
+with lib;
+let
+  mkHomes = host: homes:
+    mapAttrs' (n: v: nameValuePair "${host}-${n}" v) homes;
+
+  hmConfigs = mapAttrs
+    (host: config: mkHomes host config.config.system.build.homes)
+    self.nixosConfigurations;
+
+in
+foldl recursiveUpdate {} (attrValues hmConfigs)

shell/flk.sh

@@ -76,7 +76,7 @@ case "$1" in
     ;;
 
   "home")
-    ref="$DEVSHELL_ROOT/#hmActivationPackages.$2.$3"
+    ref="$DEVSHELL_ROOT/#homeConfigurations.$2-$3.home.activationPackage"
 
     if [[ "$4" == "switch" ]]; then
       nix build "$ref" && result/activate &&

users/README.md

@@ -42,7 +42,7 @@ flk home NixOS nixos switch
 ### Manually from outside the project:
 ```sh
 # build
-nix build "github:divnix/devos#hmActivationPackages.NixOS.nixos"
+nix build "github:divnix/devos#homeConfigurations.NixOS-nixos.home.activationPackage"
 
 # activate
 ./result/activate && unlink result