diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 9d5e55ecc..ea6996871 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -68,20 +68,20 @@
             # Generated configuration
             ./generated/top.nix
 
-            # Ensure Home Manager is enabled for the user
-            (
-              { config, pkgs, ... }:
-              {
-                programs.home-manager.enable = true;
-                systemd.users.services."home-manager-${user.username}" = {
-                  description = "Home Manager service for ${user.username}";
-                  wantedBy = [ "multi-user.target" ];
-                  serviceConfig.Type = "oneshot";
-                  serviceConfig.RemainAfterExit = true;
-                  serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}";
-                };
-              }
-            )
+            # Enable Home Manager for the user
+            {
+              home-manager.users.${user.username} = {
+                enable = true;
+                homeDirectory = "/home/${user.username}";
+              };
+              systemd.users.services."home-manager-${user.username}" = {
+                description = "Home Manager service for ${user.username}";
+                wantedBy = [ "multi-user.target" ];
+                serviceConfig.Type = "oneshot";
+                serviceConfig.RemainAfterExit = true;
+                serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}";
+              };
+            }
           ];
           specialArgs = {
             inherit user inputs;