diff --git a/bash/.bash_aliases b/bash/.bash_aliases index c994247..b703f8a 100644 --- a/bash/.bash_aliases +++ b/bash/.bash_aliases @@ -20,4 +20,13 @@ alias config='/usr/bin/git --git-dir=/home/kapper/.cfg/ --work-tree=/home/kapper export EDITOR='/usr/bin/vim' export VISUAL='/usr/bin/vim' +export TERMINAL='urxvt -e tmux' +export PROMPT_COMMAND="$TMUX_GITBAR_DIR/update-gitbar; $PROMPT_COMMAND" + +if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then + exec tmux +fi +eval "$(dircolors ~/.dir_colors)" +export LS_COLORS="di=1;34:ln=31;47:so=32:pi=33:ex=1;32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43" + diff --git a/bash/.bashrc b/bash/.bashrc index be28525..98919f2 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,14 +1,14 @@ # ~/.bashrc: executed by bash(1) for non-login shells. # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) # for examples - - # If not running interactively, don't do anything case $- in *i*) ;; *) return;; esac +unset PROMPT_COMMAND + # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options HISTCONTROL=ignoreboth