refactor: before_plugins and after_plugins
4 files changed, +8 -3
+1-1.gitignore
| @@ -1,4 +1,4 @@ | ||
| 1 | -env.sh | |
| 1 | +secrets.sh | |
| 2 | 2 | .zfunc |
| 3 | 3 | .zcompdump |
| 4 | 4 | .zshenv |
+6-2.zshrc
| @@ -1,3 +1,5 @@ | ||
| 1 | +[ -f "$ZDOTDIR/before_plugins.sh" ] && source "$ZDOTDIR/before_plugins.sh" | |
| 2 | + | |
| 1 | 3 | # Set up antidote |
| 2 | 4 | source "$ZDOTDIR/.antidote/antidote.zsh" |
| 3 | 5 | antidote load ${ZDOTDIR:-$HOME}/zsh_plugins.txt |
| @@ -10,6 +12,8 @@ autoload -Uz compinit && compinit | ||
| 10 | 12 | # Update checks and functions |
| 11 | 13 | source "$ZDOTDIR/update_functions.sh" |
| 12 | 14 | |
| 15 | +# Add secret environment variables | |
| 16 | +[ -f "$ZDOTDIR/secrets.sh" ] && source "$ZDOTDIR/secrets.sh" | |
| 17 | + | |
| 13 | 18 | # Post compinit setups. Good for overriding plugins. |
| 14 | -[ -f "$ZDOTDIR/env.sh" ] && source "$ZDOTDIR/env.sh" | |
| 15 | -source "$ZDOTDIR"/config.sh | |
| 19 | +[ -f "$ZDOTDIR/after_plugins.sh" ] && source "$ZDOTDIR"/after_plugins.sh |
+0-0config.sh → after_plugins.sh
No content changes (mode or rename only).
+1-0precomp.sh → before_plugins.sh
| @@ -16,6 +16,7 @@ export PATH="$HOME/.local/share/fnm:$PATH" | ||
| 16 | 16 | # Add environments |
| 17 | 17 | [ -f ~/.fzf.zsh ] && . ~/.fzf.zsh |
| 18 | 18 | [ -f ~/.cargo/env ] && . "$HOME/.cargo/env" |
| 19 | +[ -f ~/.venv/bin/activate ] && . ~/.venv/bin/activate | |
| 19 | 20 | |
| 20 | 21 | # Create completions now that path is updated |
| 21 | 22 | add_completions _fnm 'fnm completions --shell zsh' |