From fa57b1f69bac4e7118d16b6df12c50185f63bbfe Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Sun, 10 Apr 2022 03:15:07 -0700 Subject: [PATCH] shell: source env in profile --- .config/shell/profile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.config/shell/profile b/.config/shell/profile index 0e3a7fd..5d7a1dd 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,15 +1,15 @@ #!/bin/sh # shellcheck disable=SC2155 -export PROFILE_LOADED=false +export SHELL_CONFIG_DIR="${SHELL_CONFIG_DIR:-"${XDG_CONFIG_HOME:-"$HOME/.config"}/shell"}" + +. "$SHELL_CONFIG_DIR/env" # set PATH so it includes user's private bin if it exists if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" fi -export SHELL_CONFIG_DIR="${SHELL_CONFIG_DIR:-"${XDG_CONFIG_HOME:-"$HOME/.config"}/shell"}" - # Locales export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 @@ -50,6 +50,8 @@ export VDPAU_DRIVER=va_gl # Fix steam remote play black screen # shellcheck disable=SC2046 export $(dbus-launch) + + # If running in a TTY… if [ "$(tty | sed 's-[0-9]$--g')" = /dev/tty ]; then export IS_TTY=true