X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=shell%2F.bashrc;h=e84f4e173cfb55fe3ab8eb2c9c4ad5731426e3dc;hb=3204decf4f5e3c96c02055af97a83a3f19f4d49d;hp=d5e443b6073546f02dbcfd965216c9e3a5b10340;hpb=ec1f37d52d491d731b8b3463d8704102256a30ca;p=dotfiles.git

diff --git a/shell/.bashrc b/shell/.bashrc
index d5e443b..e84f4e1 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -1,25 +1,32 @@
-shopt -s checkwinsize
+shopt -s checkwinsize histappend globstar
 
 export HISTCONTROL=erasedups
 export HISTFILESIZE=NOTHING
 export HISTSIZE=NOTHING
-shopt -s histappend
 export PROMPT_COMMAND='history -a'
 
-export TERMINAL=urxvtc
+export TERMINAL=~/projects/st/st
 export EDITOR="vim -p"
 export TERM=screen
 export BROWSER=firefox
 export PAGER=less
 
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
-export NOTMUCH_CONFIG=~/.config/notmuch/config
+
+# 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"
 
 export CLEAN_HOME=/opt/clean
+
 export PATH=~/.local/bin:$PATH
 export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
-export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin
-export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero
+export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin
+
+export MANPATH=~/.local/share/man:$MANPATH
 
 export GTK_IM_MODULE=xim
 export QT_IM_MODULE=xim
@@ -27,10 +34,14 @@ export QT_IM_MODULE=xim
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias vi=vim
+alias latexmk='make -f ~/.local/bin/latex.mk'
+alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown"
+
+. /etc/bash_completion
 
 set_prompt(){
 	last_c=$?
-	PS1='\u@\h'
+	PS1='\H'
 	[[ $last_c -ge 1 ]] && PS1="($last_c) $PS1"
 	PS1="$PS1\w\$ "
 }