irongit

refactor: before_plugins and after_plugins

huncholanehuncholaneauthored
parent a8cb23ccommit 9a7a90848b36130afacd6d948bd36e13ef073bfeBrowse files

4 files changed, +8 -3

+1-1.gitignore
@@ -1,4 +1,4 @@
1-env.sh
1+secrets.sh
22 .zfunc
33 .zcompdump
44 .zshenv
+6-2.zshrc
@@ -1,3 +1,5 @@
1+[ -f "$ZDOTDIR/before_plugins.sh" ] && source "$ZDOTDIR/before_plugins.sh"
2+
13 # Set up antidote
24 source "$ZDOTDIR/.antidote/antidote.zsh"
35 antidote load ${ZDOTDIR:-$HOME}/zsh_plugins.txt
@@ -10,6 +12,8 @@ autoload -Uz compinit && compinit
1012 # Update checks and functions
1113 source "$ZDOTDIR/update_functions.sh"
1214
15+# Add secret environment variables
16+[ -f "$ZDOTDIR/secrets.sh" ] && source "$ZDOTDIR/secrets.sh"
17+
1318 # 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"
1616 # Add environments
1717 [ -f ~/.fzf.zsh ] && . ~/.fzf.zsh
1818 [ -f ~/.cargo/env ] && . "$HOME/.cargo/env"
19+[ -f ~/.venv/bin/activate ] && . ~/.venv/bin/activate
1920
2021 # Create completions now that path is updated
2122 add_completions _fnm 'fnm completions --shell zsh'