X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=shell%2F.bashrc;h=a2db35759a12bf8841ff637c497d9c70ecf619a2;hb=56e90aed1c4098aa7d33d039cef2be5bf180e6f7;hp=43c5087ce3820c54f1af68c0605104679243175f;hpb=7d26c31904f426d28913aed8ba7ede20fb0c496d;p=dotfiles.git

diff --git a/shell/.bashrc b/shell/.bashrc
index 43c5087..a2db357 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -1,9 +1,9 @@
-shopt -s checkwinsize
+shopt -s checkwinsize histappend globstar
 
+export MESA_LOADER_DRIVER_OVERRIDE=i965
 export HISTCONTROL=erasedups
 export HISTFILESIZE=NOTHING
 export HISTSIZE=NOTHING
-shopt -s histappend
 export PROMPT_COMMAND='history -a'
 
 export TERMINAL=~/projects/st/st
@@ -13,33 +13,51 @@ export BROWSER=firefox
 export PAGER=less
 
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
-export NOTMUCH_CONFIG=~/.config/notmuch/config
 
-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/2018/bin/x86_64-linux
+# XDG fixes
+alias svn="svn --config-dir \"${XDG_CONFIG_HOME:-$HOME/.config}\"/subversion"
+alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
+alias tudu="tudu -c \"${XDG_CONFIG_HOME:-$HOME/.config}/tudu/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 PATH=~/.local/bin:~/.nitrile/bin:~/.cabal/bin:/opt/firefox:$PATH
+export PATH=/opt/texlive/2024/bin/x86_64-linux:$PATH
+export PATH=/opt/Zotero_linux-x86_64:$PATH
+export PATH=/opt/arduino/arduino-1.8.19:$PATH
 
-export GTK_IM_MODULE=xim
-export QT_IM_MODULE=xim
+export MANPATH=~/.local/share/man:/opt/texlive/2024/texmf-dist/doc/man:/opt/arduino/java/man:$MANPATH
+export INFOPATH=/opt/texlive/2024/texmf-dist/doc/info:$INFOPATH
 
-# transparency in some applications such as mutt
-export COLORFGBG="default;default"
+#export GTK_IM_MODULE=xim
+#export QT_IM_MODULE=xim
+#export QT_QPA_PLATFORMTHEME=qt5ct
 
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
-alias vi=vim
-alias latexmk='make -f ~/.local/bin/latex.mk'
-export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-alias tmux='tmux -f ~/.config/tmux/config'
+alias vi='vim'
+alias kmfbmagp=tmuxmail
 
-. /etc/bash_completion
+if [ -f /etc/bash_completion ]
+then
+	. /etc/bash_completion
+fi
 
 set_prompt(){
 	last_c=$?
 	PS1='\H'
 	[[ $last_c -ge 1 ]] && PS1="($last_c) $PS1"
-	PS1="$PS1\w\$ "
+	if [[ -n "$SCHROOT_CHROOT_NAME" ]]
+	then
+		PS1="($SCHROOT_CHROOT_NAME)$PS1"
+	fi
+	if [[ "$COLUMNS" -le 80 ]]
+	then
+		PS1="$PS1 $(echo "$PWD" | sed -e 's|'"$HOME"'|~|g' -e 's|\([^/][^/]\)[^\/]\{3,\}\/|\1..\/|g')"
+	else
+		PS1="$PS1\w"
+	fi
+	PS1="$PS1\$ "
 }
 PROMPT_COMMAND='set_prompt'