X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/58a81de3fd19f05e7b213502bd5d22cf70505f15..4512005a215503d30ff49d45782d8c865f7fef8e:/.bashrc

diff --git a/.bashrc b/.bashrc
index cce2dc8..bc59480 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,39 +1,62 @@
+# If not running interactively, don't do anything else
+[[ $- != *i* ]] && return
+
+[[ $TERM = "eterm-color" || $TERM = "screen" ]] && source ~/.bash_profile
+
+# 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)> "
+
+# i-beam cursor
+# echo -e "\033[5 q"              # blinking
+echo -e "\033[6 q"              # non-blinking
+
 # various bash tweaks
 shopt -s histappend
 shopt -s cmdhist
 HISTSIZE=
 HISTFILESIZE=
 HISTCONTROL=ignoreboth
-HISTIGNORE='ls:l:s:bg:fg:history'
+HISTIGNORE='ls:l:s:g:[bf]g:history'
 HISTTIMEFORMAT='%F %T '
 stty stop ""
 
 # aliases
 alias ls='ls --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 mpv="mpv --ytdl-format mp4"
 alias mv="mv -iv"
 alias cp="cp -iv"
 alias scl=systemctl
 alias jcl=journalctl
-alias m="mbsync csclub; mbsync uwaterloo; mbsync amin"
+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 best="youtube-dl -f best"
+alias e="$EDITOR"
+alias se="SUDO_EDITOR=\"emacsclient\" sudo -e"
 
 aur() {
    cd ~/usr/builds
-   git clone https://aur.archlinux.org/${1}.git
+   [ -d ${1} ] || git clone https://aur.archlinux.org/${1}.git
    cd ${1}
 }
 
-# i-beam cursor
-# echo -e "\033[5 q"              # blinking
-echo -e "\033[6 q"              # non-blinking
-
-
-# If not running interactively, don't do anything else
-[[ $- != *i* ]] && return
+# fzf
+include /usr/share/fzf/key-bindings.bash
+include /usr/share/fzf/completion.bash
 
-a_prompt() {
-    cwd=$(pwd | sed -e "s!$HOME!~!" | sed -re "s!([^/])[^/]+/!\1/!g")
-    printf $cwd
-}
-PS1="\u@\h \$(a_prompt)> "
+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