diff --git a/aerc/accounts.conf b/.config/aerc/accounts.conf
similarity index 100%
rename from aerc/accounts.conf
rename to .config/aerc/accounts.conf
diff --git a/aerc/aerc.conf b/.config/aerc/aerc.conf
similarity index 100%
rename from aerc/aerc.conf
rename to .config/aerc/aerc.conf
diff --git a/aerc/binds.conf b/.config/aerc/binds.conf
similarity index 100%
rename from aerc/binds.conf
rename to .config/aerc/binds.conf
diff --git a/aerospace/aerospace.toml b/.config/aerospace/aerospace.toml
similarity index 100%
rename from aerospace/aerospace.toml
rename to .config/aerospace/aerospace.toml
diff --git a/bat/config b/.config/bat/config
similarity index 100%
rename from bat/config
rename to .config/bat/config
diff --git a/bluetui/config.toml b/.config/bluetui/config.toml
similarity index 100%
rename from bluetui/config.toml
rename to .config/bluetui/config.toml
diff --git a/chromium-flags.conf b/.config/chromium-flags.conf
similarity index 100%
rename from chromium-flags.conf
rename to .config/chromium-flags.conf
diff --git a/firefox/user.js b/.config/firefox/user.js
similarity index 100%
rename from firefox/user.js
rename to .config/firefox/user.js
diff --git a/firefox/userChrome.css b/.config/firefox/userChrome.css
similarity index 100%
rename from firefox/userChrome.css
rename to .config/firefox/userChrome.css
diff --git a/fish/aliases.fish b/.config/fish/aliases.fish
similarity index 100%
rename from fish/aliases.fish
rename to .config/fish/aliases.fish
diff --git a/fish/config.fish b/.config/fish/config.fish
similarity index 79%
rename from fish/config.fish
rename to .config/fish/config.fish
index 813d77ed..2dd9c7dc 100644
--- a/fish/config.fish
+++ b/.config/fish/config.fish
@@ -2,7 +2,6 @@ source $HOME/.env.fish
 
 # paths
 fish_add_path \
-    $DOTFILES/bin \
     $HOME/.cargo/bin \
     $HOME/.local/bin \
     ./node_modules/.bin \
@@ -10,9 +9,9 @@ fish_add_path \
     ~/.local/share/bob/nvim-bin \
     /opt/homebrew/opt/rustup/bin
 
-source $DOTFILES/fish/functions.fish
-source $DOTFILES/fish/aliases.fish
-source $DOTFILES/fish/variables.fish
+source $DOTFILES/.config/fish/functions.fish
+source $DOTFILES/.config/fish/aliases.fish
+source $DOTFILES/.config/fish/variables.fish
 
 set -l local_config ~/config.fish
 if test -r $local_config
@@ -41,9 +40,9 @@ if status is-interactive
     function __update_theme --on-event fish_prompt
         switch (ron-theme-get)
             case light
-                source $DOTFILES/fish/themes/nor-light.fish
+                source $DOTFILES/.config/fish/themes/nor-light.fish
             case '*'
-                source $DOTFILES/fish/themes/nor-dark.fish
+                source $DOTFILES/.config/fish/themes/nor-dark.fish
         end
     end
 
