shell: fix up profile to correctly use user’s local guix

[~bandali/configs] / .bashrc

diff --git a/.bashrc b/.bashrc
index e581cd3..9e3f5e2 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -16,8 +16,10 @@ then
     return
 fi
 
     return
 fi
 

-# Source the system-wide file.
-source /etc/bashrc
+if [ -n "$IS_GUIX_SYSTEM" ]; then
+    # Source the system-wide file.
+    source /etc/bashrc
+fi

 
 # from https://unix.stackexchange.com/a/55935
 a_prompt() {
 
 # from https://unix.stackexchange.com/a/55935
 a_prompt() {


@@ -32,16 +34,30 @@ else
     PS1="\u@\h \$(a_prompt)> "
 fi
 
     PS1="\u@\h \$(a_prompt)> "
 fi
 

+# set terminal title
+PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(a_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

+# append to the history file, don't overwrite it

 shopt -s histappend
 shopt -s cmdhist
 shopt -s histappend
 shopt -s cmdhist

+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)

 HISTSIZE=
 HISTFILESIZE=
 HISTSIZE=
 HISTFILESIZE=

+# don't put duplicate lines or lines starting with space in the
+# history.

 HISTCONTROL=ignoreboth
 HISTCONTROL=ignoreboth

+# ignore a few very common commands and don't add them to history

 HISTIGNORE='ls:l:s:g:[bf]g:history'
 HISTTIMEFORMAT='%F %T '
 stty stop ""
 HISTIGNORE='ls:l:s:g:[bf]g:history'
 HISTTIMEFORMAT='%F %T '
 stty stop ""


@@ -50,15 +66,17 @@ stty stop ""
 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 -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 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 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 mb="mbsync csclub; mbsync uwaterloo; mbsync shemshak"
-alias gm="getmail"
-alias m="mb; gm"
+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"


@@ -69,6 +87,22 @@ aur() {
    cd ${1}
 }
 
    cd ${1}
 }
 

+# 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).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+

 if [ -z "$IS_GUIX_SYSTEM" ]; then
     if ! pgrep -u "$USER" ssh-agent > /dev/null; then
         ssh-agent > ~/.ssh-agent-thing
 if [ -z "$IS_GUIX_SYSTEM" ]; then
     if ! pgrep -u "$USER" ssh-agent > /dev/null; then
         ssh-agent > ~/.ssh-agent-thing