tomy0000000 · tomy0000000 · Mar 14, 2026 · Mar 14, 2026 · Mar 14, 2026
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/pkg/git/custom/custom.gitconfig
-/zsh/.zcompdump*
-/zsh/.zsh_history
-/zsh/.zsh_sessions
-/zsh/.zshrc.zwc
+pkg/git/custom/custom.gitconfig
+pkg/zsh/.zcompdump*
+pkg/zsh/.zsh_history
+pkg/zsh/.zsh_sessions
+pkg/zsh/.zshrc.zwc
diff --git a/zsh/.zalias/configs.zsh → pkg/zsh/.zalias/configs.zsh b/zsh/.zalias/configs.zsh → pkg/zsh/.zalias/configs.zsh
diff --git a/zsh/.zalias/docker.zsh → pkg/zsh/.zalias/docker.zsh b/zsh/.zalias/docker.zsh → pkg/zsh/.zalias/docker.zsh
diff --git a/zsh/.zalias/editors.zsh → pkg/zsh/.zalias/editors.zsh b/zsh/.zalias/editors.zsh → pkg/zsh/.zalias/editors.zsh
diff --git a/zsh/.zalias/kubectl.zsh → pkg/zsh/.zalias/kubectl.zsh b/zsh/.zalias/kubectl.zsh → pkg/zsh/.zalias/kubectl.zsh
diff --git a/zsh/.zalias/npm.zsh → pkg/zsh/.zalias/npm.zsh b/zsh/.zalias/npm.zsh → pkg/zsh/.zalias/npm.zsh
diff --git a/zsh/.zalias/pip.zsh → pkg/zsh/.zalias/pip.zsh b/zsh/.zalias/pip.zsh → pkg/zsh/.zalias/pip.zsh
diff --git a/zsh/.zalias/replacement.zsh → pkg/zsh/.zalias/replacement.zsh b/zsh/.zalias/replacement.zsh → pkg/zsh/.zalias/replacement.zsh
diff --git a/zsh/.zalias/xattr.zsh → pkg/zsh/.zalias/xattr.zsh b/zsh/.zalias/xattr.zsh → pkg/zsh/.zalias/xattr.zsh
diff --git a/zsh/.zenv/brew.zsh → pkg/zsh/.zenv/brew.zsh b/zsh/.zenv/brew.zsh → pkg/zsh/.zenv/brew.zsh
@@ -2,7 +2,7 @@
 
 # Source brew utilities
 # TODO: Remove this after global source lib
-source ${ZDOTDIR}/../lib/brew.sh
+source ${ZDOTDIR}/../../lib/brew.sh
 
 # Setup Homebrew if available
 if brew_path="$(abs_brew)"; then

diff --git a/zsh/.zfunc/benchmark → pkg/zsh/.zfunc/benchmark b/zsh/.zfunc/benchmark → pkg/zsh/.zfunc/benchmark
diff --git a/zsh/.zfunc/dns_purge → pkg/zsh/.zfunc/dns_purge b/zsh/.zfunc/dns_purge → pkg/zsh/.zfunc/dns_purge
diff --git a/zsh/.zfunc/fpath → pkg/zsh/.zfunc/fpath b/zsh/.zfunc/fpath → pkg/zsh/.zfunc/fpath
diff --git a/zsh/.zfunc/kill_port → pkg/zsh/.zfunc/kill_port b/zsh/.zfunc/kill_port → pkg/zsh/.zfunc/kill_port
diff --git a/zsh/.zfunc/manpath → pkg/zsh/.zfunc/manpath b/zsh/.zfunc/manpath → pkg/zsh/.zfunc/manpath
diff --git a/zsh/.zfunc/path → pkg/zsh/.zfunc/path b/zsh/.zfunc/path → pkg/zsh/.zfunc/path
diff --git a/zsh/.zfunc/realcmd → pkg/zsh/.zfunc/realcmd b/zsh/.zfunc/realcmd → pkg/zsh/.zfunc/realcmd
diff --git a/zsh/.zfunc/reset_zsh → pkg/zsh/.zfunc/reset_zsh b/zsh/.zfunc/reset_zsh → pkg/zsh/.zfunc/reset_zsh
diff --git a/zsh/.zprofile → pkg/zsh/.zprofile b/zsh/.zprofile → pkg/zsh/.zprofile
diff --git a/zsh/.zsh/fix_omz_plugin.zsh → pkg/zsh/.zsh/fix_omz_plugin.zsh b/zsh/.zsh/fix_omz_plugin.zsh → pkg/zsh/.zsh/fix_omz_plugin.zsh
diff --git a/zsh/.zsh/iterm.zsh → pkg/zsh/.zsh/iterm.zsh b/zsh/.zsh/iterm.zsh → pkg/zsh/.zsh/iterm.zsh
diff --git a/zsh/.zsh/perl.zsh → pkg/zsh/.zsh/perl.zsh b/zsh/.zsh/perl.zsh → pkg/zsh/.zsh/perl.zsh
diff --git a/zsh/.zsh/python.zsh → pkg/zsh/.zsh/python.zsh b/zsh/.zsh/python.zsh → pkg/zsh/.zsh/python.zsh
diff --git a/zsh/.zsh/zsh-style.zsh → pkg/zsh/.zsh/zsh-style.zsh b/zsh/.zsh/zsh-style.zsh → pkg/zsh/.zsh/zsh-style.zsh
diff --git a/zsh/.zshenv → pkg/zsh/.zshenv b/zsh/.zshenv → pkg/zsh/.zshenv
@@ -1,7 +1,7 @@
 #!/bin/zsh
 
 # Zsh
