diff --git a/non-nix/i3/.profile b/modules/home/i3/.profile
similarity index 100%
rename from non-nix/i3/.profile
rename to modules/home/i3/.profile
diff --git a/modules/home/i3/default.nix b/modules/home/i3/default.nix
index c682b9d..180f628 100644
--- a/modules/home/i3/default.nix
+++ b/modules/home/i3/default.nix
@@ -30,13 +30,12 @@ in {
 
     home.file = {
       ".config/i3" = {
-        source = ../../i3/i3;
-        recursive = true;
+        source = ./i3;
+        recursive = false;
       };
-      ".config/i3status-rust/config.toml".source =
-        ../../i3/i3status-rust/config.toml;
+      ".config/i3status-rust/config.toml".source = ./i3status-rust/config.toml;
     };
 
-    home.file = { ".profile".source = ../../i3/.profile; };
+    home.file = { ".profile".source = ./.profile; };
   };
 }
diff --git a/non-nix/i3/i3-scrot.conf b/modules/home/i3/i3-scrot.conf
similarity index 100%
rename from non-nix/i3/i3-scrot.conf
rename to modules/home/i3/i3-scrot.conf
diff --git a/non-nix/i3/i3/config b/modules/home/i3/i3/config
similarity index 100%
rename from non-nix/i3/i3/config
rename to modules/home/i3/i3/config
diff --git a/non-nix/i3/i3/manjaro-default-config b/modules/home/i3/i3/manjaro-default-config
similarity index 100%
rename from non-nix/i3/i3/manjaro-default-config
rename to modules/home/i3/i3/manjaro-default-config
diff --git a/non-nix/i3/i3/scripts/display-layoutpicker b/modules/home/i3/i3/scripts/display-layoutpicker
similarity index 100%
rename from non-nix/i3/i3/scripts/display-layoutpicker
rename to modules/home/i3/i3/scripts/display-layoutpicker
diff --git a/non-nix/i3/i3/scripts/display-toggle-mirror b/modules/home/i3/i3/scripts/display-toggle-mirror
similarity index 100%
rename from non-nix/i3/i3/scripts/display-toggle-mirror
rename to modules/home/i3/i3/scripts/display-toggle-mirror
diff --git a/non-nix/i3/i3/scripts/jupyter-calculator b/modules/home/i3/i3/scripts/jupyter-calculator
similarity index 100%
rename from non-nix/i3/i3/scripts/jupyter-calculator
rename to modules/home/i3/i3/scripts/jupyter-calculator
diff --git a/non-nix/i3/i3/scripts/mymatlab.sh b/modules/home/i3/i3/scripts/mymatlab.sh
similarity index 100%
rename from non-nix/i3/i3/scripts/mymatlab.sh
rename to modules/home/i3/i3/scripts/mymatlab.sh
diff --git a/non-nix/i3/i3/scripts/open-messaging b/modules/home/i3/i3/scripts/open-messaging
similarity index 100%
rename from non-nix/i3/i3/scripts/open-messaging
rename to modules/home/i3/i3/scripts/open-messaging
diff --git a/non-nix/i3/i3/scripts/pulse_popup b/modules/home/i3/i3/scripts/pulse_popup
similarity index 100%
rename from non-nix/i3/i3/scripts/pulse_popup
rename to modules/home/i3/i3/scripts/pulse_popup
diff --git a/non-nix/i3/i3/scripts/rofi_calc b/modules/home/i3/i3/scripts/rofi_calc
similarity index 100%
rename from non-nix/i3/i3/scripts/rofi_calc
rename to modules/home/i3/i3/scripts/rofi_calc
diff --git a/non-nix/i3/i3/scripts/setupZoom b/modules/home/i3/i3/scripts/setupZoom
similarity index 100%
rename from non-nix/i3/i3/scripts/setupZoom
rename to modules/home/i3/i3/scripts/setupZoom
diff --git a/non-nix/i3/i3/workspace-chat-schildi-tele-rocket.json b/modules/home/i3/i3/workspace-chat-schildi-tele-rocket.json
similarity index 100%
rename from non-nix/i3/i3/workspace-chat-schildi-tele-rocket.json
rename to modules/home/i3/i3/workspace-chat-schildi-tele-rocket.json
diff --git a/non-nix/i3/i3/workspace-chat-schildi-tele.json b/modules/home/i3/i3/workspace-chat-schildi-tele.json
similarity index 100%
rename from non-nix/i3/i3/workspace-chat-schildi-tele.json
rename to modules/home/i3/i3/workspace-chat-schildi-tele.json
diff --git a/non-nix/i3/i3/workspace-chat.json b/modules/home/i3/i3/workspace-chat.json
similarity index 100%
rename from non-nix/i3/i3/workspace-chat.json
rename to modules/home/i3/i3/workspace-chat.json
diff --git a/non-nix/i3/i3/workspace-zoom.json b/modules/home/i3/i3/workspace-zoom.json
similarity index 100%
rename from non-nix/i3/i3/workspace-zoom.json
rename to modules/home/i3/i3/workspace-zoom.json
diff --git a/non-nix/i3/i3status-rust/config.toml b/modules/home/i3/i3status-rust/config.toml
similarity index 100%
rename from non-nix/i3/i3status-rust/config.toml
rename to modules/home/i3/i3status-rust/config.toml