From ccc22d94f88fdff18dfb5758c1974148e32770db Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 3 Jan 2021 00:54:12 +0100
Subject: fix homeManagerModules & activation

---
 flake.nix              | 2 +-
 user-profiles/core.nix | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index a17c22fc..8faa9aa9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -107,7 +107,7 @@
       forAllSystems = f: mapAttrs f nixpkgs.legacyPackages;
       forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts)));
 
-      activateHomeManagerConfigurations = forAllSystems (system: _pkgs: mapAttrs' (configName: hmConfig: nameValuePair "${configName}-activate" { type = "app"; program = "${hmConfig.activationPackage}/bin/activate"; }) self.homeManagerConfigurations);
+      activateHomeManagerConfigurations = forAllSystems (system: _pkgs: mapAttrs' (configName: hmConfig: nameValuePair "${configName}-activate" { type = "app"; program = "${hmConfig.home.activationPackage}/activate"; }) self.homeManagerConfigurations);
       activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations);
 
       overlayPaths = recImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; };
diff --git a/user-profiles/core.nix b/user-profiles/core.nix
index 91685611..8611a0bd 100644
--- a/user-profiles/core.nix
+++ b/user-profiles/core.nix
@@ -1,8 +1,12 @@
-{ userName, ... }:
+{ flake, userName, lib, ... }:
 { 
   users.users.${userName} = {}; # Just make sure the user is created
 
   home-manager.users.${userName} = {
-    manual.manpages.enable = true;
+    imports = lib.attrValues flake.homeManagerModules;
+    
+    config = {
+      manual.manpages.enable = true;
+    };
   };
 }
-- 
cgit v1.2.3