X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=shell%2F.bashrc;h=3cb3c7cca76d09ad46f82bf2640d4c13985f9596;hb=c94b5c084a07c28fcefabb4daa7f83d4a0749c06;hp=e199fb4d87d0c386a5d16a345cab3c3d623ef2b1;hpb=597705ad735abef3def5a356f6e329eb2a978020;p=dotfiles.git

diff --git a/shell/.bashrc b/shell/.bashrc
index e199fb4..3cb3c7c 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -1,31 +1,44 @@
-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 EDITOR=vim
+export TERMINAL=~/projects/st/st
+export EDITOR="vim -p"
 export TERM=screen
 export BROWSER=firefox
-export PAGER=less
+export PAGER=more
 
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
-export NOTMUCH_CONFIG=/home/mart/.mutt/notmuch-config
 
-export CLEAN_HOME=~/projects/clean-itasks
-export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin:~/.local/bin
+# XDG fixes
+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:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin
+
+export GTK_IM_MODULE=xim
+export QT_IM_MODULE=xim
 
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
-alias vi='vim'
-alias autoclean='sudo pacman -R $(pacman -Qtdq)'
+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
 
 set_prompt(){
 	last_c=$?
-	PS1='\u@\h'
+	PS1='\H'
 	[[ $last_c -ge 1 ]] && PS1="($last_c) $PS1"
 	PS1="$PS1\w\$ "
 }