diff --git a/home/.config/bat/config b/bat/config
similarity index 100%
rename from home/.config/bat/config
rename to bat/config
diff --git a/home/.config/bat/themes/Catppuccin Macchiato.tmTheme b/bat/themes/Catppuccin Macchiato.tmTheme
similarity index 100%
rename from home/.config/bat/themes/Catppuccin Macchiato.tmTheme
rename to bat/themes/Catppuccin Macchiato.tmTheme
diff --git a/home/.config/bat/themes/ayu_mirage.tmTheme b/bat/themes/ayu_mirage.tmTheme
similarity index 100%
rename from home/.config/bat/themes/ayu_mirage.tmTheme
rename to bat/themes/ayu_mirage.tmTheme
diff --git a/home/.config/confutils/get-battery.sh b/confutils/get-battery.sh
similarity index 100%
rename from home/.config/confutils/get-battery.sh
rename to confutils/get-battery.sh
diff --git a/home/.config/ghostty/config b/ghostty/config
similarity index 100%
rename from home/.config/ghostty/config
rename to ghostty/config
diff --git a/home/.ideavimrc b/ideavim/.ideavimrc
similarity index 100%
rename from home/.ideavimrc
rename to ideavim/.ideavimrc
diff --git a/home/.config/neomutt/neomuttrc b/neomutt/neomuttrc
similarity index 100%
rename from home/.config/neomutt/neomuttrc
rename to neomutt/neomuttrc
diff --git a/nix/home.nix b/nix/home.nix
index 1f6aa00..47b143c 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -20,9 +20,18 @@
             fd
             jq
             starship
+            fastfetch
         ];
         file = {
             ".zshrc".source = ../zsh/.zshrc;
+            ".config/nvim".source = ../nvim;
+            ".config/yazi".source = ../yazi;
+            ".config/starship.toml".source = ../starship/starship.toml;
+            ".tmux.conf".source = ../tmux/.tmux.conf;
+            ".config/tmux".source = ../tmux;
+            ".config/bat".source = ../bat;
+            ".config/ghostty".source = ../ghostty;
+            ".config/confutils".source = ../confutils;
         };
     };
 }
