X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=shell%2F.bashrc;h=a2db35759a12bf8841ff637c497d9c70ecf619a2;hb=56e90aed1c4098aa7d33d039cef2be5bf180e6f7;hp=9ea8e2669dc38ec71bee56a82cbe148b39d6c6db;hpb=6b1ae31fff239fd2223223acf861b71f829ee858;p=dotfiles.git

diff --git a/shell/.bashrc b/shell/.bashrc
index 9ea8e26..a2db357 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -22,29 +22,22 @@ 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"
 
-if [ "$SCHROOT_CHROOT_NAME" = "x86" ]
-then
-	export CLEAN_HOME=/opt/clean-x86
-else
-	export CLEAN_HOME=/opt/clean-x64
-fi
-
-export PATH=$CLEAN_HOME/bin:~/.local/bin:$PATH
-export PATH=/opt/texlive/2021/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin:/opt/firefox:$PATH
+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 MANPATH=~/.local/share/man:/opt/texlive/2021/texmf-dist/doc/man:/opt/arduino/java/man:$MANPATH
+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
 
 #export GTK_IM_MODULE=xim
 #export QT_IM_MODULE=xim
 #export QT_QPA_PLATFORMTHEME=qt5ct
 
-export NNTPSERVER=news.tweak.nl
-alias slrn="slrn -i \"${XDG_CONFIG_HOME:-$HOME/.config}/slrn/slrnrc\""
-
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
-alias vi='vim --servername VIM'
-alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown"
+alias vi='vim'
+alias kmfbmagp=tmuxmail
 
 if [ -f /etc/bash_completion ]
 then
@@ -57,9 +50,14 @@ set_prompt(){
 	[[ $last_c -ge 1 ]] && PS1="($last_c) $PS1"
 	if [[ -n "$SCHROOT_CHROOT_NAME" ]]
 	then
-		PS1="($SCHROOT_CHROOT_NAME)$PS1\w\$ "
+		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\$ "
+		PS1="$PS1\w"
 	fi
+	PS1="$PS1\$ "
 }
 PROMPT_COMMAND='set_prompt'