* .config/git/config: Small tweaks.

[~bandali/configs] / .bashrc

diff --git a/.bashrc b/.bashrc
index 222a939..4bc8787 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -21,27 +21,41 @@ if [ -n "$IS_GUIX_SYSTEM" ]; then
     source /etc/bashrc
 fi
 
     source /etc/bashrc
 fi
 

-# from https://unix.stackexchange.com/a/55935
+# prompt
+# ------
+

 b_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
 shopt -s histappend
 shopt -s cmdhist
 # append to the history file, don't overwrite it
 shopt -s histappend
 shopt -s cmdhist


@@ -58,45 +72,10 @@ HISTFILESIZE=
 # history.
 HISTCONTROL=ignoreboth
 # ignore a few very common commands and don't add them to history
 # history.
 HISTCONTROL=ignoreboth
 # ignore a few very common commands and don't add them to history

-HISTIGNORE='ls:l:s:g:[bf]g:history'
+#HISTIGNORE='ls:l:ll:s:g:[bf]g:history:da:li'

 HISTTIMEFORMAT='%F %T '
 stty stop ""
 
 HISTTIMEFORMAT='%F %T '
 stty stop ""
 

-# aliases
-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 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 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 e="$EDITOR"
-alias se="SUDO_EDITOR=\"emacsclient\" sudo -e"
-alias s="startx"
-
-aur() {
-   cd ~/usr/builds
-   [ -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).
 # enable programmable completion features (not needed if already
 # enabled in /etc/bash.bashrc and if /etc/profile sources
 # /etc/bash.bashrc).


@@ -120,3 +99,40 @@ for profile in "${GUIX_PROFILES[@]}"; do
         fi
     done
 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
+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 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 e="$EDITOR"
+alias se="SUDO_EDITOR=\"emacsclient\" sudo -e"
+alias s="startx"
+
+alias da='change-theme dark'
+alias li='change-theme light'
+
+alias dquilt="quilt --quiltrc=${XDG_CONFIG_HOME}/quilt/quiltrc-dpkg"
+. /usr/share/bash-completion/completions/quilt
+complete -F _quilt_completion -o filenames dquilt
+
+function t {
+  cd $(mktemp -d /tmp/$1.XXXX)
+}