diff --git a/hosts/darwin-fern/home.nix b/home/darwin/hosts/darwin-fern.nix
similarity index 100%
rename from hosts/darwin-fern/home.nix
rename to home/darwin/hosts/darwin-fern.nix
diff --git a/hosts/darwin-frieren/home.nix b/home/darwin/hosts/darwin-frieren.nix
similarity index 100%
rename from hosts/darwin-frieren/home.nix
rename to home/darwin/hosts/darwin-frieren.nix
diff --git a/home/darwin/hosts/default.nix b/home/darwin/hosts/default.nix
new file mode 100644
index 00000000..049dda93
--- /dev/null
+++ b/home/darwin/hosts/default.nix
@@ -0,0 +1,4 @@
+{ mylib, ... }:
+{
+  imports = mylib.scanPaths ./.;
+}
diff --git a/hosts/12kingdoms-shoukei/home.nix b/home/linux/hosts/12kingdoms-shoukei.nix
similarity index 100%
rename from hosts/12kingdoms-shoukei/home.nix
rename to home/linux/hosts/12kingdoms-shoukei.nix
diff --git a/hosts/idols-ai/home.nix b/home/linux/hosts/idols-ai.nix
similarity index 100%
rename from hosts/idols-ai/home.nix
rename to home/linux/hosts/idols-ai.nix
diff --git a/hosts/idols-ruby/home.nix b/home/linux/hosts/idols-aquamarine.nix
similarity index 100%
rename from hosts/idols-ruby/home.nix
rename to home/linux/hosts/idols-aquamarine.nix
diff --git a/home/linux/hosts/idols-kana.nix b/home/linux/hosts/idols-kana.nix
new file mode 100644
index 00000000..60fdac30
--- /dev/null
+++ b/home/linux/hosts/idols-kana.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./idols-aquamarine.nix ];
+}
diff --git a/home/linux/hosts/idols-ruby.nix b/home/linux/hosts/idols-ruby.nix
new file mode 100644
index 00000000..60fdac30
--- /dev/null
+++ b/home/linux/hosts/idols-ruby.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./idols-aquamarine.nix ];
+}
diff --git a/hosts/README.md b/hosts/README.md
index 5e0e67cb..aa6ddfcb 100644
--- a/hosts/README.md
+++ b/hosts/README.md
@@ -79,7 +79,8 @@ configurations follow similar patterns but are customized for specific hardware
    1. Create a new folder under `hosts/` with the name of the new host.
    2. Create & add the new host's `hardware-configuration.nix` to the new folder, and add the new
       host's `configuration.nix` to `hosts/<name>/default.nix`.
-   3. If the new host need to use home-manager, add its custom config into `hosts/<name>/home.nix`.
+   3. If the new host need to use home-manager, add its custom config into
+      `home/linux/hosts/<name>.nix` or `home/darwin/hosts/<name>.nix`.
 1. Under `outputs/`
    1. Add a new nix file named `outputs/<system-architecture>/src/<name>.nix`.
    2. Copy the content from one of the existing similar host, and modify it to fit the new host.
diff --git a/hosts/idols-kana/home.nix b/hosts/idols-kana/home.nix
deleted file mode 100644
index a3f29e6f..00000000
--- a/hosts/idols-kana/home.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  imports = [ ../idols-ruby/home.nix ];
-}
diff --git a/outputs/aarch64-darwin/src/fern.nix b/outputs/aarch64-darwin/src/fern.nix
index 2709d2be..8d2fcf33 100644
--- a/outputs/aarch64-darwin/src/fern.nix
+++ b/outputs/aarch64-darwin/src/fern.nix
@@ -29,7 +29,7 @@ let
       ];
 
     home-modules = map mylib.relativeToRoot [
-      "hosts/darwin-${name}/home.nix"
+      "home/darwin/hosts/darwin-${name}.nix"
       "home/darwin"
     ];
   };
diff --git a/outputs/aarch64-darwin/src/frieren.nix b/outputs/aarch64-darwin/src/frieren.nix
index 8ea0b8d6..c280df7b 100644
--- a/outputs/aarch64-darwin/src/frieren.nix
+++ b/outputs/aarch64-darwin/src/frieren.nix
@@ -28,7 +28,7 @@ let
         }
       ];
     home-modules = map mylib.relativeToRoot [
-      "hosts/darwin-${name}/home.nix"
+      "home/darwin/hosts/darwin-${name}.nix"
       "home/darwin"
     ];
   };
diff --git a/outputs/aarch64-linux/src/12kingdoms-shoukei.nix b/outputs/aarch64-linux/src/12kingdoms-shoukei.nix
index e175e3ea..c0fe14be 100644
--- a/outputs/aarch64-linux/src/12kingdoms-shoukei.nix
+++ b/outputs/aarch64-linux/src/12kingdoms-shoukei.nix
@@ -41,7 +41,7 @@ let
         # common
         "home/linux/gui.nix"
         # host specific
-        "hosts/12kingdoms-${name}/home.nix"
+        "home/linux/hosts/12kingdoms-${name}.nix"
       ])
       ++ [
         {
diff --git a/outputs/x86_64-linux/src/idols-ai.nix b/outputs/x86_64-linux/src/idols-ai.nix
index bb4a6db8..486dfc4a 100644
--- a/outputs/x86_64-linux/src/idols-ai.nix
+++ b/outputs/x86_64-linux/src/idols-ai.nix
@@ -41,7 +41,7 @@ let
         # common
         "home/linux/gui.nix"
         # host specific
-        "hosts/idols-${name}/home.nix"
+        "home/linux/hosts/idols-${name}.nix"
       ])
       ++ [
         {
diff --git a/outputs/x86_64-linux/src/idols-aquamarine.nix b/outputs/x86_64-linux/src/idols-aquamarine.nix
index 14e04443..03801a52 100644
--- a/outputs/x86_64-linux/src/idols-aquamarine.nix
+++ b/outputs/x86_64-linux/src/idols-aquamarine.nix
@@ -36,7 +36,7 @@ let
         { modules.secrets.server.storage.enable = true; }
       ];
     home-modules = map mylib.relativeToRoot [
-      "home/linux/tui.nix"
+      "home/linux/hosts/idols-${name}.nix"
     ];
   };
 
diff --git a/outputs/x86_64-linux/src/idols-kana.nix b/outputs/x86_64-linux/src/idols-kana.nix
index accb1da1..002860e7 100644
--- a/outputs/x86_64-linux/src/idols-kana.nix
+++ b/outputs/x86_64-linux/src/idols-kana.nix
@@ -33,7 +33,7 @@ let
       ];
     home-modules = map mylib.relativeToRoot [
       # host specific
-      "hosts/idols-${name}/home.nix"
+      "home/linux/hosts/idols-${name}.nix"
     ];
   };
 
diff --git a/outputs/x86_64-linux/src/idols-ruby.nix b/outputs/x86_64-linux/src/idols-ruby.nix
index 294c7877..3df5b2a4 100644
--- a/outputs/x86_64-linux/src/idols-ruby.nix
+++ b/outputs/x86_64-linux/src/idols-ruby.nix
@@ -33,7 +33,7 @@ let
       ];
     home-modules = map mylib.relativeToRoot [
       # host specific
-      "hosts/idols-${name}/home.nix"
+      "home/linux/hosts/idols-${name}.nix"
     ];
   };