diff --git a/base/.bashrc b/base/.bashrc index 883e071..901ca16 100644 --- a/base/.bashrc +++ b/base/.bashrc @@ -2,6 +2,12 @@ # If not running interactively, don't do anything [ -z "$PS1" ] && return +if [[ ! $__PROFILE_LOADED__ ]]; then + . "${HOME}/.profile" +fi + +unset __PROFILE_LOADED__ + if [[ -f "${XDG_CONFIG_HOME}/bash/prompt.sh" ]]; then # shellcheck disable=SC1090 source "${XDG_CONFIG_HOME}/bash/prompt.sh" diff --git a/base/.profile b/base/.profile index f1d7d72..3433280 100644 --- a/base/.profile +++ b/base/.profile @@ -51,6 +51,8 @@ fi unset env_file +export __PROFILE_LOADED__=true + if [ -d "${XDG_CONFIG_HOME}/profile/profile.d" ]; then for file in "${XDG_CONFIG_HOME}"/profile/profile.d/*.sh; do if [ -r "$file" ]; then