several uncommitted changes

[~bandali/configs] / .bashrc

diff --git a/.bashrc b/.bashrc
index 9e3f5e2..321c1de 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -22,26 +22,28 @@ if [ -n "$IS_GUIX_SYSTEM" ]; then
 fi
 
 # from https://unix.stackexchange.com/a/55935
 fi
 
 # from https://unix.stackexchange.com/a/55935

-a_prompt() {
+b_prompt() {

     cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)
     printf $cwd
 }
     cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)
     printf $cwd
 }

-# Adjust the prompt depending on whether we're in 'guix environment'.
-if [ -n "$GUIX_ENVIRONMENT" ]
-then
-    PS1="\u@\h [env] \$(a_prompt)> "
+
+if [ $(id -u) == "0" ]; then
+    PS1='`printf "\[\e[1;31m\]\$\[\e[00m\]"` '

 else
 else

-    PS1="\u@\h \$(a_prompt)> "
+    PS1='\$ '

 fi
 fi

+PS1="\u@\h:\w/`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"

 
 # set terminal title
 
 # set terminal title

-PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(a_prompt)\007"'
+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
 
 # various bash tweaks
 
 # i-beam cursor
 # echo -e "\033[5 q"              # 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
 # append to the history file, don't overwrite it
 shopt -s histappend
 shopt -s cmdhist


@@ -80,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 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() {
 
 aur() {

-   cd ~/usr/builds
+   cd ~/s

    [ -d ${1} ] || git clone https://aur.archlinux.org/${1}.git
    cd ${1}
 }
 
    [ -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
 # separate alias definitions file, if exists
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases


@@ -103,11 +113,15 @@ if ! shopt -oq posix; then
   fi
 fi
 
   fi
 fi
 

-if [ -z "$IS_GUIX_SYSTEM" ]; then
-    if ! pgrep -u "$USER" ssh-agent > /dev/null; then
-        ssh-agent > ~/.ssh-agent-thing
-    fi
-    if [[ ! "$SSH_AUTH_SOCK" ]]; then
-        eval "$(<~/.ssh-agent-thing)"
-    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