diff --git a/lib/macosSystem.nix b/lib/macosSystem.nix
index d40b2c77..fd553a79 100644
--- a/lib/macosSystem.nix
+++ b/lib/macosSystem.nix
@@ -1,7 +1,8 @@
 {
+  lib,
   inputs,
   darwin-modules,
-  home-module ? null,
+  home-modules ? [],
   myvars,
   system,
   genSpecialArgs,
@@ -25,14 +26,18 @@ in
           # discard all the default paths, and only use the one from this flake.
           nix.nixPath = lib.mkForce ["/etc/nix/inputs"];
         })
+      ]
+      ++ (
+        lib.optionals ((lib.lists.length home-modules) > 0)
+        [
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
 
-        home-manager.darwinModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-
-          home-manager.extraSpecialArgs = specialArgs;
-          home-manager.users."${myvars.username}" = home-module;
-        }
-      ];
+            home-manager.extraSpecialArgs = specialArgs;
+            home-manager.users."${myvars.username}".imports = home-modules;
+          }
+        ]
+      );
   }
diff --git a/lib/nixosSystem.nix b/lib/nixosSystem.nix
index a854c608..8f923cb5 100644
--- a/lib/nixosSystem.nix
+++ b/lib/nixosSystem.nix
@@ -4,7 +4,7 @@
   system,
   genSpecialArgs,
   nixos-modules,
-  home-module ? null,
+  home-modules ? [],
   myvars,
   ...
 }: let
@@ -26,7 +26,7 @@ in
         }
       ]
       ++ (
-        lib.optionals (home-module != null)
+        lib.optionals ((lib.lists.length home-modules) > 0)
         [
           home-manager.nixosModules.home-manager
           {
@@ -34,7 +34,7 @@ in
             home-manager.useUserPackages = true;
 
             home-manager.extraSpecialArgs = specialArgs;
-            home-manager.users."${myvars.username}" = home-module;
+            home-manager.users."${myvars.username}".imports = home-modules;
           }
         ]
       );
diff --git a/outputs/aarch64-darwin/src/fern.nix b/outputs/aarch64-darwin/src/fern.nix
index 452d8a31..d9cc8cf2 100644
--- a/outputs/aarch64-darwin/src/fern.nix
+++ b/outputs/aarch64-darwin/src/fern.nix
@@ -22,7 +22,7 @@
         "hosts/darwin-${name}"
       ])
       ++ [];
-    home-module.imports = map mylib.relativeToRoot [
+    home-modules = map mylib.relativeToRoot [
       "hosts/darwin-${name}/home.nix"
       "home/darwin"
     ];
diff --git a/outputs/x86_64-darwin/src/harnomica.nix b/outputs/x86_64-darwin/src/harnomica.nix
index 2ae441e8..551af524 100644
--- a/outputs/x86_64-darwin/src/harnomica.nix
+++ b/outputs/x86_64-darwin/src/harnomica.nix
@@ -23,7 +23,7 @@
       ])
       ++ [];
 
-    home-module.imports = map mylib.relativeToRoot [
+    home-modules = map mylib.relativeToRoot [
       "hosts/darwin-${name}/home.nix"
       "home/darwin"
     ];
diff --git a/outputs/x86_64-linux/src/12kingdoms-shoukei.nix b/outputs/x86_64-linux/src/12kingdoms-shoukei.nix
index 088fca97..1e792a4e 100644
--- a/outputs/x86_64-linux/src/12kingdoms-shoukei.nix
+++ b/outputs/x86_64-linux/src/12kingdoms-shoukei.nix
@@ -20,7 +20,7 @@
       # host specific
       "hosts/12kingdoms-${name}"
     ];
-    home-module.imports = map mylib.relativeToRoot [
+    home-modules = map mylib.relativeToRoot [
       # common
       "home/linux/desktop.nix"
       # host specific
@@ -38,11 +38,11 @@
         }
       ]
       ++ base-modules.nixos-modules;
-    home-module.imports =
+    home-modules =
       [
         {modules.desktop.i3.enable = true;}
       ]
-      ++ base-modules.home-module.imports;
+      ++ base-modules.home-modules;
   };
 
   modules-hyprland = {
@@ -55,11 +55,11 @@
         }
       ]
       ++ base-modules.nixos-modules;
-    home-module.imports =
+    home-modules =
       [
         {modules.desktop.hyprland.enable = true;}
       ]
-      ++ base-modules.home-module.imports;
+      ++ base-modules.home-modules;
   };
 in {
   nixosConfigurations = {
diff --git a/outputs/x86_64-linux/src/idols-ai.nix b/outputs/x86_64-linux/src/idols-ai.nix
index d617ad88..b4ad9c40 100644
--- a/outputs/x86_64-linux/src/idols-ai.nix
+++ b/outputs/x86_64-linux/src/idols-ai.nix
@@ -20,7 +20,7 @@
       # host specific
       "hosts/idols-${name}"
     ];
-    home-module.imports = map mylib.relativeToRoot [
+    home-modules = map mylib.relativeToRoot [
       # common
       "home/linux/desktop.nix"
       # host specific
@@ -38,11 +38,11 @@
         }
       ]
       ++ base-modules.nixos-modules;
-    home-module.imports =
+    home-modules =
       [
         {modules.desktop.i3.enable = true;}
       ]
-      ++ base-modules.home-module.imports;
+      ++ base-modules.home-modules;
   };
 
   modules-hyprland = {
@@ -55,11 +55,11 @@
         }
       ]
       ++ base-modules.nixos-modules;
-    home-module.imports =
+    home-modules =
       [
         {modules.desktop.hyprland.enable = true;}
       ]
-      ++ base-modules.home-module.imports;
+      ++ base-modules.home-modules;
   };
 in {
   nixosConfigurations = {
diff --git a/outputs/x86_64-linux/src/idols-ruby.nix b/outputs/x86_64-linux/src/idols-ruby.nix
index 5eb0d130..6e10a26a 100644
--- a/outputs/x86_64-linux/src/idols-ruby.nix
+++ b/outputs/x86_64-linux/src/idols-ruby.nix
@@ -28,7 +28,7 @@
       ++ [
         {modules.secrets.server.operation.enable = true;}
       ];
-    home-module.imports = map mylib.relativeToRoot [
+    home-modules = map mylib.relativeToRoot [
       "home/linux/server.nix"
     ];
   };
diff --git a/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix b/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
index 8fc5ed5c..dc364ad9 100644
--- a/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
+++ b/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
@@ -27,7 +27,7 @@
       ++ [
         {modules.secrets.server.kubernetes.enable = true;}
       ];
-    home-module.imports = map mylib.relativeToRoot [
+    home-modules = map mylib.relativeToRoot [
       "home/linux/server.nix"
     ];
   };