emacs: minor tweaks

[~bandali/configs] / .bashrc

diff --git a/.bashrc b/.bashrc
index a5cc322..e581cd3 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,16 +1,40 @@
-# 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").
+
+# 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
+
+# Source the system-wide file.
+source /etc/bashrc

 
 # from https://unix.stackexchange.com/a/55935
 a_prompt() {
     cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)
     printf $cwd
 }
 
 # 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

 
 # i-beam cursor
 # echo -e "\033[5 q"              # blinking
 
 # 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
 
 # various bash tweaks
 shopt -s histappend


@@ -23,18 +47,21 @@ HISTTIMEFORMAT='%F %T '
 stty stop ""
 
 # aliases
 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 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 grep='grep --color=auto'

 alias mpv="mpv --ytdl-format mp4"
 alias mv="mv -iv"
 alias cp="cp -iv"
 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 best="youtube-dl -f best"

+alias e="$EDITOR"
+alias se="SUDO_EDITOR=\"emacsclient\" sudo -e"

 
 aur() {
    cd ~/usr/builds
 
 aur() {
    cd ~/usr/builds


@@ -42,13 +69,11 @@ aur() {
    cd ${1}
 }
 
    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
-fi
-if [[ ! "$SSH_AUTH_SOCK" ]]; then
-    eval "$(<~/.ssh-agent-thing)"
+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
 fi