diff --git a/files/bashrc b/files/bashrc index d770843..d3f10e4 100644 --- a/files/bashrc +++ b/files/bashrc @@ -7,7 +7,8 @@ while read -r f; do [ -f "$f" ] && source "$f"; done </dev/null +# Source extra configurations if available. _source_extra_configs() { local configs=( /usr/local/etc/profile.d/bash_completion.sh /usr/share/bash-completion/bash_completion - $LOCAL_CONFIG/bash/* + $HOME/.local/etc/bash/* ) local f for f in ${configs[@]}; do [ -f "$f" ] && source "$f"; done diff --git a/files/profile.sh b/files/profile.sh index 41fd66d..79a8368 100644 --- a/files/profile.sh +++ b/files/profile.sh @@ -1,10 +1,12 @@ #!/bin/sh # Environment variables are set here for login shells. +# Keep things organized. export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" +# General environment settings. export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" export LANG="en_US.UTF-8" export LANGUAGE="en_US" @@ -13,7 +15,6 @@ export LC_CTYPE="en_US.UTF-8" export LESS="-i -j.49 -M -R -z-2" export LESSHISTFILE="$XDG_DATA_HOME/less/history" export LESSHISTSIZE=1000 -export LOCAL_CONFIG="$HOME/.local/etc" export LOCAL_PREFIX="/usr/local" export PAGER=less export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py" diff --git a/files/zshrc b/files/zshrc index eb77912..284c437 100644 --- a/files/zshrc +++ b/files/zshrc @@ -1,13 +1,15 @@ #!/bin/zsh # Set up zsh for interactive use (options, prompt, aliases, etc.) +# Source additional configurations if available. while read -r f; do [ -f "$f" ] && source "$f"; done <