From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 17 Apr 2018 05:44:23 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=4ec32116d32f8b4457fffc431b9c2828be54e19c;p=dotfiles.git

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

4ec32116d32f8b4457fffc431b9c2828be54e19c
diff --cc shell/.bashrc
index 91cb2f2,bce6795..7db3f56
--- a/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=$?