Auto-sync from catchthesethighs
This commit is contained in:
@@ -23,7 +23,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|||||||
DOTFILES_CONF="$HOME/.dotfiles/dotfiles.conf"
|
DOTFILES_CONF="$HOME/.dotfiles/dotfiles.conf"
|
||||||
|
|
||||||
if [[ -f "$DOTFILES_CONF" ]]; then
|
if [[ -f "$DOTFILES_CONF" ]]; then
|
||||||
source "$DOTFILES_CONF"
|
source $DOTFILES_CONF
|
||||||
else
|
else
|
||||||
DOTFILES_DIR="$HOME/.dotfiles"
|
DOTFILES_DIR="$HOME/.dotfiles"
|
||||||
DOTFILES_BRANCH="main"
|
DOTFILES_BRANCH="main"
|
||||||
|
|||||||
11
zsh/.zshrc
11
zsh/.zshrc
@@ -284,6 +284,17 @@ _deferred_load() {
|
|||||||
if [[ -f "$_dotfiles_dir/vault/secrets.enc" ]] && [[ -x "$vault_script" ]]; then
|
if [[ -f "$_dotfiles_dir/vault/secrets.enc" ]] && [[ -x "$vault_script" ]]; then
|
||||||
eval "$("$vault_script" shell 2>/dev/null)" || true
|
eval "$("$vault_script" shell 2>/dev/null)" || true
|
||||||
fi
|
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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|||||||
Reference in New Issue
Block a user