diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix
index 6b45d84..99e96b0 100644
--- a/modules/nix-tools/user.nix
+++ b/modules/nix-tools/user.nix
@@ -3,7 +3,6 @@
 { self, ... }:
 {
   config.flake.factory.user = username: isAdmin: {
-
     nixos."${username}" = { lib, pkgs, ... }: {
       users.users."${username}" = {
         isNormalUser = true;
@@ -16,6 +15,8 @@
           "wheel"
         ];
       };
+
+      # Import the corresponding homeManager module for the given username
       home-manager.users."${username}" = {
         imports = [
           self.modules.homeManager."${username}"
@@ -25,6 +26,7 @@
 
     homeManager."${username}" = {
       home.username = "${username}";
+      home.homeDirectory = "/home/${username}";
     };
   };
 }
\ No newline at end of file
diff --git a/modules/users/john.nix b/modules/users/john.nix
index 03e31b2..32786a6 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -22,11 +22,6 @@ in
       {
         # https://github.com/Doc-Steve/dendritic-design-with-flake-parts/wiki/Dendritic_Aspects#multi-context-aspect
         nixos."${username}" = { pkgs, ... }: {
-          home-manager.users."${username}" = {
-            imports = [
-              inputs.self.modules.homeManager."${username}"
-            ];
-          };
           users.users."${username}" = {
             isNormalUser = true;
             openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
@@ -42,9 +37,7 @@ in
           programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
 
           imports = with inputs.self.modules.homeManager; [
-            # base
-            # docker
-            # resticprofile
+            base
           ];
         };
       }