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

diff --cc shell/.bashrc
index 91cb2f2,bce6795..7db3f56
--- 1/shell/.bashrc
--- 2/shell/.bashrc
+++ b/shell/.bashrc
@@@ -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=$?