git: use gpg (not gpg2) as the gpg executable

[~bandali/configs] / .bashrc

diff --git a/.bashrc b/.bashrc
index 5928570..7272bd4 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,8 +1,6 @@
 # If not running interactively, don't do anything else
 [[ $- != *i* ]] && return
 
 # 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)
 # from https://unix.stackexchange.com/a/55935
 a_prompt() {
     cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)


@@ -12,7 +10,7 @@ PS1="\u@\h \$(a_prompt)> "
 
 # 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


@@ -28,19 +26,17 @@ 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 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 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 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 mb="mbsync csclub; mbsync uwaterloo; mbsync shemshak"

 alias gm="getmail"
 alias m="mb; gm"
 alias best="youtube-dl -f best"
 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
 
 aur() {
    cd ~/usr/builds


@@ -49,8 +45,8 @@ aur() {
 }
 
 # fzf
 }
 
 # 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

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