diff --git a/bin/dotfiles-sync.sh b/bin/dotfiles-sync.sh index e4a6756..1ad5259 100755 --- a/bin/dotfiles-sync.sh +++ b/bin/dotfiles-sync.sh @@ -23,7 +23,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" DOTFILES_CONF="$HOME/.dotfiles/dotfiles.conf" if [[ -f "$DOTFILES_CONF" ]]; then - source "$DOTFILES_CONF" + source $DOTFILES_CONF else DOTFILES_DIR="$HOME/.dotfiles" DOTFILES_BRANCH="main" diff --git a/zsh/.zshrc b/zsh/.zshrc index 4746037..9a4f2b5 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -284,6 +284,17 @@ _deferred_load() { if [[ -f "$_dotfiles_dir/vault/secrets.enc" ]] && [[ -x "$vault_script" ]]; then eval "$("$vault_script" shell 2>/dev/null)" || true fi + + # Load dotfiles.conf env variables. + DOTFILES_CONF="$HOME/.dotfiles/dotfiles.conf" + + if [[ -f "$DOTFILES_CONF" ]]; then + source $DOTFILES_CONF + else + DOTFILES_DIR="$HOME/.dotfiles" + DOTFILES_BRANCH="main" + fi + } # ============================================================================