From 9bbbe634d289f66ce6a2c44de405c25e9e875cda Mon Sep 17 00:00:00 2001
From: paki23 <pk93@posteo.net>
Date: Fri, 27 Jan 2023 21:19:38 +0100
Subject: [PATCH] nixos: reload home conf of logged users

---
 nixos/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index b090c4815..110215f7f 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -19,6 +19,8 @@ let
     } // optionalAttrs cfg.verbose { VERBOSE = "1"; };
     serviceConfig = baseService username;
   };
+  # we use a service separated from nixos-activation
+  # to keep the logs separate
   hmDropIn = "/share/systemd/user/home-manager.service.d";
 
 in {
@@ -110,8 +112,6 @@ in {
     })
     (mkIf (cfg.users != { } && cfg.useUserService) {
       systemd.user.services.home-manager = (baseUnit "%u") // {
-        wantedBy = [ "default.target" ];
-
         # user units cannot depend on system units
         # TODO: Insert in the script logic for waiting on the nix socket via dbus
         # like https://github.com/mogorman/systemd-lock-handler
@@ -138,6 +138,14 @@ in {
           ];
         }) cfg.users;
       environment.pathsToLink = [ hmDropIn ];
+
+      # Without this will not reload home conf
+      # of logged user on system activation
+      # it will also start the unit on startup
+      system.userActivationScripts.home-manager = {
+        text = "${pkgs.systemd}/bin/systemctl --user restart home-manager";
+        deps = [ ];
+      };
     })
   ];
 }