diff --git a/.config/zsh/config/init.zsh b/.config/zsh/config/init.zsh index e71a8dc..542a6df 100644 --- a/.config/zsh/config/init.zsh +++ b/.config/zsh/config/init.zsh @@ -4,6 +4,48 @@ configure() { autoload -U +X bashcompinit && bashcompinit } +init-omz() { + # This has to break spec because omz will source EVERYTHING inside of the + # omz directory :( + + ### Autojump ### + source "${HOME}/.local/share/autojump/etc/profile.d/autojump.sh" + + plugins=( + git + zsh-autosuggestions + zsh-completions + zsh-syntax-highlighting + colored-man-pages + pip + extract + fzf-tab + autojump + aws + docker + docker-compose + nmap + npm + python + zsh-vi-mode + zsh-kitty + rust + dotnet + ) + + if [[ "${OSTYPE}" = "darwin"* ]]; then + plugins +=( + macos + ) + fi + + local wkdir="${BASE_ZSH_CONFIG_DIR}/config/omz" + export ZSH="${HOME}/.local/share/omz" + export ZSH_CUSTOM="${wkdir}/" + export OMZ_INIT_RAN=true + source "${ZSH}/oh-my-zsh.sh" +} + init() { local wkdir="${BASE_ZSH_CONFIG_DIR}/config" source "${wkdir}/themes/init.zsh" diff --git a/.config/zsh/config/omz/init.zsh b/.config/zsh/config/omz/init.zsh deleted file mode 100644 index 856c6e7..0000000 --- a/.config/zsh/config/omz/init.zsh +++ /dev/null @@ -1,49 +0,0 @@ -OMZ_DIRS="${BASE_ZSH_CONFIG_DIR}/config/omz" - -configure() { - - ### Autojump ### - source "${HOME}/.local/share/autojump/etc/profile.d/autojump.sh" - - export plugins=( - git - zsh-autosuggestions - zsh-completions - zsh-syntax-highlighting - colored-man-pages - pip - extract - fzf-tab - autojump - aws - docker - docker-compose - nmap - npm - python - zsh-vi-mode - zsh-kitty - rust - dotnet - ) - - if [[ "${OSTYPE}" = "darwin"* ]]; then - plugins +=( - macos - ) - fi -} - -init() { - if ! [[ OMZ_INIT_RAN = true ]]; then - local wkdir="${BASE_ZSH_CONFIG_DIR}/config/omz" - export ZSH="${HOME}/.local/share/omz" - export ZSH_CUSTOM="${wkdir}/" - export OMZ_INIT_RAN=true - source "${ZSH}/oh-my-zsh.sh" - fi - - configure -} - -init