From 089261264f66508e5db054a4717623a2c2e2e95c Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Mon, 15 Feb 2016 08:53:00 -0800
Subject: [PATCH 1/5] Remove rvm auto-changes.

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

diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index 02acf37..8107dee 100644
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -40,5 +40,3 @@ 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 218c72a..d533854 100644
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -11,7 +11,3 @@ 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 63b71d4..a8d3107 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -54,5 +54,3 @@ 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

From bf6e7bd3155e871ff1583608790dc5aed5a94ac9 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Tue, 16 Feb 2016 13:25:14 -0800
Subject: [PATCH 2/5] Refresh GPG keys on install.

---
 install.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/install.sh b/install.sh
index bafbb6b..402cd47 100755
--- a/install.sh
+++ b/install.sh
@@ -84,6 +84,12 @@ function postinstall {
   # Install other useful tools
   install_git https://github.com/trustedsec/ptf.git ${HOME}/bin/ptframework && \
     add_bin_symlink ${HOME}/bin/ptframework/ptf
+  # Refresh all gpg keys
+  if test -x "`which gpg2`" ; then
+    gpg2 --refresh-keys
+  else
+    gpg --refresh-keys
+  fi
 }
 
 function ssh_key_already_installed {

From a43c80639d2b2e448dd93d0eaa18b56a33b19dff Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Wed, 17 Feb 2016 10:15:14 -0800
Subject: [PATCH 3/5] Add an unmanaged local_dotfiles dir to override dotfiles.

---
 .gitignore | 1 +
 install.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 494f98c..8a039c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ installed-prefs
 *.swp
 *~
 *.bak
+local_dotfiles
diff --git a/install.sh b/install.sh
index 402cd47..736b9da 100755
--- a/install.sh
+++ b/install.sh
@@ -282,6 +282,8 @@ install_dotfile_dir "${BASEDIR}/dotfiles"
 test -d "${BASEDIR}/private_dotfiles" && \
   test -d "${BASEDIR}/.git/git-crypt" && \
   install_dotfile_dir "${BASEDIR}/private_dotfiles"
+test -d "${BASEDIR}/local_dotfiles" && \
+  install_dotfile_dir "${BASEDIR}/local_dotfiles"
 install_basic_dir "${BASEDIR}/bin" "${HOME}/bin"
 (( $MINIMAL )) || postinstall
 (( $INSTALL_KEYS )) && install_keys

From 0259497329c724f941dbba3acff403fe201b086a Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Mon, 22 Feb 2016 13:33:55 -0800
Subject: [PATCH 4/5] Add support for local profile.

---
 dotfiles/profile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dotfiles/profile b/dotfiles/profile
index d533854..706812e 100644
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -11,3 +11,5 @@ fi
 unset GPG_AGENT_INFO_PATH
 export GPG_TTY=`tty`
 # End GPG
+
+test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local"

From fd974a153c704129dad0f2679804a6b7f41bf5ee Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Mon, 22 Feb 2016 14:38:57 -0800
Subject: [PATCH 5/5] Get env in xsessionrc.

---
 dotfiles/xsessionrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dotfiles/xsessionrc b/dotfiles/xsessionrc
index 4bf8017..b5e2165 100644
--- a/dotfiles/xsessionrc
+++ b/dotfiles/xsessionrc
@@ -1,2 +1,3 @@
 setxkbmap -option ctrl:nocaps
+test -f "$HOME/.env" && "$HOME/.env"
 test -f "$HOME/.profile" && . "$HOME/.profile"