X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/178f98e1b1a290f6b68313bb01d215fe1b2852e1..74be7f18d68948367de54170342caa7bf5d29a56:/.bashrc?ds=sidebyside

diff --git a/.bashrc b/.bashrc
index 9e3f5e2..a48c605 100644
--- a/.bashrc
+++ b/.bashrc
@@ -22,24 +22,24 @@ if [ -n "$IS_GUIX_SYSTEM" ]; then
 fi
 
 # from https://unix.stackexchange.com/a/55935
-a_prompt() {
+b_prompt() {
     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
-    PS1="\u@\h \$(a_prompt)> "
+    PS1='\$ '
 fi
+PS1="\u@\h:\w/`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"
 
 # 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
+echo -e "\033[6 q"              # non-blinking
 
 # various bash tweaks
 # append to the history file, don't overwrite it
@@ -87,6 +87,10 @@ aur() {
    cd ${1}
 }
 
+function t {
+  cd $(mktemp -d /tmp/$1.XXXX)
+}
+
 # separate alias definitions file, if exists
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
@@ -103,11 +107,16 @@ if ! shopt -oq posix; then
   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}/.desktop-profile"
+               "${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