X-Git-Url: https://code.kerkeslager.com/?p=dotfiles;a=blobdiff_plain;f=.bashrc;h=80aa76eff429abdc0fb6b162f666b9a30dd89ffd;hp=f0ab9cf8ded172a05960b50a31026ef230b07cea;hb=1d94c70ba8bbccb35fc57014ffc6c7f802c9572a;hpb=d23fa73e1e3be9862f5ceb9d0062bc97db54226e

diff --git a/.bashrc b/.bashrc
index f0ab9cf..80aa76e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -46,6 +46,8 @@ fi
 
 alias emacs='emacs -nw'
 alias serve='python -m SimpleHTTPServer 8080'
+alias gpg='gpg2'
+alias gnupg='gnupg2'
 
 export SVN_EDITOR=vim
 
@@ -76,19 +78,6 @@ fi
 PATH="/usr/local/bin:$PATH"
 export PATH
 
-# Run a machine-specific bashrc (if it exists).
-if [ -f $HOME/.bashrc_local ]; then
-	source $HOME/.bashrc_local
-fi
-
-# Install RVM if it's not installed.
-if [ ! -f $HOME/.rvm/scripts/rvm ]; then
-    bash -s stable < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer )
-fi
-
-# Load RVM into shell session.
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
-
 # Automatically open screen.
 # The if statement prevents it from recursing (since screen opens bash).
 if [ $TERM != screen ]; then