Understood the difference between .bashrc and .bash_profile (i hope)

3 files changed, 60 insertions, 55 deletions

diff --git a/.bash_logout b/.bash_logout
index 9bccd62..efa6e54 100644
--- a/.bash_logout
+++ b/.bash_logout
@@ -1,2 +1,2 @@
 clear
-reset
+
diff --git a/.bash_profile b/.bash_profile
index 26ba1db..3a02b32 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -4,17 +4,16 @@ export HISTSIZE=8192
 export LANGUAGE="en_GB.UTF-8"
 export PATH=$HOME/.local/bin:$HOME/prog/go/bin:$HOME/.cargo/bin:$PATH
 export SUDO_EDITOR=zile
-export TERMINAL=st
 export VISUAL=emacs
 export ESHELL=bash
 
 export GOPATH=$HOME/prog/go
 export TEXMFHOME=$HOME/.local/share/texlive
 
-export BROWSER=iceweasel
+export BROWSER=firefox
 export XDG_DESKTOP_DIR=$HOME
 export XDG_DOCUMENTS_DIR=$HOME/store
-export XDG_DOWLOAD_DIR=$HOME/store
+export XDG_DOWNLOAD_DIR=$HOME/store/downloads
 export XDG_MUSIC_DIR=$HOME/store/music
 export XDG_PICTURES_DIR=$HOME/picutures
 export XDG_PUBLICSHARE_DIR=$HOME/public
@@ -31,56 +30,6 @@ export LESSHISTFILE="-"
 LS_COLORS='rs=0:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:';
 export LS_COLORS
 
-leftprompt() {
-    e=$?; (( $e )) && r="\[$(tput setaf 1)\]<$e>\[$(tput sgr0)\]" || r="";
-    p=$(echo ${PWD:-?} | sed "s#.*/\(.*\)/\(.*\)#\1/\2#"); # s#$HOME#~# #${PWD##*/}
-    d=$(date +"%H.%M");
-    v=$(vcs);
-    u=#; (( $(id -u) )) && u=\$;
-    PS1="\[$(tput sgr0)\][\[$(tput bold)\]$(whoami)@$(hostname):\[$(tput setaf 30)\]$p\[$(tput sgr0)\]]\
-(\[$(tput setaf 32)\]$d\[$(tput sgr0)\])$r$v\[$(tput rev)\]$u\[$(tput sgr0)\] ";
-}
-
-PROMPT_COMMAND=leftprompt
-
-PS4='[$EPOCHREALTIME]'
-
-alias rm='rm -i'
-alias ls='ls --group-directories-first -vhF --color=always'
-alias hh='cd $HOME'
-alias bk='cd $OLDPWD'
-alias t=tmux
-#alias t="date +%H\ %M\ %S | dc -e '6k???86400/r1440/+r24/+p'"
-
-alias ..='cd ..'
-alias ...='cd ../..'
-alias ....='cd ../../..'
-alias .....='cd ../../../..'
-alias ......='cd ../../../../..'
-
-alias lower="tr '[:upper:]' '[:lower:]'"
-alias upper="tr '[:lower:]' '[:upper:]'"
-alias rot13="tr abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
-alias weather="wget -O - wttr.in/Baltimore?m | less"
-
-mvf() { mv $*; cd $_ ;}
-c() { echo 'scale=13;' $* | bc -l; }
-j() { ce $*; cd `head -n 1 $HOME/.local/share/dir_lst`; }
-hd() { hexdump -e '"%08.8_ax  " 8/1 "%02X " " - " 8/1 "%02X "' -e '"  |" "%_p"' -e '"|\n"' "$@"; }
-mkpw() { cat /dev/urandom | tr -dc "[:print:]" | fold -w `[[ "$2" == "" ]] && echo 16 || echo $2` | head -n `[[ "$1" == "" ]] && echo 1 || echo "$1"` ;}
-
-stty -ixon
 umask 077
 
-set -o emacs
-shopt -s autocd
-shopt -s checkwinsize
-
 eval $(keychain --eval --systemd -q)
-
-if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" == "1" ] ; then
-    startx -- -keeptty
-fi;
-
-# shuf -n 1 ~/store/quotes
-# echo
diff --git a/.bashrc b/.bashrc
index ebb0b03..e3cfee6 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1 +1,57 @@
-source .bash_profile
+source ~/.bash_profile
+
+leftprompt() {
+    e=$?; (( $e )) && r="\[$(tput setaf 1)\]<$e>\[$(tput sgr0)\]" || r="";
+    p=$(echo ${PWD:-?} | sed "s#.*/\(.*\)/\(.*\)#\1/\2#"); # s#$HOME#~# #${PWD##*/}
+    d=$(date +"%H.%M");
+    v=$(vcs);
+    u=#; (( $(id -u) )) && u=\$;
+    # PS1=
+    PS1="\[$(tput sgr0)\][\[$(tput bold)\]\u@\h:\[$(tput setaf 30)\]$p\[$(tput sgr0)\]]\
+(\[$(tput setaf 32)\]$d\[$(tput sgr0)\])$r$v\[$(tput rev)\]$u\[$(tput sgr0)\] ";
+}
+
+PROMPT_COMMAND=leftprompt
+# PS1="$(leftprompt)"
+
+case ${TERM} in
+  xterm*|rxvt*|Eterm|aterm|kterm|gnome*|alacritty)
+     PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+    ;;
+  screen*)
+    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+    ;;
+esac
+
+
+PS4='[$EPOCHREALTIME]'
+
+alias rm='rm -i'
+alias ls='ls --group-directories-first -vhF --color=always'
+alias hh='cd $HOME'
+alias bk='cd $OLDPWD'
+alias t="date +%H\ %M\ %S | dc -e '6k???86400/r1440/+r24/+p'"
+
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
+alias .....='cd ../../../..'
+alias ......='cd ../../../../..'
+
+alias lower="tr '[:upper:]' '[:lower:]'"
+alias upper="tr '[:lower:]' '[:upper:]'"
+alias rot13="tr abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
+alias weather="wget --quiet -O - wttr.in/Berkeley?m"
+
+mvf() { mv $*; cd $_ ;}
+c() { echo 'scale=13;' $* | bc -l; }
+j() { ce $*; cd `head -n 1 $HOME/.local/share/dir_lst`; }
+hd() { hexdump -e '"%08.8_ax  " 8/1 "%02X " " - " 8/1 "%02X "' -e '"  |" "%_p"' -e '"|\n"' "$@"; }
+mkpw() { cat /dev/urandom | tr -dc "[:print:]" | fold -w `[[ "$2" == "" ]] && echo 16 || echo $2` | head -n `[[ "$1" == "" ]] && echo 1 || echo "$1"` ;}
+
+stty -ixon
+umask 077
+
+set -o emacs
+shopt -s autocd
+shopt -s checkwinsize