diff --git a/fish/functions.fish b/.config/fish/functions.fish
similarity index 100%
rename from fish/functions.fish
rename to .config/fish/functions.fish
diff --git a/fish/functions/fish_mode_prompt.fish b/.config/fish/functions/fish_mode_prompt.fish
similarity index 100%
rename from fish/functions/fish_mode_prompt.fish
rename to .config/fish/functions/fish_mode_prompt.fish
diff --git a/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish
similarity index 100%
rename from fish/functions/fish_prompt.fish
rename to .config/fish/functions/fish_prompt.fish
diff --git a/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish
similarity index 100%
rename from fish/functions/fish_user_key_bindings.fish
rename to .config/fish/functions/fish_user_key_bindings.fish
diff --git a/fish/functions/fisher.fish b/.config/fish/functions/fisher.fish
similarity index 100%
rename from fish/functions/fisher.fish
rename to .config/fish/functions/fisher.fish
diff --git a/fish/themes/modus_operandi.fish b/.config/fish/themes/modus_operandi.fish
similarity index 100%
rename from fish/themes/modus_operandi.fish
rename to .config/fish/themes/modus_operandi.fish
diff --git a/fish/themes/modus_vivendi.fish b/.config/fish/themes/modus_vivendi.fish
similarity index 100%
rename from fish/themes/modus_vivendi.fish
rename to .config/fish/themes/modus_vivendi.fish
diff --git a/fish/themes/nor-dark.fish b/.config/fish/themes/nor-dark.fish
similarity index 100%
rename from fish/themes/nor-dark.fish
rename to .config/fish/themes/nor-dark.fish
diff --git a/fish/themes/nor-light.fish b/.config/fish/themes/nor-light.fish
similarity index 100%
rename from fish/themes/nor-light.fish
rename to .config/fish/themes/nor-light.fish
diff --git a/fish/variables.fish b/.config/fish/variables.fish
similarity index 100%
rename from fish/variables.fish
rename to .config/fish/variables.fish
diff --git a/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
similarity index 100%
rename from fontconfig/fonts.conf
rename to .config/fontconfig/fonts.conf
diff --git a/fuzzel/fuzzel-pass.ini b/.config/fuzzel/fuzzel-pass.ini
similarity index 100%
rename from fuzzel/fuzzel-pass.ini
rename to .config/fuzzel/fuzzel-pass.ini
diff --git a/fuzzel/fuzzel.ini b/.config/fuzzel/fuzzel.ini
similarity index 100%
rename from fuzzel/fuzzel.ini
rename to .config/fuzzel/fuzzel.ini
diff --git a/ghostty/config.ghostty b/.config/ghostty/config.ghostty
similarity index 100%
rename from ghostty/config.ghostty
rename to .config/ghostty/config.ghostty
diff --git a/ghostty/theme_dark.ghostty b/.config/ghostty/theme_dark.ghostty
similarity index 100%
rename from ghostty/theme_dark.ghostty
rename to .config/ghostty/theme_dark.ghostty
diff --git a/ghostty/theme_light.ghostty b/.config/ghostty/theme_light.ghostty
similarity index 100%
rename from ghostty/theme_light.ghostty
rename to .config/ghostty/theme_light.ghostty
diff --git a/ghostty/themes/Nor Dark b/.config/ghostty/themes/Nor Dark
similarity index 100%
rename from ghostty/themes/Nor Dark
rename to .config/ghostty/themes/Nor Dark
diff --git a/ghostty/themes/Nor Light b/.config/ghostty/themes/Nor Light
similarity index 100%
rename from ghostty/themes/Nor Light
rename to .config/ghostty/themes/Nor Light
diff --git a/git/config b/.config/git/config
similarity index 100%
rename from git/config
rename to .config/git/config
diff --git a/git/ignore b/.config/git/ignore
similarity index 100%
rename from git/ignore
rename to .config/git/ignore
diff --git a/gopass/config b/.config/gopass/config
similarity index 100%
rename from gopass/config
rename to .config/gopass/config
diff --git a/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
similarity index 100%
rename from gtk-3.0/bookmarks
rename to .config/gtk-3.0/bookmarks
diff --git a/gtk-3.0/colors.css b/.config/gtk-3.0/colors.css
similarity index 100%
rename from gtk-3.0/colors.css
rename to .config/gtk-3.0/colors.css
diff --git a/gtk-3.0/gtk.css b/.config/gtk-3.0/gtk.css
similarity index 100%
rename from gtk-3.0/gtk.css
rename to .config/gtk-3.0/gtk.css
diff --git a/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
similarity index 100%
rename from gtk-3.0/settings.ini
rename to .config/gtk-3.0/settings.ini
diff --git a/gtk-4.0/colors.css b/.config/gtk-4.0/colors.css
similarity index 100%
rename from gtk-4.0/colors.css
rename to .config/gtk-4.0/colors.css
diff --git a/gtk-4.0/gtk.css b/.config/gtk-4.0/gtk.css
similarity index 100%
rename from gtk-4.0/gtk.css
rename to .config/gtk-4.0/gtk.css
diff --git a/gtk-4.0/settings.ini b/.config/gtk-4.0/settings.ini
similarity index 100%
rename from gtk-4.0/settings.ini
rename to .config/gtk-4.0/settings.ini
diff --git a/hellwal/templates/colors-mako b/.config/hellwal/templates/colors-mako
similarity index 100%
rename from hellwal/templates/colors-mako
rename to .config/hellwal/templates/colors-mako
diff --git a/hellwal/templates/colors-zathura b/.config/hellwal/templates/colors-zathura
similarity index 100%
rename from hellwal/templates/colors-zathura
rename to .config/hellwal/templates/colors-zathura
diff --git a/hellwal/templates/colors.fish b/.config/hellwal/templates/colors.fish
similarity index 100%
rename from hellwal/templates/colors.fish
rename to .config/hellwal/templates/colors.fish
diff --git a/hellwal/templates/colors.json b/.config/hellwal/templates/colors.json
similarity index 100%
rename from hellwal/templates/colors.json
rename to .config/hellwal/templates/colors.json
diff --git a/hellwal/templates/fuzzel.ini b/.config/hellwal/templates/fuzzel.ini
similarity index 100%
rename from hellwal/templates/fuzzel.ini
rename to .config/hellwal/templates/fuzzel.ini
diff --git a/hellwal/templates/gtk.css b/.config/hellwal/templates/gtk.css
similarity index 100%
rename from hellwal/templates/gtk.css
rename to .config/hellwal/templates/gtk.css
diff --git a/hellwal/templates/hyprland.conf b/.config/hellwal/templates/hyprland.conf
similarity index 100%
rename from hellwal/templates/hyprland.conf
rename to .config/hellwal/templates/hyprland.conf
diff --git a/hellwal/templates/niri.kdl b/.config/hellwal/templates/niri.kdl
similarity index 100%
rename from hellwal/templates/niri.kdl
rename to .config/hellwal/templates/niri.kdl
diff --git a/hellwal/templates/qt.conf b/.config/hellwal/templates/qt.conf
similarity index 100%
rename from hellwal/templates/qt.conf
rename to .config/hellwal/templates/qt.conf
diff --git a/hellwal/templates/qutebrowser.py b/.config/hellwal/templates/qutebrowser.py
similarity index 100%
rename from hellwal/templates/qutebrowser.py
rename to .config/hellwal/templates/qutebrowser.py
diff --git a/hellwal/templates/rofi.rasi b/.config/hellwal/templates/rofi.rasi
similarity index 100%
rename from hellwal/templates/rofi.rasi
rename to .config/hellwal/templates/rofi.rasi
diff --git a/hellwal/templates/waybar.css b/.config/hellwal/templates/waybar.css
similarity index 100%
rename from hellwal/templates/waybar.css
rename to .config/hellwal/templates/waybar.css
diff --git a/hypr/hypridle.conf b/.config/hypr/hypridle.conf
similarity index 100%
rename from hypr/hypridle.conf
rename to .config/hypr/hypridle.conf
diff --git a/hypr/hyprland.conf b/.config/hypr/hyprland.conf
similarity index 100%
rename from hypr/hyprland.conf
rename to .config/hypr/hyprland.conf
diff --git a/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
similarity index 100%
rename from hypr/hyprlock.conf
rename to .config/hypr/hyprlock.conf
diff --git a/hypr/hyprsunset.conf b/.config/hypr/hyprsunset.conf
similarity index 100%
rename from hypr/hyprsunset.conf
rename to .config/hypr/hyprsunset.conf
diff --git a/jj/config.toml b/.config/jj/config.toml
similarity index 100%
rename from jj/config.toml
rename to .config/jj/config.toml
diff --git a/kitty/kitty.conf b/.config/kitty/kitty.conf
similarity index 100%
rename from kitty/kitty.conf
rename to .config/kitty/kitty.conf
diff --git a/kitty/modus_operandi.conf b/.config/kitty/modus_operandi.conf
similarity index 100%
rename from kitty/modus_operandi.conf
rename to .config/kitty/modus_operandi.conf
diff --git a/kitty/modus_vivendi.conf b/.config/kitty/modus_vivendi.conf
similarity index 100%
rename from kitty/modus_vivendi.conf
rename to .config/kitty/modus_vivendi.conf
diff --git a/kitty/theme_dark.conf b/.config/kitty/theme_dark.conf
similarity index 100%
rename from kitty/theme_dark.conf
rename to .config/kitty/theme_dark.conf
diff --git a/kitty/theme_light.conf b/.config/kitty/theme_light.conf
similarity index 100%
rename from kitty/theme_light.conf
rename to .config/kitty/theme_light.conf
diff --git a/mako/base-config b/.config/mako/base-config
similarity index 100%
rename from mako/base-config
rename to .config/mako/base-config
diff --git a/mpv/mpv.conf b/.config/mpv/mpv.conf
similarity index 100%
rename from mpv/mpv.conf
rename to .config/mpv/mpv.conf
diff --git a/mpv/script-opts/autosubsync.conf b/.config/mpv/script-opts/autosubsync.conf
similarity index 100%
rename from mpv/script-opts/autosubsync.conf
rename to .config/mpv/script-opts/autosubsync.conf
diff --git a/mpv/scripts/autosub.lua b/.config/mpv/scripts/autosub.lua
similarity index 100%
rename from mpv/scripts/autosub.lua
rename to .config/mpv/scripts/autosub.lua
diff --git a/mpv/scripts/autosubsync/autosubsync.lua b/.config/mpv/scripts/autosubsync/autosubsync.lua
similarity index 100%
rename from mpv/scripts/autosubsync/autosubsync.lua
rename to .config/mpv/scripts/autosubsync/autosubsync.lua
diff --git a/mpv/scripts/autosubsync/helpers.lua b/.config/mpv/scripts/autosubsync/helpers.lua
similarity index 100%
rename from mpv/scripts/autosubsync/helpers.lua
rename to .config/mpv/scripts/autosubsync/helpers.lua
diff --git a/mpv/scripts/autosubsync/main.lua b/.config/mpv/scripts/autosubsync/main.lua
similarity index 100%
rename from mpv/scripts/autosubsync/main.lua
rename to .config/mpv/scripts/autosubsync/main.lua
diff --git a/mpv/scripts/autosubsync/menu.lua b/.config/mpv/scripts/autosubsync/menu.lua
similarity index 100%
rename from mpv/scripts/autosubsync/menu.lua
rename to .config/mpv/scripts/autosubsync/menu.lua
diff --git a/mpv/scripts/autosubsync/subtitle.lua b/.config/mpv/scripts/autosubsync/subtitle.lua
similarity index 100%
rename from mpv/scripts/autosubsync/subtitle.lua
rename to .config/mpv/scripts/autosubsync/subtitle.lua
diff --git a/niri/config.kdl b/.config/niri/config.kdl
similarity index 100%
rename from niri/config.kdl
rename to .config/niri/config.kdl
diff --git a/nvim/after/ftplugin/just.lua b/.config/nvim/after/ftplugin/just.lua
similarity index 100%
rename from nvim/after/ftplugin/just.lua
rename to .config/nvim/after/ftplugin/just.lua
diff --git a/nvim/after/ftplugin/markdown.lua b/.config/nvim/after/ftplugin/markdown.lua
similarity index 100%
rename from nvim/after/ftplugin/markdown.lua
rename to .config/nvim/after/ftplugin/markdown.lua
diff --git a/nvim/after/ftplugin/qf.lua b/.config/nvim/after/ftplugin/qf.lua
similarity index 100%
rename from nvim/after/ftplugin/qf.lua
rename to .config/nvim/after/ftplugin/qf.lua
diff --git a/nvim/after/ftplugin/ron.lua b/.config/nvim/after/ftplugin/ron.lua
similarity index 100%
rename from nvim/after/ftplugin/ron.lua
rename to .config/nvim/after/ftplugin/ron.lua
diff --git a/nvim/after/ftplugin/rust.lua b/.config/nvim/after/ftplugin/rust.lua
similarity index 100%
rename from nvim/after/ftplugin/rust.lua
rename to .config/nvim/after/ftplugin/rust.lua
diff --git a/nvim/after/ftplugin/typst.lua b/.config/nvim/after/ftplugin/typst.lua
similarity index 100%
rename from nvim/after/ftplugin/typst.lua
rename to .config/nvim/after/ftplugin/typst.lua
diff --git a/nvim/after/lsp/basedpyright.lua b/.config/nvim/after/lsp/basedpyright.lua
similarity index 100%
rename from nvim/after/lsp/basedpyright.lua
rename to .config/nvim/after/lsp/basedpyright.lua
diff --git a/nvim/after/lsp/cssls.lua b/.config/nvim/after/lsp/cssls.lua
similarity index 100%
rename from nvim/after/lsp/cssls.lua
rename to .config/nvim/after/lsp/cssls.lua
diff --git a/nvim/after/lsp/emmylua_ls.lua b/.config/nvim/after/lsp/emmylua_ls.lua
similarity index 100%
rename from nvim/after/lsp/emmylua_ls.lua
rename to .config/nvim/after/lsp/emmylua_ls.lua
diff --git a/nvim/after/lsp/gopls.lua b/.config/nvim/after/lsp/gopls.lua
similarity index 100%
rename from nvim/after/lsp/gopls.lua
rename to .config/nvim/after/lsp/gopls.lua
diff --git a/nvim/after/lsp/jsonls.lua b/.config/nvim/after/lsp/jsonls.lua
similarity index 100%
rename from nvim/after/lsp/jsonls.lua
rename to .config/nvim/after/lsp/jsonls.lua
diff --git a/nvim/after/lsp/lua_ls.lua b/.config/nvim/after/lsp/lua_ls.lua
similarity index 100%
rename from nvim/after/lsp/lua_ls.lua
rename to .config/nvim/after/lsp/lua_ls.lua
diff --git a/nvim/after/lsp/rust_analyzer.lua b/.config/nvim/after/lsp/rust_analyzer.lua
similarity index 100%
rename from nvim/after/lsp/rust_analyzer.lua
rename to .config/nvim/after/lsp/rust_analyzer.lua
diff --git a/nvim/after/lsp/tailwindcss.lua b/.config/nvim/after/lsp/tailwindcss.lua
similarity index 100%
rename from nvim/after/lsp/tailwindcss.lua
rename to .config/nvim/after/lsp/tailwindcss.lua
diff --git a/nvim/after/lsp/yamlls.lua b/.config/nvim/after/lsp/yamlls.lua
similarity index 100%
rename from nvim/after/lsp/yamlls.lua
rename to .config/nvim/after/lsp/yamlls.lua
diff --git a/nvim/after/plugin/init.lua b/.config/nvim/after/plugin/init.lua
similarity index 100%
rename from nvim/after/plugin/init.lua
rename to .config/nvim/after/plugin/init.lua
diff --git a/nvim/after/queries/markdown/highlights.scm b/.config/nvim/after/queries/markdown/highlights.scm
similarity index 100%
rename from nvim/after/queries/markdown/highlights.scm
rename to .config/nvim/after/queries/markdown/highlights.scm
diff --git a/nvim/after/queries/markdown/injections.scm b/.config/nvim/after/queries/markdown/injections.scm
similarity index 100%
rename from nvim/after/queries/markdown/injections.scm
rename to .config/nvim/after/queries/markdown/injections.scm
diff --git a/nvim/init.lua b/.config/nvim/init.lua
similarity index 100%
rename from nvim/init.lua
rename to .config/nvim/init.lua
diff --git a/nvim/lua/augroup.lua b/.config/nvim/lua/augroup.lua
similarity index 100%
rename from nvim/lua/augroup.lua
rename to .config/nvim/lua/augroup.lua
diff --git a/nvim/lua/config/autocmd.lua b/.config/nvim/lua/config/autocmd.lua
similarity index 100%
rename from nvim/lua/config/autocmd.lua
rename to .config/nvim/lua/config/autocmd.lua
diff --git a/nvim/lua/config/init.lua b/.config/nvim/lua/config/init.lua
similarity index 100%
rename from nvim/lua/config/init.lua
rename to .config/nvim/lua/config/init.lua
diff --git a/nvim/lua/config/opts.lua b/.config/nvim/lua/config/opts.lua
similarity index 100%
rename from nvim/lua/config/opts.lua
rename to .config/nvim/lua/config/opts.lua
diff --git a/nvim/lua/config/remap.lua b/.config/nvim/lua/config/remap.lua
similarity index 100%
rename from nvim/lua/config/remap.lua
rename to .config/nvim/lua/config/remap.lua
diff --git a/nvim/lua/extensions.lua b/.config/nvim/lua/extensions.lua
similarity index 100%
rename from nvim/lua/extensions.lua
rename to .config/nvim/lua/extensions.lua
diff --git a/nvim/lua/kafka.lua b/.config/nvim/lua/kafka.lua
similarity index 100%
rename from nvim/lua/kafka.lua
rename to .config/nvim/lua/kafka.lua
diff --git a/nvim/lua/pass.lua b/.config/nvim/lua/pass.lua
similarity index 100%
rename from nvim/lua/pass.lua
rename to .config/nvim/lua/pass.lua
diff --git a/nvim/lua/plugins/ai.lua b/.config/nvim/lua/plugins/ai.lua
similarity index 100%
rename from nvim/lua/plugins/ai.lua
rename to .config/nvim/lua/plugins/ai.lua
diff --git a/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
similarity index 100%
rename from nvim/lua/plugins/cmp.lua
rename to .config/nvim/lua/plugins/cmp.lua
diff --git a/nvim/lua/plugins/comment.lua b/.config/nvim/lua/plugins/comment.lua
similarity index 100%
rename from nvim/lua/plugins/comment.lua
rename to .config/nvim/lua/plugins/comment.lua
diff --git a/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua
similarity index 100%
rename from nvim/lua/plugins/dap.lua
rename to .config/nvim/lua/plugins/dap.lua
diff --git a/nvim/lua/plugins/db.lua b/.config/nvim/lua/plugins/db.lua
similarity index 100%
rename from nvim/lua/plugins/db.lua
rename to .config/nvim/lua/plugins/db.lua
diff --git a/nvim/lua/plugins/explorer.lua b/.config/nvim/lua/plugins/explorer.lua
similarity index 99%
rename from nvim/lua/plugins/explorer.lua
rename to .config/nvim/lua/plugins/explorer.lua
index f25a8bdb..f7111de4 100644
--- a/nvim/lua/plugins/explorer.lua
+++ b/.config/nvim/lua/plugins/explorer.lua
@@ -17,7 +17,7 @@ oil.setup({
   default_file_explorer = true,
   watch_for_changes = true,
   view_options = {
-    show_hidden = false,
+    show_hidden = true,
     is_always_hidden = function(name, _) return name == "." or name == ".." end,
   },
   win_options = {
diff --git a/nvim/lua/plugins/format.lua b/.config/nvim/lua/plugins/format.lua
similarity index 100%
rename from nvim/lua/plugins/format.lua
rename to .config/nvim/lua/plugins/format.lua
diff --git a/nvim/lua/plugins/fyler.lua b/.config/nvim/lua/plugins/fyler.lua
similarity index 100%
rename from nvim/lua/plugins/fyler.lua
rename to .config/nvim/lua/plugins/fyler.lua
diff --git a/nvim/lua/plugins/heirline.lua b/.config/nvim/lua/plugins/heirline.lua
similarity index 100%
rename from nvim/lua/plugins/heirline.lua
rename to .config/nvim/lua/plugins/heirline.lua
diff --git a/nvim/lua/plugins/heirline/statusline.lua b/.config/nvim/lua/plugins/heirline/statusline.lua
similarity index 100%
rename from nvim/lua/plugins/heirline/statusline.lua
rename to .config/nvim/lua/plugins/heirline/statusline.lua
diff --git a/nvim/lua/plugins/lint.lua b/.config/nvim/lua/plugins/lint.lua
similarity index 100%
rename from nvim/lua/plugins/lint.lua
rename to .config/nvim/lua/plugins/lint.lua
diff --git a/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
similarity index 100%
rename from nvim/lua/plugins/lsp.lua
rename to .config/nvim/lua/plugins/lsp.lua
diff --git a/nvim/lua/plugins/matchup.lua b/.config/nvim/lua/plugins/matchup.lua
similarity index 100%
rename from nvim/lua/plugins/matchup.lua
rename to .config/nvim/lua/plugins/matchup.lua
diff --git a/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua
similarity index 100%
rename from nvim/lua/plugins/mini.lua
rename to .config/nvim/lua/plugins/mini.lua
diff --git a/nvim/lua/plugins/multicursor.lua b/.config/nvim/lua/plugins/multicursor.lua
similarity index 100%
rename from nvim/lua/plugins/multicursor.lua
rename to .config/nvim/lua/plugins/multicursor.lua
diff --git a/nvim/lua/plugins/multinput.lua b/.config/nvim/lua/plugins/multinput.lua
similarity index 100%
rename from nvim/lua/plugins/multinput.lua
rename to .config/nvim/lua/plugins/multinput.lua
diff --git a/nvim/lua/plugins/quickfix.lua b/.config/nvim/lua/plugins/quickfix.lua
similarity index 100%
rename from nvim/lua/plugins/quickfix.lua
rename to .config/nvim/lua/plugins/quickfix.lua
diff --git a/nvim/lua/plugins/smart_splits.lua b/.config/nvim/lua/plugins/smart_splits.lua
similarity index 100%
rename from nvim/lua/plugins/smart_splits.lua
rename to .config/nvim/lua/plugins/smart_splits.lua
diff --git a/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua
similarity index 100%
rename from nvim/lua/plugins/snacks.lua
rename to .config/nvim/lua/plugins/snacks.lua
diff --git a/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from nvim/lua/plugins/treesitter.lua
rename to .config/nvim/lua/plugins/treesitter.lua
diff --git a/nvim/lua/plugins/treesitter_textobjects.lua b/.config/nvim/lua/plugins/treesitter_textobjects.lua
similarity index 100%
rename from nvim/lua/plugins/treesitter_textobjects.lua
rename to .config/nvim/lua/plugins/treesitter_textobjects.lua
diff --git a/nvim/lua/plugins/typst.lua b/.config/nvim/lua/plugins/typst.lua
similarity index 100%
rename from nvim/lua/plugins/typst.lua
rename to .config/nvim/lua/plugins/typst.lua
diff --git a/nvim/lua/plugins/undotree.lua b/.config/nvim/lua/plugins/undotree.lua
similarity index 100%
rename from nvim/lua/plugins/undotree.lua
rename to .config/nvim/lua/plugins/undotree.lua
diff --git a/nvim/lua/plugins/vcs/diff.lua b/.config/nvim/lua/plugins/vcs/diff.lua
similarity index 100%
rename from nvim/lua/plugins/vcs/diff.lua
rename to .config/nvim/lua/plugins/vcs/diff.lua
diff --git a/nvim/lua/plugins/vcs/gitlinker.lua b/.config/nvim/lua/plugins/vcs/gitlinker.lua
similarity index 100%
rename from nvim/lua/plugins/vcs/gitlinker.lua
rename to .config/nvim/lua/plugins/vcs/gitlinker.lua
diff --git a/nvim/lua/plugins/vcs/hunk.lua b/.config/nvim/lua/plugins/vcs/hunk.lua
similarity index 100%
rename from nvim/lua/plugins/vcs/hunk.lua
rename to .config/nvim/lua/plugins/vcs/hunk.lua
diff --git a/nvim/lua/plugins/vcs/init.lua b/.config/nvim/lua/plugins/vcs/init.lua
similarity index 100%
rename from nvim/lua/plugins/vcs/init.lua
rename to .config/nvim/lua/plugins/vcs/init.lua
diff --git a/nvim/lua/plugins/vcs/jj.lua b/.config/nvim/lua/plugins/vcs/jj.lua
similarity index 100%
rename from nvim/lua/plugins/vcs/jj.lua
rename to .config/nvim/lua/plugins/vcs/jj.lua
diff --git a/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua
similarity index 100%
rename from nvim/lua/theme.lua
rename to .config/nvim/lua/theme.lua
diff --git a/nvim/lua/utils.lua b/.config/nvim/lua/utils.lua
similarity index 100%
rename from nvim/lua/utils.lua
rename to .config/nvim/lua/utils.lua
diff --git a/nvim/lua/utils/pack.lua b/.config/nvim/lua/utils/pack.lua
similarity index 100%
rename from nvim/lua/utils/pack.lua
rename to .config/nvim/lua/utils/pack.lua
diff --git a/nvim/lua/utils/uri.lua b/.config/nvim/lua/utils/uri.lua
similarity index 100%
rename from nvim/lua/utils/uri.lua
rename to .config/nvim/lua/utils/uri.lua
diff --git a/nvim/lua/watch.lua b/.config/nvim/lua/watch.lua
similarity index 100%
rename from nvim/lua/watch.lua
rename to .config/nvim/lua/watch.lua
diff --git a/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
similarity index 100%
rename from nvim/nvim-pack-lock.json
rename to .config/nvim/nvim-pack-lock.json
diff --git a/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
similarity index 100%
rename from nvim/spell/en.utf-8.add
rename to .config/nvim/spell/en.utf-8.add
diff --git a/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl
similarity index 100%
rename from nvim/spell/en.utf-8.add.spl
rename to .config/nvim/spell/en.utf-8.add.spl
diff --git a/opencode/AGENTS.md b/.config/opencode/AGENTS.md
similarity index 100%
rename from opencode/AGENTS.md
rename to .config/opencode/AGENTS.md
diff --git a/opencode/opencode.json b/.config/opencode/opencode.json
similarity index 100%
rename from opencode/opencode.json
rename to .config/opencode/opencode.json
diff --git a/opencode/skills/caveman-commit/SKILL.md b/.config/opencode/skills/caveman-commit/SKILL.md
similarity index 100%
rename from opencode/skills/caveman-commit/SKILL.md
rename to .config/opencode/skills/caveman-commit/SKILL.md
diff --git a/opencode/skills/caveman-compress/README.md b/.config/opencode/skills/caveman-compress/README.md
similarity index 100%
rename from opencode/skills/caveman-compress/README.md
rename to .config/opencode/skills/caveman-compress/README.md
diff --git a/opencode/skills/caveman-compress/SECURITY.md b/.config/opencode/skills/caveman-compress/SECURITY.md
similarity index 100%
rename from opencode/skills/caveman-compress/SECURITY.md
rename to .config/opencode/skills/caveman-compress/SECURITY.md
diff --git a/opencode/skills/caveman-compress/SKILL.md b/.config/opencode/skills/caveman-compress/SKILL.md
similarity index 100%
rename from opencode/skills/caveman-compress/SKILL.md
rename to .config/opencode/skills/caveman-compress/SKILL.md
diff --git a/opencode/skills/caveman-compress/scripts/__init__.py b/.config/opencode/skills/caveman-compress/scripts/__init__.py
similarity index 100%
rename from opencode/skills/caveman-compress/scripts/__init__.py
rename to .config/opencode/skills/caveman-compress/scripts/__init__.py
diff --git a/opencode/skills/caveman-compress/scripts/__main__.py b/.config/opencode/skills/caveman-compress/scripts/__main__.py
similarity index 100%
rename from opencode/skills/caveman-compress/scripts/__main__.py
rename to .config/opencode/skills/caveman-compress/scripts/__main__.py
diff --git a/opencode/skills/caveman-compress/scripts/benchmark.py b/.config/opencode/skills/caveman-compress/scripts/benchmark.py
similarity index 100%
rename from opencode/skills/caveman-compress/scripts/benchmark.py
rename to .config/opencode/skills/caveman-compress/scripts/benchmark.py
diff --git a/opencode/skills/caveman-compress/scripts/cli.py b/.config/opencode/skills/caveman-compress/scripts/cli.py
similarity index 100%
rename from opencode/skills/caveman-compress/scripts/cli.py
rename to .config/opencode/skills/caveman-compress/scripts/cli.py
diff --git a/opencode/skills/caveman-compress/scripts/compress.py b/.config/opencode/skills/caveman-compress/scripts/compress.py
similarity index 100%
rename from opencode/skills/caveman-compress/scripts/compress.py
rename to .config/opencode/skills/caveman-compress/scripts/compress.py
diff --git a/opencode/skills/caveman-compress/scripts/detect.py b/.config/opencode/skills/caveman-compress/scripts/detect.py
similarity index 100%
rename from opencode/skills/caveman-compress/scripts/detect.py
rename to .config/opencode/skills/caveman-compress/scripts/detect.py
diff --git a/opencode/skills/caveman-compress/scripts/validate.py b/.config/opencode/skills/caveman-compress/scripts/validate.py
similarity index 100%
rename from opencode/skills/caveman-compress/scripts/validate.py
rename to .config/opencode/skills/caveman-compress/scripts/validate.py
diff --git a/opencode/skills/caveman-help/SKILL.md b/.config/opencode/skills/caveman-help/SKILL.md
similarity index 100%
rename from opencode/skills/caveman-help/SKILL.md
rename to .config/opencode/skills/caveman-help/SKILL.md
diff --git a/opencode/skills/caveman-review/SKILL.md b/.config/opencode/skills/caveman-review/SKILL.md
similarity index 100%
rename from opencode/skills/caveman-review/SKILL.md
rename to .config/opencode/skills/caveman-review/SKILL.md
diff --git a/opencode/skills/caveman/SKILL.md b/.config/opencode/skills/caveman/SKILL.md
similarity index 100%
rename from opencode/skills/caveman/SKILL.md
rename to .config/opencode/skills/caveman/SKILL.md
diff --git a/opencode/themes/nor.json b/.config/opencode/themes/nor.json
similarity index 100%
rename from opencode/themes/nor.json
rename to .config/opencode/themes/nor.json
diff --git a/opencode/tui.json b/.config/opencode/tui.json
similarity index 100%
rename from opencode/tui.json
rename to .config/opencode/tui.json
diff --git a/paneru/paneru/paneru.toml b/.config/paneru/paneru/paneru.toml
similarity index 100%
rename from paneru/paneru/paneru.toml
rename to .config/paneru/paneru/paneru.toml
diff --git a/pass-git-helper/git-pass-mapping.ini b/.config/pass-git-helper/git-pass-mapping.ini
similarity index 100%
rename from pass-git-helper/git-pass-mapping.ini
rename to .config/pass-git-helper/git-pass-mapping.ini
diff --git a/qmk/qmk.ini b/.config/qmk/qmk.ini
similarity index 100%
rename from qmk/qmk.ini
rename to .config/qmk/qmk.ini
diff --git a/qt5ct/qt5ct.conf b/.config/qt5ct/qt5ct.conf
similarity index 100%
rename from qt5ct/qt5ct.conf
rename to .config/qt5ct/qt5ct.conf
diff --git a/qt6ct/qt6ct.conf b/.config/qt6ct/qt6ct.conf
similarity index 100%
rename from qt6ct/qt6ct.conf
rename to .config/qt6ct/qt6ct.conf
diff --git a/qutebrowser/bookmarks/urls b/.config/qutebrowser/bookmarks/urls
similarity index 100%
rename from qutebrowser/bookmarks/urls
rename to .config/qutebrowser/bookmarks/urls
diff --git a/qutebrowser/config.py b/.config/qutebrowser/config.py
similarity index 100%
rename from qutebrowser/config.py
rename to .config/qutebrowser/config.py
diff --git a/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks
similarity index 100%
rename from qutebrowser/quickmarks
rename to .config/qutebrowser/quickmarks
diff --git a/qutebrowser/userscripts/qute-pass b/.config/qutebrowser/userscripts/qute-pass
similarity index 100%
rename from qutebrowser/userscripts/qute-pass
rename to .config/qutebrowser/userscripts/qute-pass
diff --git a/ripgrep/config b/.config/ripgrep/config
similarity index 100%
rename from ripgrep/config
rename to .config/ripgrep/config
diff --git a/rofi/config.rasi b/.config/rofi/config.rasi
similarity index 100%
rename from rofi/config.rasi
rename to .config/rofi/config.rasi
diff --git a/rofi/themes/fullscreen-preview.rasi b/.config/rofi/themes/fullscreen-preview.rasi
similarity index 100%
rename from rofi/themes/fullscreen-preview.rasi
rename to .config/rofi/themes/fullscreen-preview.rasi
diff --git a/senpai/senpai.scfg b/.config/senpai/senpai.scfg
similarity index 100%
rename from senpai/senpai.scfg
rename to .config/senpai/senpai.scfg
diff --git a/swappy/config b/.config/swappy/config
similarity index 100%
rename from swappy/config
rename to .config/swappy/config
diff --git a/swayimg/init.lua b/.config/swayimg/init.lua
similarity index 100%
rename from swayimg/init.lua
rename to .config/swayimg/init.lua
diff --git a/swayimg/picker.lua b/.config/swayimg/picker.lua
similarity index 100%
rename from swayimg/picker.lua
rename to .config/swayimg/picker.lua
diff --git a/systemd/user/volume-notify.service b/.config/systemd/user/volume-notify.service
similarity index 81%
rename from systemd/user/volume-notify.service
rename to .config/systemd/user/volume-notify.service
index 9598c639..2f3471c3 100644
--- a/systemd/user/volume-notify.service
+++ b/.config/systemd/user/volume-notify.service
@@ -5,7 +5,7 @@ After=graphical-session.target
 
 [Service]
 Type=simple
-ExecStart=%h/dotfiles/bin/ron-volume-notify
+ExecStart=%h/.local/bin/ron-volume-notify
 Restart=on-failure
 RestartSec=5
 
diff --git a/tessen/config b/.config/tessen/config
similarity index 100%
rename from tessen/config
rename to .config/tessen/config
diff --git a/tmux/themes/nor-dark.tmuxtheme b/.config/tmux/themes/nor-dark.tmuxtheme
similarity index 100%
rename from tmux/themes/nor-dark.tmuxtheme
rename to .config/tmux/themes/nor-dark.tmuxtheme
diff --git a/tmux/themes/nor-light.tmuxtheme b/.config/tmux/themes/nor-light.tmuxtheme
similarity index 100%
rename from tmux/themes/nor-light.tmuxtheme
rename to .config/tmux/themes/nor-light.tmuxtheme
diff --git a/tmux/tmux.conf b/.config/tmux/tmux.conf
similarity index 100%
rename from tmux/tmux.conf
rename to .config/tmux/tmux.conf
diff --git a/tridactyl/tridactylrc b/.config/tridactyl/tridactylrc
similarity index 100%
rename from tridactyl/tridactylrc
rename to .config/tridactyl/tridactylrc
diff --git a/waybar/config.jsonc b/.config/waybar/config.jsonc
similarity index 100%
rename from waybar/config.jsonc
rename to .config/waybar/config.jsonc
diff --git a/waybar/scripts/recording.fish b/.config/waybar/scripts/recording.fish
similarity index 100%
rename from waybar/scripts/recording.fish
rename to .config/waybar/scripts/recording.fish
diff --git a/xdg-desktop-portal-termfilechooser/config b/.config/xdg-desktop-portal-termfilechooser/config
similarity index 100%
rename from xdg-desktop-portal-termfilechooser/config
rename to .config/xdg-desktop-portal-termfilechooser/config
diff --git a/xdg-desktop-portal/portals.conf b/.config/xdg-desktop-portal/portals.conf
similarity index 100%
rename from xdg-desktop-portal/portals.conf
rename to .config/xdg-desktop-portal/portals.conf
diff --git a/yazi/keymap.toml b/.config/yazi/keymap.toml
similarity index 100%
rename from yazi/keymap.toml
rename to .config/yazi/keymap.toml
diff --git a/yazi/theme.toml b/.config/yazi/theme.toml
similarity index 100%
rename from yazi/theme.toml
rename to .config/yazi/theme.toml
diff --git a/yazi/yazi.toml b/.config/yazi/yazi.toml
similarity index 100%
rename from yazi/yazi.toml
rename to .config/yazi/yazi.toml
diff --git a/zathura/zathurarc b/.config/zathura/zathurarc
similarity index 100%
rename from zathura/zathurarc
rename to .config/zathura/zathurarc
diff --git a/.gitignore b/.gitignore
index 09a3e640..d3f9d79e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,14 @@
-nvim/lua/local.lua
 wget-log*
 .venv
 __pycache__
-qutebrowser/autoconfig.yml
-qutebrowser/qsettings
-tmux/plugins
-fish/completions
-fish/conf.d
-fish/fish_variables*
-jj/conf.d
-jj/repos
-kitty/current_theme.conf
-glide/glide
-waybar/style.css
+.config/nvim/lua/local.lua
+.config/qutebrowser/autoconfig.yml
+.config/qutebrowser/qsettings
+.config/tmux/plugins
+.config/fish/completions
+.config/fish/conf.d
+.config/fish/fish_variables*
+.config/jj/conf.d
+.config/jj/repos
+.config/kitty/current_theme.conf
+.config/waybar/style.css
diff --git a/gpg/gpg-agent.conf b/.gnupg/gpg-agent.conf
similarity index 100%
rename from gpg/gpg-agent.conf
rename to .gnupg/gpg-agent.conf
diff --git a/gpg/gpg.conf b/.gnupg/gpg.conf
similarity index 100%
rename from gpg/gpg.conf
rename to .gnupg/gpg.conf
diff --git a/bin/ron-background-random b/.local/bin/ron-background-random
similarity index 100%
rename from bin/ron-background-random
rename to .local/bin/ron-background-random
diff --git a/bin/ron-background-set b/.local/bin/ron-background-set
similarity index 100%
rename from bin/ron-background-set
rename to .local/bin/ron-background-set
diff --git a/bin/ron-capture-screenrecord b/.local/bin/ron-capture-screenrecord
similarity index 100%
rename from bin/ron-capture-screenrecord
rename to .local/bin/ron-capture-screenrecord
diff --git a/bin/ron-capture-screenshot b/.local/bin/ron-capture-screenshot
similarity index 100%
rename from bin/ron-capture-screenshot
rename to .local/bin/ron-capture-screenshot
diff --git a/bin/ron-firefox-customize b/.local/bin/ron-firefox-customize
similarity index 91%
rename from bin/ron-firefox-customize
rename to .local/bin/ron-firefox-customize
index eb0a2b1d..4f00a2af 100755
--- a/bin/ron-firefox-customize
+++ b/.local/bin/ron-firefox-customize
@@ -18,13 +18,13 @@ if pgrep -x firefox >/dev/null; or pgrep -x Firefox >/dev/null
     exit 1
 end
 
-if not test -f "$dotfiles/firefox/user.js"
-    echo "error: $dotfiles/firefox/user.js not found" >&2
+if not test -f "$dotfiles/.config/firefox/user.js"
+    echo "error: $dotfiles/.config/firefox/user.js not found" >&2
     exit 1
 end
 
-if not test -f "$dotfiles/firefox/userChrome.css"
-    echo "error: $dotfiles/firefox/userChrome.css not found" >&2
+if not test -f "$dotfiles/.config/firefox/userChrome.css"
+    echo "error: $dotfiles/.config/firefox/userChrome.css not found" >&2
     exit 1
 end
 
@@ -60,7 +60,7 @@ for profile in $profiles
     # userChrome.css
     mkdir -p $profdir/chrome
     set chrome_target $profdir/chrome/userChrome.css
-    set chrome_source $dotfiles/firefox/userChrome.css
+    set chrome_source $dotfiles/.config/firefox/userChrome.css
     if test -L "$chrome_target"
         ln -sfv $chrome_source $chrome_target
     else if test -f "$chrome_target"
@@ -73,7 +73,7 @@ for profile in $profiles
 
     # user.js
     set js_target $profdir/user.js
-    set js_source $dotfiles/firefox/user.js
+    set js_source $dotfiles/.config/firefox/user.js
     if test -L "$js_target"
         ln -sfv $js_source $js_target
     else if test -f "$js_target"
diff --git a/bin/ron-jj-send-email b/.local/bin/ron-jj-send-email
similarity index 100%
rename from bin/ron-jj-send-email
rename to .local/bin/ron-jj-send-email
diff --git a/bin/ron-lockfile b/.local/bin/ron-lockfile
similarity index 100%
rename from bin/ron-lockfile
rename to .local/bin/ron-lockfile
diff --git a/bin/ron-login-session-type b/.local/bin/ron-login-session-type
similarity index 100%
rename from bin/ron-login-session-type
rename to .local/bin/ron-login-session-type
diff --git a/bin/ron-menu-audio b/.local/bin/ron-menu-audio
similarity index 100%
rename from bin/ron-menu-audio
rename to .local/bin/ron-menu-audio
diff --git a/bin/ron-menu-background b/.local/bin/ron-menu-background
similarity index 100%
rename from bin/ron-menu-background
rename to .local/bin/ron-menu-background
diff --git a/bin/ron-menu-bluetooth b/.local/bin/ron-menu-bluetooth
similarity index 100%
rename from bin/ron-menu-bluetooth
rename to .local/bin/ron-menu-bluetooth
diff --git a/bin/ron-menu-clip b/.local/bin/ron-menu-clip
similarity index 100%
rename from bin/ron-menu-clip
rename to .local/bin/ron-menu-clip
diff --git a/bin/ron-menu-clip-img b/.local/bin/ron-menu-clip-img
similarity index 100%
rename from bin/ron-menu-clip-img
rename to .local/bin/ron-menu-clip-img
diff --git a/bin/ron-menu-confirm b/.local/bin/ron-menu-confirm
similarity index 100%
rename from bin/ron-menu-confirm
rename to .local/bin/ron-menu-confirm
diff --git a/bin/ron-menu-kill b/.local/bin/ron-menu-kill
similarity index 100%
rename from bin/ron-menu-kill
rename to .local/bin/ron-menu-kill
diff --git a/bin/ron-menu-mount b/.local/bin/ron-menu-mount
similarity index 100%
rename from bin/ron-menu-mount
rename to .local/bin/ron-menu-mount
diff --git a/bin/ron-menu-power b/.local/bin/ron-menu-power
similarity index 100%
rename from bin/ron-menu-power
rename to .local/bin/ron-menu-power
diff --git a/bin/ron-menu-share b/.local/bin/ron-menu-share
similarity index 100%
rename from bin/ron-menu-share
rename to .local/bin/ron-menu-share
diff --git a/bin/ron-menu-systemd b/.local/bin/ron-menu-systemd
similarity index 100%
rename from bin/ron-menu-systemd
rename to .local/bin/ron-menu-systemd
diff --git a/bin/ron-menu-unified b/.local/bin/ron-menu-unified
similarity index 100%
rename from bin/ron-menu-unified
rename to .local/bin/ron-menu-unified
diff --git a/bin/ron-menu-wifi-menu b/.local/bin/ron-menu-wifi-menu
similarity index 100%
rename from bin/ron-menu-wifi-menu
rename to .local/bin/ron-menu-wifi-menu
diff --git a/bin/ron-patch-berkeley-mono b/.local/bin/ron-patch-berkeley-mono
similarity index 100%
rename from bin/ron-patch-berkeley-mono
rename to .local/bin/ron-patch-berkeley-mono
diff --git a/bin/ron-select-screen-region b/.local/bin/ron-select-screen-region
similarity index 100%
rename from bin/ron-select-screen-region
rename to .local/bin/ron-select-screen-region
diff --git a/bin/ron-share b/.local/bin/ron-share
similarity index 100%
rename from bin/ron-share
rename to .local/bin/ron-share
diff --git a/bin/ron-show-term-colors b/.local/bin/ron-show-term-colors
similarity index 100%
rename from bin/ron-show-term-colors
rename to .local/bin/ron-show-term-colors
diff --git a/bin/ron-theme-apply b/.local/bin/ron-theme-apply
similarity index 100%
rename from bin/ron-theme-apply
rename to .local/bin/ron-theme-apply
diff --git a/bin/ron-theme-generate b/.local/bin/ron-theme-generate
similarity index 100%
rename from bin/ron-theme-generate
rename to .local/bin/ron-theme-generate
diff --git a/bin/ron-theme-get b/.local/bin/ron-theme-get
similarity index 100%
rename from bin/ron-theme-get
rename to .local/bin/ron-theme-get
diff --git a/bin/ron-theme-set b/.local/bin/ron-theme-set
similarity index 100%
rename from bin/ron-theme-set
rename to .local/bin/ron-theme-set
diff --git a/bin/ron-tmux-opencode-toggle b/.local/bin/ron-tmux-opencode-toggle
similarity index 100%
rename from bin/ron-tmux-opencode-toggle
rename to .local/bin/ron-tmux-opencode-toggle
diff --git a/bin/ron-tmux-sessionizer b/.local/bin/ron-tmux-sessionizer
similarity index 100%
rename from bin/ron-tmux-sessionizer
rename to .local/bin/ron-tmux-sessionizer
diff --git a/bin/ron-usb-toggle b/.local/bin/ron-usb-toggle
similarity index 100%
rename from bin/ron-usb-toggle
rename to .local/bin/ron-usb-toggle
diff --git a/bin/ron-volume-notify b/.local/bin/ron-volume-notify
similarity index 100%
rename from bin/ron-volume-notify
rename to .local/bin/ron-volume-notify
diff --git a/ssh/config b/.ssh/config
similarity index 100%
rename from ssh/config
rename to .ssh/config
diff --git a/.stow-local-ignore b/.stow-local-ignore
index 6bb8fecf..d7ee7ce9 100644
--- a/.stow-local-ignore
+++ b/.stow-local-ignore
@@ -28,10 +28,6 @@ DS_Store
 .DS_Store
 
 ^/install
-gpg
-ly
-ssh
-bin
-.pam-gnupg
+^/ly
+^/.config/jj/conf.d
 \.jj
-jj/conf.d
diff --git a/.stowrc b/.stowrc
index e7082671..ee23bfa3 100644
--- a/.stowrc
+++ b/.stowrc
@@ -1 +1 @@
---target=~/.config
+--target=~
diff --git a/AGENTS.md b/AGENTS.md
index 13e8b05f..57096220 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,50 +4,50 @@
 - Install target is `make install`; only runs `./install/install.sh`.
 - VCS is Jujutsu (`jj`); use `jj` unless explicitly asked for `git`.
 - Treat `make install` as destructive bootstrap: installs packages, clones backgrounds + tpm, enables system/user services, `chsh` to fish, runs `stow .`. Run only when explicitly requested.
-- `stow .` targets `~/.config` via `.stowrc`; dry-run with `stow -n .`.
-- New top-level repo-only files need `.stow-local-ignore` entries or Stow will link them into `~/.config` (see `^/AGENTS.md`, `^/README.*`).
+- `stow .` targets `~` via `.stowrc` (`--target=~`); dry-run with `stow -n .`.
+- New top-level repo-only files need `.stow-local-ignore` entries or Stow will link them into `~` (see `^/AGENTS.md`, `^/README.*`).
 
 # Layout
 
-- Most directories are Stow packages mapping directly under `~/.config`.
-- `bin/` is in `.stow-local-ignore` — NOT stowed. Scripts run from the repo via fish PATH (`fish_add_path $DOTFILES/bin`). Every file under `bin/` is prefixed `ron-`; most are `#!/usr/bin/env fish`.
-- `.stow-local-ignore` + `.gitignore` share entries for machine-local / generated paths: `gpg`, `ly`, `ssh`, `.pam-gnupg`, `install`, `\.jj`, `jj/conf.d`, `jj/repos`, `nvim/lua/local.lua`, `qutebrowser/autoconfig.yml`, `qutebrowser/qsettings`, `tmux/plugins`, `fish/completions`, `fish/conf.d`, `fish/fish_variables*`, `kitty/current_theme.conf`, `glide/glide`, `waybar/style.css`, `.venv`, `__pycache__`.
-- `install/install.sh` creates `~/.env.fish` with `set -Ux DOTFILES <path>`; `fish/config.fish` sources it first and won't load repo files without it.
-- Machine-local Fish overrides: `~/config.fish`. Local Git/JJ overrides: `~/.gitconfig.local` and `~/.config/jj/conf.d/local.toml`. Neovim local overrides: `nvim/lua/local.lua`.
-- GPG/SSH/pam-gnupg are linked manually in `install.sh` (not Stow): `~/.gnupg/gpg-agent.conf`, `~/.ssh/config`, `~/.pam-gnupg`.
+- Stow packages map to `~`: XDG configs live under `.config/` (→ `~/.config/<dir>`), scripts under `.local/bin/` (→ `~/.local/bin`), GPG under `.gnupg/` (→ `~/.gnupg`), SSH under `.ssh/` (→ `~/.ssh`), root dotfiles like `.curlrc` link directly to `~/.curlrc`.
+- Every file under `.local/bin/` is prefixed `ron-`; most are `#!/usr/bin/env fish`. They run from the stowed `~/.local/bin` (on fish PATH).
+- `.stow-local-ignore` + `.gitignore` share entries for machine-local / generated paths: `install`, `\.jj`, `^/ly`, `^/.config/jj/conf.d`, `.config/jj/repos`, `.config/nvim/lua/local.lua`, `.config/qutebrowser/autoconfig.yml`, `.config/qutebrowser/qsettings`, `.config/tmux/plugins`, `.config/fish/completions`, `.config/fish/conf.d`, `.config/fish/fish_variables*`, `.config/kitty/current_theme.conf`, `.config/waybar/style.css`, `.venv`, `__pycache__`.
+- `install/install.sh` creates `~/.env.fish` with `set -Ux DOTFILES <path>`; `.config/fish/config.fish` sources it first and won't load repo files without it.
+- Machine-local Fish overrides: `~/config.fish`. Local Git/JJ overrides: `~/.gitconfig.local` and `~/.config/jj/conf.d/local.toml`. Neovim local overrides: `.config/nvim/lua/local.lua`.
+- `install.sh` sets `~/.gnupg` perms after stow. `ly/config.ini` is sudo-linked to `/etc/ly/config.ini` (not Stow — system path).
 
 # Platform Install Flow
 
 - Linux detection (`install/platform.sh`) supports only `/etc/os-release` `ID=arch`; any other `ID` errors out with "add support to dotfiles". Darwin runs `macos.sh`.
-- Arch flow: `paru -Syu` deps, `pipx install`, `rustup` stable+nightly, enables system services (chrony, cronie, iwd) and user services from `systemd/user`, enables Docker/Bluetooth/ly, adds user to gamemode/network/input/i2c groups.
-- macOS flow: Homebrew deps, links `qutebrowser` -> `~/.qutebrowser` outside Stow, writes `pinentry-mac` to `gpg-agent.conf`.
+- Arch flow: `paru -Syu` deps, `pipx install`, `rustup` stable+nightly, enables system services (chrony, cronie, iwd) and user services from `.config/systemd/user`, enables Docker/Bluetooth/ly, adds user to gamemode/network/input/i2c groups.
+- macOS flow: Homebrew deps, writes `pinentry-mac` to `gpg-agent.conf`.
 
 # Neovim
 
-- Entrypoint `nvim/init.lua`; plugins use native `vim.pack.add`, not lazy.nvim.
-- Plugin sources via `nvim/lua/utils/pack.lua` helpers: `src.gh` (github), `src.tngl` (tangled.org), `src.cb` (codeberg). Colorscheme `nor.nvim` from `tngl("ronshavit.com/nor.nvim")`.
-- Lockfile `nvim/nvim-pack-lock.json`; update from Neovim with `:PackUpdate [name]`.
+- Entrypoint `.config/nvim/init.lua`; plugins use native `vim.pack.add`, not lazy.nvim.
+- Plugin sources via `.config/nvim/lua/utils/pack.lua` helpers: `src.gh` (github), `src.tngl` (tangled.org), `src.cb` (codeberg). Colorscheme `nor.nvim` from `tngl("ronshavit.com/nor.nvim")`.
+- Lockfile `.config/nvim/nvim-pack-lock.json`; update from Neovim with `:PackUpdate [name]`.
 - `bob` manages the nvim binary; `~/.local/share/bob/nvim-bin` is on fish PATH.
-- Lua formatting: root `stylua.toml` — 2 spaces, `column_width = 100`, `AutoPreferDouble`. Check with `stylua --check nvim`.
+- Lua formatting: root `stylua.toml` — 2 spaces, `column_width = 100`, `AutoPreferDouble`. Check with `stylua --check .config/nvim`.
 
 # hellwal
 
-- NEVER run `hellwal` directly unless explicitly prompted. ALWAYS run `./bin/ron-theme-generate` so theme context (light/dark mode via `ron-theme-get`, `--check-contrast`, `--bright-offset` for light, `ron-theme-apply` hook) is applied.
-- Templates live in `hellwal/templates/`; `ron-theme-apply` writes generated outputs (`kitty/current_theme.conf`, `waybar/style.css`, etc.) which are gitignored + stow-ignored.
+- NEVER run `hellwal` directly unless explicitly prompted. ALWAYS run `ron-theme-generate` so theme context (light/dark mode via `ron-theme-get`, `--check-contrast`, `--bright-offset` for light, `ron-theme-apply` hook) is applied.
+- Templates live in `.config/hellwal/templates/`; `ron-theme-apply` writes generated outputs (`.config/kitty/current_theme.conf`, `.config/waybar/style.css`, etc.) which are gitignored + stow-ignored.
 
 # JJ Workflow
 
-- Main config is `jj/config.toml` (user, ui, merge-tools.diffconflicts, fsmonitor.watchman, aliases). Machine-local overrides in `~/.config/jj/conf.d/local.toml`.
+- Main config is `.config/jj/config.toml` (user, ui, merge-tools.diffconflicts, fsmonitor.watchman, aliases). Machine-local overrides in `~/.config/jj/conf.d/local.toml`.
 - Push convention: `push-new-bookmarks = false`, `[remotes.origin] auto-track-bookmarks = 'ron/*'`, `git_push_bookmark = "ron/" ++ change_id.short()`. Use `jj pmine` (`git push -b glob:ron/*`) to push your branches.
 - Private commits: `description(glob:'wip:*') | description(glob:'private:*')` are blocked from push.
 - Useful aliases: `ret`/`retrunk` (rebase to trunk skipping emptied), `retall`, `pullup`, `mine` (my bookmarks), `branches` (all heads), `l` (focused log), `la`, `gc` (abandon empty), `si` (squash interactive).
 
 # OpenCode Config
 
-- `opencode/AGENTS.md` is user communication style, stowed to `~/.config/opencode/AGENTS.md`. Keep repo workflow notes in this root file.
-- `opencode/opencode.json` permission rules mark many ops `ask` (require user confirmation): `jj ci*`, `jj commit*`, `jj new*`, `jj b*`, `jj restore*`, `jj abandon*`, `git commit/push/checkout/reset`, `stow*`, `paru*`, `brew install/upgrade/uninstall`, `cargo install`, `pipx install`, `npm install -g`, `curl|bash`, `wget|bash`, `chsh`, `kill*`, `pkill*`, `reboot/poweroff/hibernate`, `rm*`. Plan for confirmation prompts on these.
+- `.config/opencode/AGENTS.md` is user communication style, stowed to `~/.config/opencode/AGENTS.md`. Keep repo workflow notes in this root file.
+- `.config/opencode/opencode.json` permission rules mark many ops `ask` (require user confirmation): `jj ci*`, `jj commit*`, `jj new*`, `jj b*`, `jj restore*`, `jj abandon*`, `git commit/push/checkout/reset`, `stow*`, `paru*`, `brew install/upgrade/uninstall`, `cargo install`, `pipx install`, `npm install -g`, `curl|bash`, `wget|bash`, `chsh`, `kill*`, `pkill*`, `reboot/poweroff/hibernate`, `rm*`. Plan for confirmation prompts on these.
 - `snapshot: false`; MCP `context7` remote enabled.
-- Caveman skills live in `opencode/skills/` (`caveman`, `caveman-commit`, `caveman-compress`, `caveman-help`, `caveman-review`); `opencode/themes/nor.json` is the TUI theme.
+- Caveman skills live in `.config/opencode/skills/` (`caveman`, `caveman-commit`, `caveman-compress`, `caveman-help`, `caveman-review`); `.config/opencode/themes/nor.json` is the TUI theme.
 
 # Bash Tool / Root Access
 
diff --git a/README.md b/README.md
index 4ec8906f..1734ecfc 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Prerequisites:
 - Docker CLI
 - Installed and unzipped the font from their [website](https://usgraphics.com/products/berkeley-mono)
 
-After installing it, run `bin/ron-patch-berkeley-mono`
+After installing it, run `ron-patch-berkeley-mono`
 
 ## Local Fish Config
 
@@ -26,7 +26,7 @@ After installing it, run `bin/ron-patch-berkeley-mono`
 ```
 
 If there's customization you want Fish to load on startup that is specific to
-this machine. It will be loaded at the top of `fish/config.fish`.
+this machine. It will be loaded at the top of `.config/fish/config.fish`.
 
 ## Local Git & JJ Configs
 
diff --git a/fish/completions/fisher.fish b/fish/completions/fisher.fish
deleted file mode 100644
index 6d23ce49..00000000
--- a/fish/completions/fisher.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-complete --command fisher --exclusive --long help --description "Print help"
-complete --command fisher --exclusive --long version --description "Print version"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments install --description "Install plugins"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments update --description "Update installed plugins"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments remove --description "Remove installed plugins"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments list --description "List installed plugins matching regex"
-complete --command fisher --exclusive --condition "__fish_seen_subcommand_from update remove" --arguments "(fisher list)"
diff --git a/install/install.sh b/install/install.sh
index 81190122..05ab7622 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -38,9 +38,9 @@ fi
 
 # make scripts executable
 step "chmod"
-chmod -v ug+x $DOTFILES/bin/*
-chmod -v ug+x $DOTFILES/waybar/scripts/*
-chmod -v ug+x $DOTFILES/qutebrowser/userscripts/*
+chmod -v ug+x $DOTFILES/.local/bin/*
+chmod -v ug+x $DOTFILES/.config/waybar/scripts/*
+chmod -v ug+x $DOTFILES/.config/qutebrowser/userscripts/*
 success
 
 # install tools
@@ -70,17 +70,10 @@ if ! stow .; then
 fi
 success
 
-# gnupg
+# gnupg perms (stow links files into ~/.gnupg)
 mkdir -p "$HOME/.gnupg"
 find ~/.gnupg -type f -exec chmod 600 {} \;
 find ~/.gnupg -type d -exec chmod 700 {} \;
-ln -sfv "$DOTFILES/gpg/gpg-agent.conf" "$HOME/.gnupg/gpg-agent.conf"
-ln -sfv "$DOTFILES/gpg/gpg.conf" "$HOME/.gnupg/gpg.conf"
-ln -sfv "$DOTFILES/.pam-gnupg" "$HOME/.pam-gnupg"
-
-# ssh
-mkdir -p "$HOME/.ssh"
-ln -sfv "$DOTFILES/ssh/config" ~/.ssh/config
 
 # default shell
 if exists "fish"; then
@@ -104,7 +97,7 @@ if [ "$MACHINE" = "darwin" ]; then
     pinentry_bin="$(which pinentry-mac || true)"
     if [ -n "$pinentry_bin" ]; then
         target="pinentry-program $pinentry_bin"
-        conf="$HOME/.gnupg/gpg-agent.conf"
+        conf="$DOTFILES/.gnupg/gpg-agent.conf"
         if ! grep -Fxq "$target" "$conf"; then
             sed -i '' "s|^pinentry-program .*|$target|" "$conf"
             gpg-connect-agent reloadagent /bye
diff --git a/install/platform.sh b/install/platform.sh
index abfa8c83..e1f3722c 100755
--- a/install/platform.sh
+++ b/install/platform.sh
@@ -21,7 +21,7 @@ linux)
     fi
 
     script=$DOTFILES/install/platform/$distro_type.sh
-    info "detected linux distribution: $distro_type (based on '$ID')"
+    info "detected linux distribution: $distro_type"
     info "installing tools from $script..."
     source "$DOTFILES/install/platform/${distro_type}.sh"
     ;;
diff --git a/install/platform/arch.sh b/install/platform/arch.sh
index 430b882d..87b959f1 100755
--- a/install/platform/arch.sh
+++ b/install/platform/arch.sh
@@ -206,8 +206,8 @@ step "systemd: enable user services"
 
 systemctl --user daemon-reload
 shopt -s nullglob
-user_services=("$DOTFILES"/systemd/user/*.service)
-user_paths=("$DOTFILES"/systemd/user/*.path)
+user_services=("$DOTFILES"/.config/systemd/user/*.service)
+user_paths=("$DOTFILES"/.config/systemd/user/*.path)
 
 if ((${#user_services[@]})); then
     systemctl --user enable "${user_services[@]}"
diff --git a/install/platform/macos.sh b/install/platform/macos.sh
index 42ae1524..5616b00b 100755
--- a/install/platform/macos.sh
+++ b/install/platform/macos.sh
@@ -87,5 +87,5 @@ echo ""
 
 if exists "qutebrowser"; then
     rm -rf "$HOME/.qutebrowser"
-    ln -sv "$DOTFILES/qutebrowser" "$HOME/.qutebrowser"
+    ln -sv "$DOTFILES/.config/qutebrowser" "$HOME/.qutebrowser"
 fi