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

diff --combined shell/.bashrc
index 55be0b5,e627663..8e1a66a
--- 1/shell/.bashrc
--- 2/shell/.bashrc
+++ b/shell/.bashrc
@@@ -9,11 -9,13 +9,13 @@@ export TERMINAL=~/projects/st/s
  export EDITOR="vim -p"
  export TERM=screen
  export BROWSER=firefox
 -export PAGER=more
 +export PAGER=less
  
  export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
  
  # XDG fixes
+ alias svn="svn --config-dir \"${XDG_CONFIG_HOME:-$HOME/.config}\"/subversion"
+ alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
  export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"/notmuch/config
  export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}"/pass
  export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
@@@ -31,7 -33,6 +33,6 @@@ alias ls='ls --color=auto
  alias grep='grep --color=auto'
  alias vi=vim
  alias latexmk='make -f ~/.local/bin/latex.mk'
- alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
  alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown"
  
  . /etc/bash_completion