X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bash_profile;h=da0b8fbf838a73d54b5f9c5676fba1600fba4eeb;hb=HEAD;hp=31f6bb55685d37d85ae191b2e3c89706bedcf8a7;hpb=af350005c4b952803f558a22ef9ed82648c4cc45;p=max%2Fdotfiles.git diff --git a/bash/.bash_profile b/bash/.bash_profile index 31f6bb5..da0b8fb 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1,44 +1,10 @@ -export EDITOR="vim" -export PATH="/home/max/.local/bin:${PATH}" -export TMPDIR="/home/max/.local/tmp" - -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi -fi - -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion +if [ -r ~/.profile ]; then + . ~/.profile; fi -export PATH="$HOME/.cargo/bin:$PATH" - -if test -z "${XDG_RUNTIME_DIR}"; then - export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir - if ! test -d "${XDG_RUNTIME_DIR}"; then - mkdir "${XDG_RUNTIME_DIR}" - chmod 0700 "${XDG_RUNTIME_DIR}" - fi -fi - -export QT_QPA_PLATFORM=wayland-egl - -if [ -f ~/.config/sway/config.base ]; then - cat ~/.config/sway/config.base ~/.config/sway/config.${HOSTNAME} > ~/.config/sway/config -fi - -if [ -f ~/.Xresources ]; then - cat ~/.Xresources > ~/.Xdefaults - if [ -f ~/.Xresources.$HOSTNAME ]; then - cat ~/.Xresources.$HOSTNAME >> ~/.Xdefaults - fi -fi - - -if [ $HOSTNAME = "magnesium" ]; then - export XKB_DEFAULT_LAYOUT=us - export XKB_DEFAULT_VARIANT=colemak - export XKB_DEFAULT_OPTIONS=caps:ctrl_modifier -fi +case "$-" in *i*) + if [ -r ~/.bashrc ]; then + . ~/.bashrc + fi + ;; +esac