Merge branch 'master' of rmz.io:dotfiles

[dotfiles.git] / bashrc

diff --git a/bashrc b/bashrc
index 5fdb7edb8ac3c16d84056a45de3316228e513701..d60f87fc061df40d4c4194a335f85d4a87b32213 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -1,5 +1,3 @@
-xhost +local:root > /dev/null 2>&1
-
 shopt -s cdspell
 shopt -s checkwinsize
 shopt -s cmdhist
@@ -10,6 +8,7 @@ shopt -s histappend
 shopt -s hostcomplete
 # shopt -s nocaseglob # never! lost a file cause of this shit
 
+export HISTFILE=$XDG_CACHE_HOME/bash_history
 export HISTSIZE=10000
 export HISTFILESIZE=${HISTSIZE}
 export HISTCONTROL=ignoreboth
@@ -51,10 +50,7 @@ PS1='[\u@\h \W]\$ '
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
 # Alias definitions.
-[[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
+[[ -f $XDG_CONFIG_HOME/aliases ]] && . $XDG_CONFIG_HOME/aliases
 
 # set PATH so it includes user's private bin if it exists
 [[ -d "$HOME/bin" ]] && PATH="$HOME/bin:$PATH"
-
-# import host specific bashrc
-[[ -f "~/.bashrc_$(hostname)" ]] . "~/.bashrc_$(hostname)"