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

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

8ec6941067b3d666a327349af605cc97d1a52bdc
diff --cc shell/.bashrc
index 7db3f56,6e186aa..77c7afa
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@@ -30,9 -30,10 +30,11 @@@ export COLORFGBG="default;default
  alias ls='ls --color=auto'
  alias grep='grep --color=auto'
  alias vi=vim
 +export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
  alias tmux='tmux -f ~/.config/tmux/config'
  
+ . /etc/bash_completion
+ 
  set_prompt(){
  	last_c=$?
  	PS1='\u@\h'