diff --git a/dotfiles/alacritty/alacritty.yml b/alacritty/alacritty.yml
similarity index 100%
rename from dotfiles/alacritty/alacritty.yml
rename to alacritty/alacritty.yml
diff --git a/bin/commit.sh b/bin/commit.sh
deleted file mode 100755
index 0bedde4..0000000
--- a/bin/commit.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-TYPE=$(gum choose "fix" "feat" "docs" "ci" "style" "refactor" "test" "chore" "revert")
-SCOPE=$(gum input --placeholder "scope")
-
-test -n "$SCOPE" && SCOPE="($SCOPE)"
-
-TO_COMMIT=$(gum choose --no-limit $(git ls-files --modified --others --exclude-standard))
-
-SUMMARY=$(gum input --value "$TYPE$SCOPE: " --placeholder "Commit Summary")
-DESCRIPTION=$(gum write --placeholder "Details of this change...")
-
-gum confirm "Commit?"
-
-if [[ "$?" -eq 0 ]]; then
-    git add $TO_COMMIT;
-    git commit -m "$SUMMARY" -m "$DESCRIPTION";
-fi
diff --git a/bin/dotfiles.sh b/bin/dotfiles.sh
deleted file mode 100755
index 6a947b1..0000000
--- a/bin/dotfiles.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-for conf in $(ls dotfiles); do
-    ln -sn $PWD/dotfiles/$conf $HOME/.config/$conf
-done
diff --git a/dotfiles/fish/completions/docker.fish b/fish/completions/docker.fish
similarity index 100%
rename from dotfiles/fish/completions/docker.fish
rename to fish/completions/docker.fish
diff --git a/dotfiles/fish/completions/fisher.fish b/fish/completions/fisher.fish
similarity index 100%
rename from dotfiles/fish/completions/fisher.fish
rename to fish/completions/fisher.fish
diff --git a/dotfiles/fish/completions/gup.fish b/fish/completions/gup.fish
similarity index 100%
rename from dotfiles/fish/completions/gup.fish
rename to fish/completions/gup.fish
diff --git a/dotfiles/fish/completions/nvm.fish b/fish/completions/nvm.fish
similarity index 100%
rename from dotfiles/fish/completions/nvm.fish
rename to fish/completions/nvm.fish
diff --git a/dotfiles/fish/completions/pdm.fish b/fish/completions/pdm.fish
similarity index 100%
rename from dotfiles/fish/completions/pdm.fish
rename to fish/completions/pdm.fish
diff --git a/dotfiles/fish/conf.d/fish-ssh-agent.fish b/fish/conf.d/fish-ssh-agent.fish
similarity index 100%
rename from dotfiles/fish/conf.d/fish-ssh-agent.fish
rename to fish/conf.d/fish-ssh-agent.fish
diff --git a/dotfiles/fish/conf.d/nvm.fish b/fish/conf.d/nvm.fish
similarity index 100%
rename from dotfiles/fish/conf.d/nvm.fish
rename to fish/conf.d/nvm.fish
diff --git a/dotfiles/fish/config.fish b/fish/config.fish
similarity index 100%
rename from dotfiles/fish/config.fish
rename to fish/config.fish
diff --git a/dotfiles/fish/fish_plugins b/fish/fish_plugins
similarity index 100%
rename from dotfiles/fish/fish_plugins
rename to fish/fish_plugins
diff --git a/dotfiles/fish/fish_variables b/fish/fish_variables
similarity index 100%
rename from dotfiles/fish/fish_variables
rename to fish/fish_variables
diff --git a/dotfiles/fish/functions/__ssh_agent_is_started.fish b/fish/functions/__ssh_agent_is_started.fish
similarity index 100%
rename from dotfiles/fish/functions/__ssh_agent_is_started.fish
rename to fish/functions/__ssh_agent_is_started.fish
diff --git a/dotfiles/fish/functions/__ssh_agent_start.fish b/fish/functions/__ssh_agent_start.fish
similarity index 100%
rename from dotfiles/fish/functions/__ssh_agent_start.fish
rename to fish/functions/__ssh_agent_start.fish
diff --git a/dotfiles/fish/functions/_nvm_index_update.fish b/fish/functions/_nvm_index_update.fish
similarity index 100%
rename from dotfiles/fish/functions/_nvm_index_update.fish
rename to fish/functions/_nvm_index_update.fish
diff --git a/dotfiles/fish/functions/_nvm_list.fish b/fish/functions/_nvm_list.fish
similarity index 100%
rename from dotfiles/fish/functions/_nvm_list.fish
rename to fish/functions/_nvm_list.fish
diff --git a/dotfiles/fish/functions/_nvm_version_activate.fish b/fish/functions/_nvm_version_activate.fish
similarity index 100%
rename from dotfiles/fish/functions/_nvm_version_activate.fish
rename to fish/functions/_nvm_version_activate.fish
diff --git a/dotfiles/fish/functions/_nvm_version_deactivate.fish b/fish/functions/_nvm_version_deactivate.fish
similarity index 100%
rename from dotfiles/fish/functions/_nvm_version_deactivate.fish
rename to fish/functions/_nvm_version_deactivate.fish
diff --git a/dotfiles/fish/functions/fish_greeting.fish b/fish/functions/fish_greeting.fish
similarity index 100%
rename from dotfiles/fish/functions/fish_greeting.fish
rename to fish/functions/fish_greeting.fish
diff --git a/dotfiles/fish/functions/fish_load_env.fish b/fish/functions/fish_load_env.fish
similarity index 100%
rename from dotfiles/fish/functions/fish_load_env.fish
rename to fish/functions/fish_load_env.fish
diff --git a/dotfiles/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
similarity index 100%
rename from dotfiles/fish/functions/fish_prompt.fish
rename to fish/functions/fish_prompt.fish
diff --git a/fish/functions/fish_update_dotfiles.fish b/fish/functions/fish_update_dotfiles.fish
new file mode 100644
index 0000000..2ff26af
--- /dev/null
+++ b/fish/functions/fish_update_dotfiles.fish
@@ -0,0 +1,5 @@
+function fish_update_dotfiles
+    for conf in (ls)
+        ln --force -sn $PWD/$conf $HOME/.config/$conf
+    end
+end
diff --git a/dotfiles/fish/functions/fisher.fish b/fish/functions/fisher.fish
similarity index 100%
rename from dotfiles/fish/functions/fisher.fish
rename to fish/functions/fisher.fish
diff --git a/dotfiles/fish/functions/macos_update.fish b/fish/functions/macos_update.fish
similarity index 100%
rename from dotfiles/fish/functions/macos_update.fish
rename to fish/functions/macos_update.fish
diff --git a/dotfiles/fish/functions/nvm.fish b/fish/functions/nvm.fish
similarity index 100%
rename from dotfiles/fish/functions/nvm.fish
rename to fish/functions/nvm.fish
diff --git a/dotfiles/i3/config b/i3/config
similarity index 100%
rename from dotfiles/i3/config
rename to i3/config
diff --git a/dotfiles/i3status-rust/config.toml b/i3status-rust/config.toml
similarity index 100%
rename from dotfiles/i3status-rust/config.toml
rename to i3status-rust/config.toml
diff --git a/dotfiles/nvim/ftplugin/css.lua b/nvim/ftplugin/css.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/css.lua
rename to nvim/ftplugin/css.lua
diff --git a/dotfiles/nvim/ftplugin/go.lua b/nvim/ftplugin/go.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/go.lua
rename to nvim/ftplugin/go.lua
diff --git a/dotfiles/nvim/ftplugin/html.lua b/nvim/ftplugin/html.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/html.lua
rename to nvim/ftplugin/html.lua
diff --git a/dotfiles/nvim/ftplugin/javascript.lua b/nvim/ftplugin/javascript.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/javascript.lua
rename to nvim/ftplugin/javascript.lua
diff --git a/dotfiles/nvim/ftplugin/lua.lua b/nvim/ftplugin/lua.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/lua.lua
rename to nvim/ftplugin/lua.lua
diff --git a/dotfiles/nvim/ftplugin/norg.lua b/nvim/ftplugin/norg.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/norg.lua
rename to nvim/ftplugin/norg.lua
diff --git a/dotfiles/nvim/ftplugin/tex.lua b/nvim/ftplugin/tex.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/tex.lua
rename to nvim/ftplugin/tex.lua
diff --git a/dotfiles/nvim/ftplugin/typescript.lua b/nvim/ftplugin/typescript.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/typescript.lua
rename to nvim/ftplugin/typescript.lua
diff --git a/dotfiles/nvim/ftplugin/vue.lua b/nvim/ftplugin/vue.lua
similarity index 100%
rename from dotfiles/nvim/ftplugin/vue.lua
rename to nvim/ftplugin/vue.lua
diff --git a/dotfiles/nvim/init.lua b/nvim/init.lua
similarity index 100%
rename from dotfiles/nvim/init.lua
rename to nvim/init.lua
diff --git a/dotfiles/nvim/lua/completion.lua b/nvim/lua/completion.lua
similarity index 100%
rename from dotfiles/nvim/lua/completion.lua
rename to nvim/lua/completion.lua
diff --git a/dotfiles/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
similarity index 100%
rename from dotfiles/nvim/lua/lsp.lua
rename to nvim/lua/lsp.lua
diff --git a/dotfiles/nvim/lua/mappings.lua b/nvim/lua/mappings.lua
similarity index 100%
rename from dotfiles/nvim/lua/mappings.lua
rename to nvim/lua/mappings.lua
diff --git a/dotfiles/nvim/lua/mini.lua b/nvim/lua/mini.lua
similarity index 100%
rename from dotfiles/nvim/lua/mini.lua
rename to nvim/lua/mini.lua
diff --git a/dotfiles/nvim/lua/opts.lua b/nvim/lua/opts.lua
similarity index 100%
rename from dotfiles/nvim/lua/opts.lua
rename to nvim/lua/opts.lua
diff --git a/dotfiles/nvim/lua/ts.lua b/nvim/lua/ts.lua
similarity index 100%
rename from dotfiles/nvim/lua/ts.lua
rename to nvim/lua/ts.lua
diff --git a/dotfiles/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua
similarity index 100%
rename from dotfiles/nvim/plugin/packer_compiled.lua
rename to nvim/plugin/packer_compiled.lua
diff --git a/dotfiles/rofi/config.rasi b/rofi/config.rasi
similarity index 100%
rename from dotfiles/rofi/config.rasi
rename to rofi/config.rasi