From 22c8a5d87744bb0768f21ed5e76fd82248b696b6 Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Mon, 31 Jul 2017 10:00:42 -0700
Subject: [PATCH] Clean up rc files & allow local versions

---
 home/.profile | 22 +++-------------------
 home/.vimrc   | 10 ++++++++++
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/home/.profile b/home/.profile
index d3691c3..197777e 100644
--- a/home/.profile
+++ b/home/.profile
@@ -1,25 +1,9 @@
 export EDITOR=vi
 export PS1='[\h:\w]\$ '
-export PATH=~/bin:~/node_modules/.bin:/opt/local/bin:/opt/local/sbin:/usr/local/mysql/bin:$PATH
-export RAILS_ENV='development'
+export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/bin:/sbin
+export PATH=$PATH:$HOME/bin:$HOME/node_modules/.bin
 
 alias l='ls -Ghl'
 alias la='ls -aGhl'
 
-function count {
-    find . -name "*.$1" | grep -v "node_modules" | xargs cat | grep -v '^$' | grep -v '^#' | wc -l
-}
-
-ssh-add ~/.ssh/id_rsa_andrewminer &>/dev/null
-
-eval "$(rbenv init -)"
-
-
-### Added by the Heroku Toolbelt
-export PATH="/usr/local/heroku/bin:$PATH"
-
-defaults write com.macromates.TextMate.preview volumeSettings '{ "/" = { extendedAttributes = 0; }; }'
-
-if [[ -e "~/.profile.local" ]]; then
-    source ~/.profile.local
-fi
+[[ -e "$HOME/.profile.local" ]] && source $HOME/.profile.local
diff --git a/home/.vimrc b/home/.vimrc
index 78fb1cd..ae738d6 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -69,6 +69,7 @@ endif
 
 " ctrlpvim/ctrlp.vim
 let g:ctrlp_working_path_mode = 0
+let g:ctrlp_regexp = 1
 if executable('ag')
     let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
     let g:ctrlp_use_caching = 0
@@ -90,6 +91,15 @@ let g:indent_guides_enable_on_vim_startup = 0 " :IndentGuidesToggle
 map <F1> :NERDTreeToggle<CR>
 map <F2> :NERDTreeFind<CR>
 map <F3> :'a,.!sort<CR>
+map <F4> :IndentGuidesToggle<CR>
+map <F5> :e<CR>
+map <F6> :set hlsearch!<CR>
 map <F7> :cp<CR>
 map <F8> :copen<CR>
 map <F9> :cn<CR>
+
+" Local Overrides ######################################################################################################
+
+if !empty(glob("$HOME/.vimrc.local"))
+    source $HOME/.vimrc.local
+endif