diff --git a/config/.config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml
similarity index 100%
rename from config/.config/alacritty/alacritty.yml
rename to config/alacritty/alacritty.yml
diff --git a/config/.config/clangd/config.yaml b/config/clangd/config.yaml
similarity index 100%
rename from config/.config/clangd/config.yaml
rename to config/clangd/config.yaml
diff --git a/config/.config/nvim/.gitignore b/config/nvim/.gitignore
similarity index 100%
rename from config/.config/nvim/.gitignore
rename to config/nvim/.gitignore
diff --git a/config/.config/nvim/after/ftplugin/markdown.lua b/config/nvim/after/ftplugin/markdown.lua
similarity index 100%
rename from config/.config/nvim/after/ftplugin/markdown.lua
rename to config/nvim/after/ftplugin/markdown.lua
diff --git a/config/.config/nvim/after/ftplugin/qf.lua b/config/nvim/after/ftplugin/qf.lua
similarity index 100%
rename from config/.config/nvim/after/ftplugin/qf.lua
rename to config/nvim/after/ftplugin/qf.lua
diff --git a/config/.config/nvim/after/ftplugin/tex.lua b/config/nvim/after/ftplugin/tex.lua
similarity index 100%
rename from config/.config/nvim/after/ftplugin/tex.lua
rename to config/nvim/after/ftplugin/tex.lua
diff --git a/config/.config/nvim/init.lua b/config/nvim/init.lua
similarity index 100%
rename from config/.config/nvim/init.lua
rename to config/nvim/init.lua
diff --git a/config/.config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
similarity index 100%
rename from config/.config/nvim/lazy-lock.json
rename to config/nvim/lazy-lock.json
diff --git a/config/.config/nvim/lua/core/autocmd.lua b/config/nvim/lua/core/autocmd.lua
similarity index 100%
rename from config/.config/nvim/lua/core/autocmd.lua
rename to config/nvim/lua/core/autocmd.lua
diff --git a/config/.config/nvim/lua/core/icons.lua b/config/nvim/lua/core/icons.lua
similarity index 100%
rename from config/.config/nvim/lua/core/icons.lua
rename to config/nvim/lua/core/icons.lua
diff --git a/config/.config/nvim/lua/core/mapping.lua b/config/nvim/lua/core/mapping.lua
similarity index 100%
rename from config/.config/nvim/lua/core/mapping.lua
rename to config/nvim/lua/core/mapping.lua
diff --git a/config/.config/nvim/lua/core/plugins.lua b/config/nvim/lua/core/plugins.lua
similarity index 100%
rename from config/.config/nvim/lua/core/plugins.lua
rename to config/nvim/lua/core/plugins.lua
diff --git a/config/.config/nvim/lua/core/setting.lua b/config/nvim/lua/core/setting.lua
similarity index 100%
rename from config/.config/nvim/lua/core/setting.lua
rename to config/nvim/lua/core/setting.lua
diff --git a/config/.config/nvim/lua/core/utils.lua b/config/nvim/lua/core/utils.lua
similarity index 100%
rename from config/.config/nvim/lua/core/utils.lua
rename to config/nvim/lua/core/utils.lua
diff --git a/config/.config/nvim/lua/plugins/alpha.lua b/config/nvim/lua/plugins/alpha.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/alpha.lua
rename to config/nvim/lua/plugins/alpha.lua
diff --git a/config/.config/nvim/lua/plugins/autopairs.lua b/config/nvim/lua/plugins/autopairs.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/autopairs.lua
rename to config/nvim/lua/plugins/autopairs.lua
diff --git a/config/.config/nvim/lua/plugins/bufferline.lua b/config/nvim/lua/plugins/bufferline.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/bufferline.lua
rename to config/nvim/lua/plugins/bufferline.lua
diff --git a/config/.config/nvim/lua/plugins/catppuccin.lua b/config/nvim/lua/plugins/catppuccin.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/catppuccin.lua
rename to config/nvim/lua/plugins/catppuccin.lua
diff --git a/config/.config/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/cmp.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/cmp.lua
rename to config/nvim/lua/plugins/cmp.lua
diff --git a/config/.config/nvim/lua/plugins/colorizer.lua b/config/nvim/lua/plugins/colorizer.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/colorizer.lua
rename to config/nvim/lua/plugins/colorizer.lua
diff --git a/config/.config/nvim/lua/plugins/comment.lua b/config/nvim/lua/plugins/comment.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/comment.lua
rename to config/nvim/lua/plugins/comment.lua
diff --git a/config/.config/nvim/lua/plugins/git_worktree.lua b/config/nvim/lua/plugins/git_worktree.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/git_worktree.lua
rename to config/nvim/lua/plugins/git_worktree.lua
diff --git a/config/.config/nvim/lua/plugins/gitsigns.lua b/config/nvim/lua/plugins/gitsigns.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/gitsigns.lua
rename to config/nvim/lua/plugins/gitsigns.lua
diff --git a/config/.config/nvim/lua/plugins/heirline.lua b/config/nvim/lua/plugins/heirline.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/heirline.lua
rename to config/nvim/lua/plugins/heirline.lua
diff --git a/config/.config/nvim/lua/plugins/hop.lua b/config/nvim/lua/plugins/hop.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/hop.lua
rename to config/nvim/lua/plugins/hop.lua
diff --git a/config/.config/nvim/lua/plugins/illuminate.lua b/config/nvim/lua/plugins/illuminate.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/illuminate.lua
rename to config/nvim/lua/plugins/illuminate.lua
diff --git a/config/.config/nvim/lua/plugins/indentline.lua b/config/nvim/lua/plugins/indentline.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/indentline.lua
rename to config/nvim/lua/plugins/indentline.lua
diff --git a/config/.config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/init.lua
rename to config/nvim/lua/plugins/init.lua
diff --git a/config/.config/nvim/lua/plugins/lsp/init.lua b/config/nvim/lua/plugins/lsp/init.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/lsp/init.lua
rename to config/nvim/lua/plugins/lsp/init.lua
diff --git a/config/.config/nvim/lua/plugins/lsp/server/clangd.lua b/config/nvim/lua/plugins/lsp/server/clangd.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/lsp/server/clangd.lua
rename to config/nvim/lua/plugins/lsp/server/clangd.lua
diff --git a/config/.config/nvim/lua/plugins/lsp/server/emmet_ls.lua b/config/nvim/lua/plugins/lsp/server/emmet_ls.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/lsp/server/emmet_ls.lua
rename to config/nvim/lua/plugins/lsp/server/emmet_ls.lua
diff --git a/config/.config/nvim/lua/plugins/lsp/server/jsonls.lua b/config/nvim/lua/plugins/lsp/server/jsonls.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/lsp/server/jsonls.lua
rename to config/nvim/lua/plugins/lsp/server/jsonls.lua
diff --git a/config/.config/nvim/lua/plugins/lsp/server/lua_ls.lua b/config/nvim/lua/plugins/lsp/server/lua_ls.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/lsp/server/lua_ls.lua
rename to config/nvim/lua/plugins/lsp/server/lua_ls.lua
diff --git a/config/.config/nvim/lua/plugins/lsp/server/pyright.lua b/config/nvim/lua/plugins/lsp/server/pyright.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/lsp/server/pyright.lua
rename to config/nvim/lua/plugins/lsp/server/pyright.lua
diff --git a/config/.config/nvim/lua/plugins/lspsaga.lua b/config/nvim/lua/plugins/lspsaga.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/lspsaga.lua
rename to config/nvim/lua/plugins/lspsaga.lua
diff --git a/config/.config/nvim/lua/plugins/neogit.lua b/config/nvim/lua/plugins/neogit.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/neogit.lua
rename to config/nvim/lua/plugins/neogit.lua
diff --git a/config/.config/nvim/lua/plugins/noice.lua b/config/nvim/lua/plugins/noice.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/noice.lua
rename to config/nvim/lua/plugins/noice.lua
diff --git a/config/.config/nvim/lua/plugins/notify.lua b/config/nvim/lua/plugins/notify.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/notify.lua
rename to config/nvim/lua/plugins/notify.lua
diff --git a/config/.config/nvim/lua/plugins/nvimtree.lua b/config/nvim/lua/plugins/nvimtree.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/nvimtree.lua
rename to config/nvim/lua/plugins/nvimtree.lua
diff --git a/config/.config/nvim/lua/plugins/splits.lua b/config/nvim/lua/plugins/splits.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/splits.lua
rename to config/nvim/lua/plugins/splits.lua
diff --git a/config/.config/nvim/lua/plugins/statuscol.lua b/config/nvim/lua/plugins/statuscol.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/statuscol.lua
rename to config/nvim/lua/plugins/statuscol.lua
diff --git a/config/.config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/telescope.lua
rename to config/nvim/lua/plugins/telescope.lua
diff --git a/config/.config/nvim/lua/plugins/toggleterm.lua b/config/nvim/lua/plugins/toggleterm.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/toggleterm.lua
rename to config/nvim/lua/plugins/toggleterm.lua
diff --git a/config/.config/nvim/lua/plugins/tpipeline.lua b/config/nvim/lua/plugins/tpipeline.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/tpipeline.lua
rename to config/nvim/lua/plugins/tpipeline.lua
diff --git a/config/.config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/treesitter.lua
rename to config/nvim/lua/plugins/treesitter.lua
diff --git a/config/.config/nvim/lua/plugins/undotree.lua b/config/nvim/lua/plugins/undotree.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/undotree.lua
rename to config/nvim/lua/plugins/undotree.lua
diff --git a/config/.config/nvim/lua/plugins/vimtex.lua b/config/nvim/lua/plugins/vimtex.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/vimtex.lua
rename to config/nvim/lua/plugins/vimtex.lua
diff --git a/config/.config/nvim/lua/plugins/whichkey.lua b/config/nvim/lua/plugins/whichkey.lua
similarity index 100%
rename from config/.config/nvim/lua/plugins/whichkey.lua
rename to config/nvim/lua/plugins/whichkey.lua
diff --git a/config/.config/starship.toml b/config/starship/starship.toml
similarity index 100%
rename from config/.config/starship.toml
rename to config/starship/starship.toml
diff --git a/config/.tmux.conf b/config/tmux/tmux.conf
similarity index 100%
rename from config/.tmux.conf
rename to config/tmux/tmux.conf
diff --git a/config/.vimrc b/config/vim/.vimrc
similarity index 100%
rename from config/.vimrc
rename to config/vim/.vimrc
diff --git a/home/default.nix b/home/default.nix
index 613586c4..03352602 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -66,20 +66,19 @@ in
   xdg.enable = true;
 
   xdg.configFile = {
-    "nvim".source = link ".config/nvim";
-    "alacritty".source = link ".config/alacritty";
-    "starship.toml".source = link ".config/starship.toml";
+    "nvim".source = link "nvim";
+    "alacritty".source = link "alacritty";
+    "starship".source = link "starship";
     "home-manager".source = link "..";
     "zsh/.p10k.zsh".source = link "zsh/.p10k.zsh";
     "clangd/config.yaml".text = ''
-      ${lib.removeSuffix "\n" (builtins.readFile ../config/.config/clangd/config.yaml)}
+      ${lib.removeSuffix "\n" (builtins.readFile ../config/clangd/config.yaml)}
         Compiler: ${pkgs.gcc}/bin/g++
     '';
   };
 
   home.file = {
-    ".vimrc".source = link ".vimrc";
-    ".tmux.conf".source = link ".tmux.conf";
+    ".vimrc".source = link "vim/.vimrc";
   };
 
   nix = {
@@ -146,7 +145,7 @@ in
     plugins = with pkgs.tmuxPlugins; [
       {
         plugin = prefix-highlight;
-        extraConfig = "source-file ~/.tmux.conf";
+        extraConfig = "source-file ${dotfilesDir}/config/tmux/tmux.conf";
       }
       extrakto
       tmux-fzf