diff --git a/containers/dev.nix b/containers/dev.nix
index a622cf07..9df54448 100644
--- a/containers/dev.nix
+++ b/containers/dev.nix
@@ -19,12 +19,12 @@ in
     config = { pkgs, ... }: {
       imports = [
         home-manager.nixosModules.home-manager
-        ../modules/neovim
         ../modules/fish-starship
       ];
 
       home-manager.sharedModules = [
         ../home/git
+        ../home/neovim
       ];
 
       users = {
diff --git a/home/default.nix b/home/default.nix
index cd80e508..162615dc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,13 +4,17 @@
     ./feh
     ./git
     ./gpg
+    ./joshuto
     ./kitty
     ./mime-apps
     ./mpv
     ./ncmpcpp
+    ./neovim
     ./qutebrowser
     ./rofi
     ./waybar
+    ./waycorner
+    ./xdg-user-dirs
     ./zathura
   ];
 }
diff --git a/modules/joshuto/default.nix b/home/joshuto/default.nix
similarity index 100%
rename from modules/joshuto/default.nix
rename to home/joshuto/default.nix
diff --git a/modules/joshuto/kitty-remove.sh b/home/joshuto/kitty-remove.sh
similarity index 100%
rename from modules/joshuto/kitty-remove.sh
rename to home/joshuto/kitty-remove.sh
diff --git a/modules/joshuto/kitty-show.sh b/home/joshuto/kitty-show.sh
similarity index 100%
rename from modules/joshuto/kitty-show.sh
rename to home/joshuto/kitty-show.sh
diff --git a/modules/joshuto/preview.sh b/home/joshuto/preview.sh
similarity index 100%
rename from modules/joshuto/preview.sh
rename to home/joshuto/preview.sh
diff --git a/modules/neovim/default.nix b/home/neovim/default.nix
similarity index 100%
rename from modules/neovim/default.nix
rename to home/neovim/default.nix
diff --git a/modules/waycorner/default.nix b/home/waycorner/default.nix
similarity index 100%
rename from modules/waycorner/default.nix
rename to home/waycorner/default.nix
diff --git a/modules/xdg-user-dirs/default.nix b/home/xdg-user-dirs/default.nix
similarity index 100%
rename from modules/xdg-user-dirs/default.nix
rename to home/xdg-user-dirs/default.nix
diff --git a/modules/default.nix b/modules/default.nix
index 78d0644c..d7459d5c 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,15 +5,11 @@
     ./fish-starship
     ./fonts
     ./hyprland
-    ./joshuto
     ./librewolf
-    ./neovim
     ./piper
     ./pipewire
     ./stylix
     ./swaylock
     ./thunar
-    ./waycorner
-    ./xdg-user-dirs
   ];
 }