X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=.bashrc;h=4e24d39e902c1f5e124b68c1972a026308f34472;hb=2bd94fb767273d83b6f77db9bc913260ffd6c428;hp=9074f96b256dadb4f1eaf25907d412e6af37d28f;hpb=25a333e8dbc9407e9739ba5e0cbe2d61f07cb970;p=dotfiles.git

diff --git a/.bashrc b/.bashrc
index 9074f96..4e24d39 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,40 +1,34 @@
-STCONTROL=ignoreboth
-HISTSIZE=100000
-HISTFILESIZE=10000
 shopt -s checkwinsize
 shopt -s histappend
-set -o vi
-. /etc/bash_completion
 
-##Variables
-export BROWSER=chromium
+. /usr/share/bash-completion/bash_completion
+
+export TERMINAL=urxvtc
 export EDITOR=vim
-export TERMINAL=urxvt
 export TERM=screen
-export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
-export COLORFGBG="default:default"
-export PYTHONDONTWRITEBYTECODE
-export NOTMUCH_CONFIG=~/.mutt/.notmuch-config
-export TEXMFHOME=~/.texmf
-#
-##Colors yeeeyyyy
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
+export BROWSER=firefox
 
-function getpass {
-	gpg -d -q --use-agent ~/passwd.gpg | grep "^$1" | awk '{print $3}'
-}
+export HISTFILESIZE=10000
+export HISTSIZE=100000
+export HISTCONTROL=ignoreboth
 
-function getuser {
-	gpg -d -q --use-agent ~/passwd.gpg | grep "^$1" | awk '{print $2}'
-}
+export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
+
+export PATH=\
+$PATH:\
+/usr/local/texlive/2014/bin/x86_64-linux:\
+/opt/clean/bin:\
+/opt/MATLAB/2014b/bin
+
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+alias vi=vim
 
-function addaccount {
-	gpg -d -o ~/passwd -q --use-agent ~/passwd.gpg
-	echo -n "user? "
-	read user
-	echo -n "pass? "
-	read pass
-	echo "$1	$user	$pass" >> ~/passwd
-	shred -u -v -z ~/passwd
+set_prompt(){
+	last_c=$?
+	PS1='\u@\h'
+	[[ $last_c -ge 1 ]] && PS1="($last_c) $PS1"
+	PS1="$PS1\w\$ "
 }
+PROMPT_COMMAND='set_prompt'