From 20581f766f42f90b9e80180e59535abdec1016c5 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Fri, 12 Feb 2016 14:46:59 -0800
Subject: [PATCH] Remove SSH hacks that break things.

---
 dotfiles/bashrc  | 2 ++
 dotfiles/profile | 4 ++++
 dotfiles/zshrc   | 5 ++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index 8107dee..02acf37 100644
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -40,3 +40,5 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
 fi
 
 if [[ -e $HOME/.aliases ]] ; then source $HOME/.aliases ; fi
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
diff --git a/dotfiles/profile b/dotfiles/profile
index d533854..218c72a 100644
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -11,3 +11,7 @@ fi
 unset GPG_AGENT_INFO_PATH
 export GPG_TTY=`tty`
 # End GPG
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index d1e20ab..63b71d4 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -31,9 +31,6 @@ zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
 
 # Load oh-my-zsh
 if [ -d $HOME/.oh-my-zsh ] ; then
-  # Override gnome-keyring
-  unset SSH_AUTH_SOCK
-  unset SSH_AGENT_PID
   ZSH=$HOME/.oh-my-zsh
   ZSH_THEME="matir"
   ZSH_CUSTOM="$HOME/.zsh_custom"
@@ -57,3 +54,5 @@ fi
 
 # Load any local settings
 if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting