diff --git a/home/ssh/config b/config/home/.ssh/config
similarity index 100%
rename from home/ssh/config
rename to config/home/.ssh/config
diff --git a/home/tmux/config/tmux.conf b/config/tmux/tmux.conf
similarity index 100%
rename from home/tmux/config/tmux.conf
rename to config/tmux/tmux.conf
diff --git a/home/default.nix b/home/default.nix
index 8ad03df..5391d75 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -7,14 +7,14 @@
 {
   imports = [
     ./email
-    ./emacs
+    ./emacs.nix
     ./git.nix
     ./gui.nix
     ./latex.nix
-    ./neovim
-    ./ssh
-    ./shell
-    ./tmux
+    ./neovim.nix
+    ./ssh.nix
+    ./shell.nix
+    ./tmux.nix
   ];
 
   config = {
diff --git a/home/emacs/default.nix b/home/emacs.nix
similarity index 100%
rename from home/emacs/default.nix
rename to home/emacs.nix
diff --git a/home/ghostty/default.nix b/home/ghostty.nix
similarity index 100%
rename from home/ghostty/default.nix
rename to home/ghostty.nix
diff --git a/home/git.nix b/home/git.nix
index e20ae1f..568e136 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   config,
   user,
diff --git a/home/gui.nix b/home/gui.nix
index e089ff3..4d4f8b9 100644
--- a/home/gui.nix
+++ b/home/gui.nix
@@ -3,8 +3,6 @@
   pkgs,
   config,
   inputs,
-  hm,
-  user,
   ...
 }:
 
@@ -12,7 +10,7 @@
   imports = [
     ./i3
     ./kitty.nix
-    ./ghostty
+    ./ghostty.nix
   ];
 
   options.custom.gui = with lib; {
diff --git a/home/latex.nix b/home/latex.nix
index 4937c4e..85b1f38 100644
--- a/home/latex.nix
+++ b/home/latex.nix
@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  inputs,
   lib,
   ...
 }:
diff --git a/home/neovim/default.nix b/home/neovim.nix
similarity index 100%
rename from home/neovim/default.nix
rename to home/neovim.nix
diff --git a/home/shell/default.nix b/home/shell.nix
similarity index 100%
rename from home/shell/default.nix
rename to home/shell.nix
diff --git a/home/ssh/default.nix b/home/ssh.nix
similarity index 55%
rename from home/ssh/default.nix
rename to home/ssh.nix
index d49ae04..ffd0ef3 100644
--- a/home/ssh/default.nix
+++ b/home/ssh.nix
@@ -13,5 +13,6 @@
     openssh
   ];
 
-  home.file.".ssh/config".source = config.lib.file.mkOutOfStoreSymlink "${dots}/home/ssh/config";
+  home.file.".ssh/config".source =
+    config.lib.file.mkOutOfStoreSymlink "${dots}/config/home/.ssh/config";
 }
diff --git a/home/tmux/default.nix b/home/tmux.nix
similarity index 94%
rename from home/tmux/default.nix
rename to home/tmux.nix
index ac20d9b..7d91486 100644
--- a/home/tmux/default.nix
+++ b/home/tmux.nix
@@ -28,6 +28,6 @@
       gitmux
     ];
 
-    xdg.configFile."tmux".source = config.lib.file.mkOutOfStoreSymlink "${dots}/home/tmux/config";
+    xdg.configFile."tmux".source = config.lib.file.mkOutOfStoreSymlink "${dots}/config/tmux";
   };
 }