From 2fb49213ca17089b583c8bdb3f62ba140c9c9723 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@kelar.org>
Date: Sat, 7 May 2022 15:01:02 -0400
Subject: [PATCH] * .bashrc: reorganize, and update prompt

---
 .bashrc | 113 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 60 insertions(+), 53 deletions(-)

diff --git a/.bashrc b/.bashrc
index 471b1a4..b0cbd85 100644
--- a/.bashrc
+++ b/.bashrc
@@ -21,27 +21,39 @@ if [ -n "$IS_GUIX_SYSTEM" ]; then
     source /etc/bashrc
 fi
 
-# from https://unix.stackexchange.com/a/55935
+# prompt
+# ------
+
 b_prompt() {
-    cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)
-    printf $cwd
+    case $TERM in
+        xterm*)
+            local TITLEBAR='\[\033]0;\h:\w\007\]'
+            ;;
+        *)
+            local TITLEBAR=''
+            ;;
+    esac
+
+    PS1="${TITLEBAR}\
+$([ $(id -u) = "0" ] && printf "\[\e[1;31m\]")\
+: \h:\w\
+$([ -n "$GUIX_ENVIRONMENT" ] && printf " [env]")\
+ ;\
+$([ $(id -u) = "0" ] && printf "\[\e[00m\]")\
+ "
 }
+b_prompt
 
-if [ $(id -u) == "0" ]; then
-    PS1='`printf "\[\e[1;31m\]\$\[\e[00m\]"` '
-else
-    PS1='\$ '
-fi
-PS1="\u@\h:\w/`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"
+# cursor
+# ------
 
-# set terminal title
-PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(b_prompt)\007"'
+# i-beam cursor (uncomment one of the two):
+# echo -e "\033[5 q"    # blinking
+# echo -e "\033[6 q"    # non-blinking
 
-# i-beam cursor
-# echo -e "\033[5 q"              # blinking
-# echo -e "\033[6 q"              # non-blinking
+# general configuration and completions
+# -------------------------------------
 
-# various bash tweaks
 # disallow overwriting existing file using redirection
 set -o noclobber
 # append to the history file, don't overwrite it
@@ -60,11 +72,41 @@ HISTFILESIZE=
 # history.
 HISTCONTROL=ignoreboth
 # ignore a few very common commands and don't add them to history
-HISTIGNORE='ls:l:ll:s:g:[bf]g:history:da:li'
+#HISTIGNORE='ls:l:ll:s:g:[bf]g:history:da:li'
 HISTTIMEFORMAT='%F %T '
 stty stop ""
 
-# aliases
+# enable programmable completion features (not needed if already
+# enabled in /etc/bash.bashrc and if /etc/profile sources
+# /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+# source Guix shell config dirs, for vte.sh and bash completions
+GUIX_PROFILES=("${HOME}/.guix-profile"
+               "${HOME}/.config/guix/current")
+for profile in "${GUIX_PROFILES[@]}"; do
+    for dir in "${profile}/etc/bash_completion.d" "${profile}/etc/profile.d"; do
+        if [ -d "${dir}" ]; then
+            for f in "${dir}"/*; do
+                . $f
+            done
+        fi
+    done
+done
+
+# aliases and functions
+# ---------------------
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
 alias ls='ls -p --color=auto'
 alias l='ls -lh'                # long format and human-readable sizes
 alias ll='l -A'                 # long format, all files
@@ -73,7 +115,7 @@ alias vdir='vdir --color=auto'
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
-alias mpv="mpv --ytdl-format mp4"
+alias mpv="mpv --ytdl-format=mp4"
 alias mv="mv -iv"
 alias cp="cp -iv"
 alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
@@ -90,41 +132,6 @@ alias li='change-theme light'
 alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
 complete -F _quilt_completion -o filenames dquilt
 
-aur() {
-   cd ~/s
-   [ -d ${1} ] || git clone https://aur.archlinux.org/${1}.git
-   cd ${1}
-}
-
 function t {
   cd $(mktemp -d /tmp/$1.XXXX)
 }
-
-# separate alias definitions file, if exists
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (not needed if already
-# enabled in /etc/bash.bashrc and if /etc/profile sources
-# /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-# source Guix shell config dirs, for vte.sh and bash completions
-GUIX_PROFILES=("${HOME}/.guix-profile"
-               "${HOME}/.config/guix/current")
-for profile in "${GUIX_PROFILES[@]}"; do
-    for dir in "${profile}/etc/bash_completion.d" "${profile}/etc/profile.d"; do
-        if [ -d "${dir}" ]; then
-            for f in "${dir}"/*; do
-                . $f
-            done
-        fi
-    done
-done
-- 
2.20.1