Merge branch 'master' of github.com:dopefishh/dotfiles

diff --combined shell/.bashrc
index 91cb2f2,bce6795..7db3f56
--- 1/shell/.bashrc
--- 2/shell/.bashrc
+++ b/shell/.bashrc
@@@ -6,7 -6,7 +6,7 @@@ export HISTSIZE=NOTHIN
  shopt -s histappend
  export PROMPT_COMMAND='history -a'
  
 -export TERMINAL=urxvtc
 +export TERMINAL=~/projects/st/st
  export EDITOR="vim -p"
  export TERM=screen
  export BROWSER=firefox
@@@ -30,8 -30,7 +30,8 @@@ export COLORFGBG="default;default
  alias ls='ls --color=auto'
  alias grep='grep --color=auto'
  alias vi=vim
- alias tmux="tmux -f ~/.config/tmux/config"
 +export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
+ alias tmux='tmux -f ~/.config/tmux/config'
  
  set_prompt(){
        last_c=$?