diff --git a/home/nix-on-droid/common/modules/neovim/README.md b/home/common/modules/neovim/README.md
similarity index 100%
rename from home/nix-on-droid/common/modules/neovim/README.md
rename to home/common/modules/neovim/README.md
diff --git a/home/nix-on-droid/common/modules/neovim/astronvim_user/init.lua b/home/common/modules/neovim/astronvim_user/init.lua
similarity index 100%
rename from home/nix-on-droid/common/modules/neovim/astronvim_user/init.lua
rename to home/common/modules/neovim/astronvim_user/init.lua
diff --git a/home/nix-on-droid/common/modules/neovim/astronvim_user/mappings.lua b/home/common/modules/neovim/astronvim_user/mappings.lua
similarity index 100%
rename from home/nix-on-droid/common/modules/neovim/astronvim_user/mappings.lua
rename to home/common/modules/neovim/astronvim_user/mappings.lua
diff --git a/home/nix-on-droid/common/modules/neovim/default.nix b/home/common/modules/neovim/default.nix
similarity index 100%
rename from home/nix-on-droid/common/modules/neovim/default.nix
rename to home/common/modules/neovim/default.nix
diff --git a/home/common/modules/others.nix b/home/common/modules/others.nix
new file mode 100644
index 0000000..25340a3
--- /dev/null
+++ b/home/common/modules/others.nix
@@ -0,0 +1,8 @@
+{
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs; [
+    yutto
+  ];
+}
diff --git a/home/nix-on-droid/aarch64/mondrian_1/modules/default.nix b/home/nix-on-droid/aarch64/mondrian_1/modules/default.nix
index 18906b9..cda4f31 100644
--- a/home/nix-on-droid/aarch64/mondrian_1/modules/default.nix
+++ b/home/nix-on-droid/aarch64/mondrian_1/modules/default.nix
@@ -11,11 +11,14 @@
     ./dewm.nix
     ./browers.nix
     ./system-tools.nix
-    ./others.nix
     ./ENV_VAR.nix
+    ./others.nix
+    # nix-on-droid common
+    #../../../common/modules/virtualisation.nix
     ../../../common/modules/x11_catppuccin.nix
-    ../../../common/modules/neovim
-    #../../../../common/modules/nix.nix
     ../../../common/modules/nix.nix
+    # common
+    ../../../../common/modules/neovim
+    ../../../../common/modules/others.nix
   ];
 }
diff --git a/home/nix-on-droid/aarch64/mondrian_1/modules/others.nix b/home/nix-on-droid/aarch64/mondrian_1/modules/others.nix
index 4fd5ba3..869d834 100644
--- a/home/nix-on-droid/aarch64/mondrian_1/modules/others.nix
+++ b/home/nix-on-droid/aarch64/mondrian_1/modules/others.nix
@@ -3,6 +3,5 @@
   ...
 }: {
   home.packages = with pkgs; [
-  yutto
   ];
 }
diff --git a/home/nix-on-droid/aarch64/pstar_1/modules/default.nix b/home/nix-on-droid/aarch64/pstar_1/modules/default.nix
index c4d16fb..ed18d81 100644
--- a/home/nix-on-droid/aarch64/pstar_1/modules/default.nix
+++ b/home/nix-on-droid/aarch64/pstar_1/modules/default.nix
@@ -10,12 +10,15 @@
     ./menu.nix
     ./dewm.nix
     ./browers.nix
-    ./virtualisation.nix
     ./system-tools.nix
     ./ENV_VAR.nix
+    ./others.nix
+    # nix-on-droid common
+    ../../../common/modules/virtualisation.nix
     ../../../common/modules/x11_catppuccin.nix
-    ../../../common/modules/neovim
-    #../../../../common/modules/nix.nix
     ../../../common/modules/nix.nix
+    # common
+    ../../../../common/modules/neovim
+    ../../../../common/modules/others.nix
   ];
 }
diff --git a/home/nix-on-droid/aarch64/pstar_1/modules/others.nix b/home/nix-on-droid/aarch64/pstar_1/modules/others.nix
new file mode 100644
index 0000000..869d834
--- /dev/null
+++ b/home/nix-on-droid/aarch64/pstar_1/modules/others.nix
@@ -0,0 +1,7 @@
+{
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs; [
+  ];
+}
diff --git a/home/nix-on-droid/aarch64/pstar_1/modules/virtualisation.nix b/home/nix-on-droid/common/modules/virtualisation.nix
similarity index 67%
rename from home/nix-on-droid/aarch64/pstar_1/modules/virtualisation.nix
rename to home/nix-on-droid/common/modules/virtualisation.nix
index 4a197af..9585b4f 100644
--- a/home/nix-on-droid/aarch64/pstar_1/modules/virtualisation.nix
+++ b/home/nix-on-droid/common/modules/virtualisation.nix
@@ -3,10 +3,10 @@
   ...
 }: {
   home.packages = with pkgs; [
-  docker
-  podman
-  lxd
-  lxc
+    docker
+    podman
+    lxd
+    lxc
   ];
 
   programs = {