diff --git a/home/.config/nvim/.luarc.json b/nvim/.luarc.json
similarity index 100%
rename from home/.config/nvim/.luarc.json
rename to nvim/.luarc.json
diff --git a/home/.config/nvim/init.lua b/nvim/init.lua
similarity index 100%
rename from home/.config/nvim/init.lua
rename to nvim/init.lua
diff --git a/home/.config/nvim/lazy-lock.json b/nvim/lazy-lock.json
similarity index 100%
rename from home/.config/nvim/lazy-lock.json
rename to nvim/lazy-lock.json
diff --git a/home/.config/nvim/lua/dap/adapters/codelldb.lua b/nvim/lua/dap/adapters/codelldb.lua
similarity index 100%
rename from home/.config/nvim/lua/dap/adapters/codelldb.lua
rename to nvim/lua/dap/adapters/codelldb.lua
diff --git a/home/.config/nvim/lua/dap/adapters/debugpy.lua b/nvim/lua/dap/adapters/debugpy.lua
similarity index 100%
rename from home/.config/nvim/lua/dap/adapters/debugpy.lua
rename to nvim/lua/dap/adapters/debugpy.lua
diff --git a/home/.config/nvim/lua/dap/setup.lua b/nvim/lua/dap/setup.lua
similarity index 100%
rename from home/.config/nvim/lua/dap/setup.lua
rename to nvim/lua/dap/setup.lua
diff --git a/home/.config/nvim/lua/format_handler.lua b/nvim/lua/format_handler.lua
similarity index 100%
rename from home/.config/nvim/lua/format_handler.lua
rename to nvim/lua/format_handler.lua
diff --git a/home/.config/nvim/lua/inlay_hints_handler.lua b/nvim/lua/inlay_hints_handler.lua
similarity index 100%
rename from home/.config/nvim/lua/inlay_hints_handler.lua
rename to nvim/lua/inlay_hints_handler.lua
diff --git a/home/.config/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua
similarity index 100%
rename from home/.config/nvim/lua/keymaps.lua
rename to nvim/lua/keymaps.lua
diff --git a/home/.config/nvim/lua/lazy_init.lua b/nvim/lua/lazy_init.lua
similarity index 100%
rename from home/.config/nvim/lua/lazy_init.lua
rename to nvim/lua/lazy_init.lua
diff --git a/home/.config/nvim/lua/lsp/servers/clangd.lua b/nvim/lua/lsp/servers/clangd.lua
similarity index 100%
rename from home/.config/nvim/lua/lsp/servers/clangd.lua
rename to nvim/lua/lsp/servers/clangd.lua
diff --git a/home/.config/nvim/lua/lsp/servers/cmake.lua b/nvim/lua/lsp/servers/cmake.lua
similarity index 100%
rename from home/.config/nvim/lua/lsp/servers/cmake.lua
rename to nvim/lua/lsp/servers/cmake.lua
diff --git a/home/.config/nvim/lua/lsp/servers/gopls.lua b/nvim/lua/lsp/servers/gopls.lua
similarity index 100%
rename from home/.config/nvim/lua/lsp/servers/gopls.lua
rename to nvim/lua/lsp/servers/gopls.lua
diff --git a/home/.config/nvim/lua/lsp/servers/lua_ls.lua b/nvim/lua/lsp/servers/lua_ls.lua
similarity index 100%
rename from home/.config/nvim/lua/lsp/servers/lua_ls.lua
rename to nvim/lua/lsp/servers/lua_ls.lua
diff --git a/home/.config/nvim/lua/lsp/servers/pyright.lua b/nvim/lua/lsp/servers/pyright.lua
similarity index 100%
rename from home/.config/nvim/lua/lsp/servers/pyright.lua
rename to nvim/lua/lsp/servers/pyright.lua
diff --git a/home/.config/nvim/lua/lsp/setup.lua b/nvim/lua/lsp/setup.lua
similarity index 100%
rename from home/.config/nvim/lua/lsp/setup.lua
rename to nvim/lua/lsp/setup.lua
diff --git a/home/.config/nvim/lua/lualine_extension_lspsaga.lua b/nvim/lua/lualine_extension_lspsaga.lua
similarity index 100%
rename from home/.config/nvim/lua/lualine_extension_lspsaga.lua
rename to nvim/lua/lualine_extension_lspsaga.lua
diff --git a/home/.config/nvim/lua/plugs/arrow.lua b/nvim/lua/plugs/arrow.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/arrow.lua
rename to nvim/lua/plugs/arrow.lua
diff --git a/home/.config/nvim/lua/plugs/auto_session.lua b/nvim/lua/plugs/auto_session.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/auto_session.lua
rename to nvim/lua/plugs/auto_session.lua
diff --git a/home/.config/nvim/lua/plugs/ayu.lua b/nvim/lua/plugs/ayu.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/ayu.lua
rename to nvim/lua/plugs/ayu.lua
diff --git a/home/.config/nvim/lua/plugs/blink.lua b/nvim/lua/plugs/blink.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/blink.lua
rename to nvim/lua/plugs/blink.lua
diff --git a/home/.config/nvim/lua/plugs/codecompanion.lua b/nvim/lua/plugs/codecompanion.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/codecompanion.lua
rename to nvim/lua/plugs/codecompanion.lua
diff --git a/home/.config/nvim/lua/plugs/codesnap.lua b/nvim/lua/plugs/codesnap.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/codesnap.lua
rename to nvim/lua/plugs/codesnap.lua
diff --git a/home/.config/nvim/lua/plugs/colorizer.lua b/nvim/lua/plugs/colorizer.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/colorizer.lua
rename to nvim/lua/plugs/colorizer.lua
diff --git a/home/.config/nvim/lua/plugs/copilot.lua b/nvim/lua/plugs/copilot.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/copilot.lua
rename to nvim/lua/plugs/copilot.lua
diff --git a/home/.config/nvim/lua/plugs/devicons.lua b/nvim/lua/plugs/devicons.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/devicons.lua
rename to nvim/lua/plugs/devicons.lua
diff --git a/home/.config/nvim/lua/plugs/fzf.lua b/nvim/lua/plugs/fzf.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/fzf.lua
rename to nvim/lua/plugs/fzf.lua
diff --git a/home/.config/nvim/lua/plugs/incline.lua b/nvim/lua/plugs/incline.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/incline.lua
rename to nvim/lua/plugs/incline.lua
diff --git a/home/.config/nvim/lua/plugs/indent_blankline.lua b/nvim/lua/plugs/indent_blankline.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/indent_blankline.lua
rename to nvim/lua/plugs/indent_blankline.lua
diff --git a/home/.config/nvim/lua/plugs/leap.lua b/nvim/lua/plugs/leap.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/leap.lua
rename to nvim/lua/plugs/leap.lua
diff --git a/home/.config/nvim/lua/plugs/lspsaga.lua b/nvim/lua/plugs/lspsaga.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/lspsaga.lua
rename to nvim/lua/plugs/lspsaga.lua
diff --git a/home/.config/nvim/lua/plugs/lualine.lua b/nvim/lua/plugs/lualine.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/lualine.lua
rename to nvim/lua/plugs/lualine.lua
diff --git a/home/.config/nvim/lua/plugs/mason.lua b/nvim/lua/plugs/mason.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/mason.lua
rename to nvim/lua/plugs/mason.lua
diff --git a/home/.config/nvim/lua/plugs/neogit.lua b/nvim/lua/plugs/neogit.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/neogit.lua
rename to nvim/lua/plugs/neogit.lua
diff --git a/home/.config/nvim/lua/plugs/neorg.lua b/nvim/lua/plugs/neorg.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/neorg.lua
rename to nvim/lua/plugs/neorg.lua
diff --git a/home/.config/nvim/lua/plugs/noice.lua b/nvim/lua/plugs/noice.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/noice.lua
rename to nvim/lua/plugs/noice.lua
diff --git a/home/.config/nvim/lua/plugs/nvim-dap.lua b/nvim/lua/plugs/nvim-dap.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/nvim-dap.lua
rename to nvim/lua/plugs/nvim-dap.lua
diff --git a/home/.config/nvim/lua/plugs/plenary.lua b/nvim/lua/plugs/plenary.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/plenary.lua
rename to nvim/lua/plugs/plenary.lua
diff --git a/home/.config/nvim/lua/plugs/rustaceanvim.lua b/nvim/lua/plugs/rustaceanvim.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/rustaceanvim.lua
rename to nvim/lua/plugs/rustaceanvim.lua
diff --git a/home/.config/nvim/lua/plugs/surround.lua b/nvim/lua/plugs/surround.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/surround.lua
rename to nvim/lua/plugs/surround.lua
diff --git a/home/.config/nvim/lua/plugs/tiny-inline-diagnostics.lua b/nvim/lua/plugs/tiny-inline-diagnostics.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/tiny-inline-diagnostics.lua
rename to nvim/lua/plugs/tiny-inline-diagnostics.lua
diff --git a/home/.config/nvim/lua/plugs/treesitter.lua b/nvim/lua/plugs/treesitter.lua
similarity index 100%
rename from home/.config/nvim/lua/plugs/treesitter.lua
rename to nvim/lua/plugs/treesitter.lua
diff --git a/home/.config/nvim/lua/terminal.lua b/nvim/lua/terminal.lua
similarity index 100%
rename from home/.config/nvim/lua/terminal.lua
rename to nvim/lua/terminal.lua
diff --git a/home/.config/nvim/lua/utils.lua b/nvim/lua/utils.lua
similarity index 100%
rename from home/.config/nvim/lua/utils.lua
rename to nvim/lua/utils.lua
diff --git a/home/.config/nvim/lua/vim_opt.lua b/nvim/lua/vim_opt.lua
similarity index 100%
rename from home/.config/nvim/lua/vim_opt.lua
rename to nvim/lua/vim_opt.lua
diff --git a/home/.config/nvim/lua/window_management.lua b/nvim/lua/window_management.lua
similarity index 100%
rename from home/.config/nvim/lua/window_management.lua
rename to nvim/lua/window_management.lua
diff --git a/home/.config/starship.toml b/starship/starship.toml
similarity index 100%
rename from home/.config/starship.toml
rename to starship/starship.toml
diff --git a/home/.tmux.conf b/tmux/.tmux.conf
similarity index 100%
rename from home/.tmux.conf
rename to tmux/.tmux.conf
diff --git a/home/.config/tmux/tmux-create-session.sh b/tmux/tmux-create-session.sh
similarity index 100%
rename from home/.config/tmux/tmux-create-session.sh
rename to tmux/tmux-create-session.sh
diff --git a/home/.config/tmux/tmux-fuzzy-find-session.sh b/tmux/tmux-fuzzy-find-session.sh
similarity index 100%
rename from home/.config/tmux/tmux-fuzzy-find-session.sh
rename to tmux/tmux-fuzzy-find-session.sh
diff --git a/home/.config/tmux/tmux-move-pane.sh b/tmux/tmux-move-pane.sh
similarity index 100%
rename from home/.config/tmux/tmux-move-pane.sh
rename to tmux/tmux-move-pane.sh
diff --git a/home/.config/tmux/tmux-rename-window.sh b/tmux/tmux-rename-window.sh
similarity index 100%
rename from home/.config/tmux/tmux-rename-window.sh
rename to tmux/tmux-rename-window.sh
diff --git a/home/.config/tmux/tmux-set-resize-mode.sh b/tmux/tmux-set-resize-mode.sh
similarity index 100%
rename from home/.config/tmux/tmux-set-resize-mode.sh
rename to tmux/tmux-set-resize-mode.sh
diff --git a/home/.config/tmux/tmux-status-right.sh b/tmux/tmux-status-right.sh
similarity index 100%
rename from home/.config/tmux/tmux-status-right.sh
rename to tmux/tmux-status-right.sh
diff --git a/home/.config/wallpapers/Clearday.jpg b/wallpapers/Clearday.jpg
similarity index 100%
rename from home/.config/wallpapers/Clearday.jpg
rename to wallpapers/Clearday.jpg
diff --git a/home/.config/wallpapers/Cloudsday.jpg b/wallpapers/Cloudsday.jpg
similarity index 100%
rename from home/.config/wallpapers/Cloudsday.jpg
rename to wallpapers/Cloudsday.jpg
diff --git a/home/.config/wallpapers/catppuccin/astronout.png b/wallpapers/catppuccin/astronout.png
similarity index 100%
rename from home/.config/wallpapers/catppuccin/astronout.png
rename to wallpapers/catppuccin/astronout.png
diff --git a/home/.config/wallpapers/catppuccin/cloudsnight.jpg b/wallpapers/catppuccin/cloudsnight.jpg
similarity index 100%
rename from home/.config/wallpapers/catppuccin/cloudsnight.jpg
rename to wallpapers/catppuccin/cloudsnight.jpg
diff --git a/home/.config/wallpapers/catppuccin/dino_landscape.jpg b/wallpapers/catppuccin/dino_landscape.jpg
similarity index 100%
rename from home/.config/wallpapers/catppuccin/dino_landscape.jpg
rename to wallpapers/catppuccin/dino_landscape.jpg
diff --git a/home/.config/wallpapers/catppuccin/home_water.jpeg b/wallpapers/catppuccin/home_water.jpeg
similarity index 100%
rename from home/.config/wallpapers/catppuccin/home_water.jpeg
rename to wallpapers/catppuccin/home_water.jpeg
diff --git a/home/.config/wallpapers/catppuccin/lonely-fish.png b/wallpapers/catppuccin/lonely-fish.png
similarity index 100%
rename from home/.config/wallpapers/catppuccin/lonely-fish.png
rename to wallpapers/catppuccin/lonely-fish.png
diff --git a/home/.config/wallpapers/catppuccin/samurai_water.webp b/wallpapers/catppuccin/samurai_water.webp
similarity index 100%
rename from home/.config/wallpapers/catppuccin/samurai_water.webp
rename to wallpapers/catppuccin/samurai_water.webp
diff --git a/home/.config/wallpapers/tokyonight/Rainnight.jpg b/wallpapers/tokyonight/Rainnight.jpg
similarity index 100%
rename from home/.config/wallpapers/tokyonight/Rainnight.jpg
rename to wallpapers/tokyonight/Rainnight.jpg
diff --git a/home/.config/yazi/yazi.toml b/yazi/yazi.toml
similarity index 100%
rename from home/.config/yazi/yazi.toml
rename to yazi/yazi.toml