diff --git a/Droidnix/README.org b/Droidnix/README.org
index 7cf75997d..4088edba1 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -141,6 +141,9 @@ let
 
   allModules = hostModules.imports ++ globalUsers.imports;
 
+  # Merge all _module.args.hmUsers from each module
+    allHmUsers = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules;
+
 in
 {
   #################################
@@ -158,8 +161,6 @@ in
     [
       ./boot.nix
       ./hardware-configuration.nix
-
-      # REQUIRED for Home Manager
       home-manager.nixosModules.home-manager
     ]
     ++ allModules;
@@ -171,6 +172,9 @@ in
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
 
+  # Inject the merged hmUsers into Home Manager
+   _module.args.hmUsers = allHmUsers;
+
 # Install dconf for the system/user
  environment.systemPackages = [
    pkgs.dconf
diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix
index e88eaec47..ca1b8219d 100644
--- a/Droidnix/generated/hosts/traveldroid/host.nix
+++ b/Droidnix/generated/hosts/traveldroid/host.nix
@@ -11,6 +11,9 @@ let
 
   allModules = hostModules.imports ++ globalUsers.imports;
 
+  # Merge all _module.args.hmUsers from each module
+    allHmUsers = lib.foldl' (acc m: acc // (m._module.args.hmUsers or {})) {} allModules;
+
 in
 {
   #################################
@@ -28,8 +31,6 @@ in
     [
       ./boot.nix
       ./hardware-configuration.nix
-
-      # REQUIRED for Home Manager
       home-manager.nixosModules.home-manager
     ]
     ++ allModules;
@@ -41,6 +42,9 @@ in
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
 
+  # Inject the merged hmUsers into Home Manager
+   _module.args.hmUsers = allHmUsers;
+
 # Install dconf for the system/user
  environment.systemPackages = [
    pkgs.dconf