Update primary Canonical mail and a few other small tweaks

[~bandali/configs] / .bashrc

diff --git a/.bashrc b/.bashrc
index 4bc8787..5fb69fb 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -24,10 +24,14 @@ fi
 # prompt
 # ------
 
 # prompt
 # ------
 

+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+

 b_prompt() {
     case $TERM in
         xterm*)
 b_prompt() {
     case $TERM in
         xterm*)

-            local TITLEBAR='\[\033]0;\h:\w\007\]'
+            local TITLEBAR="\[\033]0;${debian_chroot:+($debian_chroot) }\h:\w\007\]"

             ;;
         *)
             local TITLEBAR=''
             ;;
         *)
             local TITLEBAR=''


@@ -36,7 +40,8 @@ b_prompt() {
 
     PS1="${TITLEBAR}\
 $([ $(id -u) = "0" ] && printf "\[\e[1;31m\]")\
 
     PS1="${TITLEBAR}\
 $([ $(id -u) = "0" ] && printf "\[\e[1;31m\]")\

-: \h:\w\
+: ${debian_chroot:+($debian_chroot) }\
+\h:\w\

 $([ -n "$GUIX_ENVIRONMENT" ] && printf " [env]")\
  ;\
 $([ $(id -u) = "0" ] && printf "\[\e[00m\]")\
 $([ -n "$GUIX_ENVIRONMENT" ] && printf " [env]")\
  ;\
 $([ $(id -u) = "0" ] && printf "\[\e[00m\]")\


@@ -76,6 +81,11 @@ HISTCONTROL=ignoreboth
 HISTTIMEFORMAT='%F %T '
 stty stop ""
 
 HISTTIMEFORMAT='%F %T '
 stty stop ""
 

+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+

 # enable programmable completion features (not needed if already
 # enabled in /etc/bash.bashrc and if /etc/profile sources
 # /etc/bash.bashrc).
 # enable programmable completion features (not needed if already
 # enabled in /etc/bash.bashrc and if /etc/profile sources
 # /etc/bash.bashrc).


@@ -107,31 +117,43 @@ if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 
     . ~/.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
+alias ls='ls --color=auto'
+alias l='ls -Flh'               # long format and human-readable sizes
+alias ll='l -a'                 # long format, all files

 alias dir='dir --color=auto'
 alias vdir='vdir --color=auto'
 alias grep='grep --color=auto'
 alias dir='dir --color=auto'
 alias vdir='vdir --color=auto'
 alias grep='grep --color=auto'

-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'
+alias egrep='grep -E --color=auto'
+alias fgrep='grep -F --color=auto'

 alias mpv="mpv --ytdl-format=mp4"
 alias mv="mv -iv"
 alias cp="cp -iv"
 alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
 alias getmail='getmail --getmaildir "$XDG_CONFIG_HOME"/getmail --rcfile getmailrc'
 alias mpv="mpv --ytdl-format=mp4"
 alias mv="mv -iv"
 alias cp="cp -iv"
 alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
 alias getmail='getmail --getmaildir "$XDG_CONFIG_HOME"/getmail --rcfile getmailrc'

-alias m="mbsync csclub; mbsync uwaterloo; mbsync shemshak; mbsync gnub"
-alias best="youtube-dl -f best"
+alias m="mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail"

 alias e="$EDITOR"
 alias se="SUDO_EDITOR=\"emacsclient\" sudo -e"
 alias e="$EDITOR"
 alias se="SUDO_EDITOR=\"emacsclient\" sudo -e"

-alias s="startx"
+
+alias alert='notify-send --urgency=low \
+-i "$([ $? = 0 ] && echo terminal || echo error)" \
+"$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'

 
 alias da='change-theme dark'
 alias li='change-theme light'
 
 
 alias da='change-theme dark'
 alias li='change-theme light'
 

+bash_completions_dir=/usr/share/bash-completion/completions/
+

 alias dquilt="quilt --quiltrc=${XDG_CONFIG_HOME}/quilt/quiltrc-dpkg"
 alias dquilt="quilt --quiltrc=${XDG_CONFIG_HOME}/quilt/quiltrc-dpkg"

-. /usr/share/bash-completion/completions/quilt
-complete -F _quilt_completion -o filenames dquilt
+quilt_comps="${bash_completions_dir}/quilt"
+if [ -f "${quilt_comps}" ]; then
+     . "${quilt_comps}"
+     complete -F _quilt_completion -o filenames dquilt
+fi
+
+pass_otp_comps="${bash_completions_dir}/pass-otp"
+if [ -f "${pass_otp_comps}" ]; then
+     . "${pass_otp_comps}"
+fi

 
 function t {
   cd $(mktemp -d /tmp/$1.XXXX)
 
 function t {
   cd $(mktemp -d /tmp/$1.XXXX)