X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/d355f9979367744a458c39531f85e8e64cc13bbf..cce35acae705899028777fe3e3e0cafe89c13451:/.bashrc?ds=sidebyside

diff --git a/.bashrc b/.bashrc
index bc59480..d8bbe5e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,45 +1,82 @@
-# If not running interactively, don't do anything else
-[[ $- != *i* ]] && return
+# Bash initialization for interactive non-login shells and
+# for remote shells (info "(bash) Bash Startup Files").
 
-[[ $TERM = "eterm-color" || $TERM = "screen" ]] && source ~/.bash_profile
+# Export 'SHELL' to child processes.  Programs such as 'screen'
+# honor it and otherwise use /bin/sh.
+export SHELL
+
+if [[ $- != *i* ]]
+then
+    # We are being invoked from a non-interactive shell.  If this
+    # is an SSH session (as in "ssh host command"), source
+    # /etc/profile so we get PATH and other essential variables.
+    [[ -n "$SSH_CLIENT" ]] && source /etc/profile
+
+    # Don't do anything else.
+    return
+fi
+
+if [ -n "$IS_GUIX_SYSTEM" ]; then
+    # Source the system-wide file.
+    source /etc/bashrc
+fi
 
 # from https://unix.stackexchange.com/a/55935
 a_prompt() {
     cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)
     printf $cwd
 }
-PS1="\u@\h \$(a_prompt)> "
+# Adjust the prompt depending on whether we're in 'guix environment'.
+if [ -n "$GUIX_ENVIRONMENT" ]
+then
+    PS1="\u@\h [env] \$(a_prompt)> "
+else
+    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
+# 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
+# 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=
+# don't put duplicate lines or lines starting with space in the
+# history.
 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 ""
 
 # aliases
-alias ls='ls --color=auto'
+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 g='git'
-include /usr/share/bash-completion/completions/git && __git_complete g _git
+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 scl=systemctl
-alias jcl=journalctl
 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 amin"
-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"
@@ -50,13 +87,18 @@ aur() {
    cd ${1}
 }
 
-# fzf
-include /usr/share/fzf/key-bindings.bash
-include /usr/share/fzf/completion.bash
-
-if ! pgrep -u "$USER" ssh-agent > /dev/null; then
-    ssh-agent > ~/.ssh-agent-thing
+# separate alias definitions file, if exists
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
 fi
-if [[ ! "$SSH_AUTH_SOCK" ]]; then
-    eval "$(<~/.ssh-agent-thing)"
+
+# 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