X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/d99f86cd913e15a2dc5792ca382fb5d4b2abeb7b..515674c5da9237e7a4893b1531642aa65b09c969:/.bashrc?ds=inline

diff --git a/.bashrc b/.bashrc
index f4fa270..7272bd4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,9 +1,16 @@
 # If not running interactively, don't do anything else
 [[ $- != *i* ]] && return
 
+# 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
+# echo -e "\033[6 q"              # non-blinking
 
 # various bash tweaks
 shopt -s histappend
@@ -19,29 +26,31 @@ stty stop ""
 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 shemshak"
+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}
 }
 
 # fzf
-include /usr/share/fzf/key-bindings.bash
-include /usr/share/fzf/completion.bash
+#include /usr/share/fzf/key-bindings.bash
+#include /usr/share/fzf/completion.bash
 
-# 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)> "
+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