xdg: switch back to the ~/usr/ prefix

[~bandali/configs] / .bashrc

diff --git a/.bashrc b/.bashrc
index f7cbfc8..321c1de 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -32,18 +32,18 @@ if [ $(id -u) == "0" ]; then
 else
     PS1='\$ '
 fi
-PS1="`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"
-__u='`[ \`id -u\` == "0" ] && printf "\[\e[1;31m\]\u\[\e[00m\]" || printf "\u"`'
-PS1="$__u@\h:\w/$PS1"
+PS1="\u@\h:\w/`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"
 
 # set terminal title
 PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(b_prompt)\007"'
 
 # i-beam cursor
 # echo -e "\033[5 q"              # blinking
-echo -e "\033[6 q"              # non-blinking
+# echo -e "\033[6 q"              # non-blinking
 
 # 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
@@ -82,13 +82,21 @@ 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 dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
+complete -F _quilt_completion -o filenames dquilt
 
 aur() {
-   cd ~/usr/builds
+   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
@@ -104,3 +112,16 @@ if ! shopt -oq posix; 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