-export ZDOTDIR="${HOME}/.dotfiles/zsh"
+export ZDOTDIR="${HOME}/.dotfiles/pkg/zsh"
 
 # XDG Base Directory
 # https://specifications.freedesktop.org/basedir-spec/latest/

diff --git a/zsh/.zshrc → pkg/zsh/.zshrc b/zsh/.zshrc → pkg/zsh/.zshrc
diff --git a/zsh/completion/carapace.zsh → pkg/zsh/completion/carapace.zsh b/zsh/completion/carapace.zsh → pkg/zsh/completion/carapace.zsh
diff --git a/zsh/completion/docker.zsh → pkg/zsh/completion/docker.zsh b/zsh/completion/docker.zsh → pkg/zsh/completion/docker.zsh
diff --git a/zsh/completion/kubectl.zsh → pkg/zsh/completion/kubectl.zsh b/zsh/completion/kubectl.zsh → pkg/zsh/completion/kubectl.zsh
diff --git a/zsh/completion/misc.zsh → pkg/zsh/completion/misc.zsh b/zsh/completion/misc.zsh → pkg/zsh/completion/misc.zsh
diff --git a/zsh/completion/mise.zsh → pkg/zsh/completion/mise.zsh b/zsh/completion/mise.zsh → pkg/zsh/completion/mise.zsh
diff --git a/zsh/completion/op.zsh → pkg/zsh/completion/op.zsh b/zsh/completion/op.zsh → pkg/zsh/completion/op.zsh
diff --git a/zsh/completion/poetry.zsh → pkg/zsh/completion/poetry.zsh b/zsh/completion/poetry.zsh → pkg/zsh/completion/poetry.zsh
diff --git a/zsh/config/keybindings.zsh → pkg/zsh/config/keybindings.zsh b/zsh/config/keybindings.zsh → pkg/zsh/config/keybindings.zsh
diff --git a/pkg/zsh/debian-zsh.sh b/pkg/zsh/debian-zsh.sh
@@ -3,8 +3,8 @@ set -euo pipefail
 
 # Load .zshenv to get XDG_CONFIG_HOME
 set +u
-# shellcheck source=zsh/.zshenv
-source 'zsh/.zshenv'
+# shellcheck source=pkg/zsh/.zshenv
+source 'pkg/zsh/.zshenv'
 set -u
 
 MISE_DIR="${XDG_CONFIG_HOME}/mise"

diff --git a/pkg/zsh/macos-zsh.sh b/pkg/zsh/macos-zsh.sh
@@ -3,7 +3,8 @@ set -euo pipefail
 
 # Load .zshenv to get XDG_CONFIG_HOME
 set +u
-source 'zsh/.zshenv'
+# shellcheck source=pkg/zsh/.zshenv
+source 'pkg/zsh/.zshenv'
 set -u
 
 ZSH_BIN="${HOMEBREW_PREFIX}/bin/zsh" # Homebrew zsh

diff --git a/zsh/starship.toml → pkg/zsh/starship.toml b/zsh/starship.toml → pkg/zsh/starship.toml
diff --git a/zsh/tools/carapace.zsh → pkg/zsh/tools/carapace.zsh b/zsh/tools/carapace.zsh → pkg/zsh/tools/carapace.zsh
diff --git a/zsh/tools/direnv.zsh → pkg/zsh/tools/direnv.zsh b/zsh/tools/direnv.zsh → pkg/zsh/tools/direnv.zsh
diff --git a/zsh/tools/mise.zsh → pkg/zsh/tools/mise.zsh b/zsh/tools/mise.zsh → pkg/zsh/tools/mise.zsh
diff --git a/zsh/tools/starship.zsh → pkg/zsh/tools/starship.zsh b/zsh/tools/starship.zsh → pkg/zsh/tools/starship.zsh
diff --git a/zsh/tools/zoxide.zsh → pkg/zsh/tools/zoxide.zsh b/zsh/tools/zoxide.zsh → pkg/zsh/tools/zoxide.zsh