many small updates

[dotfiles.git] / shell / .bashrc

diff --git a/shell/.bashrc b/shell/.bashrc
index c47ed4f..bf76ff3 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -1,45 +1,36 @@
-shopt -s checkwinsize
-
+# Shell options
+shopt -s checkwinsize histappend globstar
 export HISTCONTROL=erasedups
 export HISTFILESIZE=NOTHING
 export HISTSIZE=NOTHING
-shopt -s histappend
 export PROMPT_COMMAND='history -a'
 
-export TERMINAL=~/projects/st/st
-export EDITOR="vim -p"
-export TERM=screen
-export BROWSER=firefox
-export PAGER=less
-
-export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
-export NOTMUCH_CONFIG=~/.config/notmuch/config
-
-export CLEAN_HOME=/opt/clean
-export PATH=~/.local/bin:$PATH
-export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
-export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin
-export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero:/opt/firefox
-
-export GTK_IM_MODULE=xim
-export QT_IM_MODULE=xim
-
-# transparency in some applications such as mutt
-export COLORFGBG="default;default"
-
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
-alias vi=vim
-alias latexmk='make -f ~/.local/bin/latex.mk'
-export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-alias tmux='tmux -f ~/.config/tmux/config'
+alias vi='vim'
+alias svn="svn --config-dir \"${XDG_CONFIG_HOME:-$HOME/.config}\"/subversion"
+alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
+alias tudu="tudu -c \"${XDG_CONFIG_HOME:-$HOME/.config}/tudu/config\""
 
-. /etc/bash_completion
+if [ -f /etc/bash_completion ]
+then
+       . /etc/bash_completion
+fi
 
 set_prompt(){
        last_c=$?
-       PS1='\u@\h'
+       PS1='\H'
        [[ $last_c -ge 1 ]] && PS1="($last_c) $PS1"
-       PS1="$PS1\w\$ "
+       if [[ -n "$SCHROOT_CHROOT_NAME" ]]
+       then
+               PS1="($SCHROOT_CHROOT_NAME)$PS1"
+       fi
+       if [[ "$COLUMNS" -le 80 ]]
+       then
+               PS1="$PS1 $(echo "$PWD" | sed -e 's|'"$HOME"'|~|g' -e 's|\([^/][^/]\)[^\/]\{3,\}\/|\1..\/|g')"
+       else
+               PS1="$PS1\w"
+       fi
+       PS1="$PS1\$ "
 }
 PROMPT_COMMAND='set_prompt'