From 804c920cdab70bb41223668c66dd1cde8ff0743b Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Thu, 18 Feb 2016 22:12:25 -0500
Subject: [PATCH] toold more around

---
 INSTALL.sh          |  2 --
 bash_aliases        |  2 --
 gitconfig           |  1 +
 vimrc.bundles       | 20 ++++++--------------
 vimrc.bundles.local |  1 -
 zshrc               |  7 +------
 6 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 vimrc.bundles.local

diff --git a/INSTALL.sh b/INSTALL.sh
index 93ccb79..ce1b1ed 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -7,10 +7,8 @@ ln -s $(pwd)/hushlogin ~/.hushlogin
 ln -s $(pwd)/vim ~/.vim 
 ln -s $(pwd)/vimrc ~/.vimrc 
 ln -s $(pwd)/vimrc.bundles ~/.vimrc.bundles 
-ln -s $(pwd)/vimrc.bundles.local ~/.vimrc.bundles.local 
 ln -s $(pwd)/vimrc.local ~/.vimrc.local 
 ln -s $(pwd)/zshrc ~/.zshrc 
-ln -s $(pwd)/zshrc.local ~/.zshrc.local 
 
 # Setup vim
 rm -rf ~/.vim/bundle/Vundle.vim
diff --git a/bash_aliases b/bash_aliases
index 197b334..ed30d9a 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -13,8 +13,6 @@ alias nginx.logs.default.access='tail -250f /usr/local/etc/nginx/logs/default.ac
 alias nginx.logs.default-ssl.access='tail -250f /usr/local/etc/nginx/logs/default-ssl.access.log'
 alias nginx.logs.phpmyadmin.error='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.error.log'
 alias nginx.logs.phpmyadmin.access='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.access.log'
-alias bower='noglob bower'
 alias rm=/bin/rm -i
-alias ip="ifconfig | pcregrep -M -o '^[^\t:]+:([^\n]|\n\t)*status: active'"
 function gi() { curl -L -s https://www.gitignore.io/api/$@ ;}
 function glate(){git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname) %(committerdate) %(authorname)' | sed 's/refs\/heads\///g';}
diff --git a/gitconfig b/gitconfig
index 4627f15..588a50d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -15,6 +15,7 @@
   pr = !hub pull-request
   st = status
   up = !git fetch origin && git rebase origin/master
+  glate = for-each-ref --sort=-committerdate refs/heads/ --format='%(refname) %(committerdate) %(authorname)'
 [core]
   excludesfile = ~/.gitignore
   autocrlf = input
diff --git a/vimrc.bundles b/vimrc.bundles
index 15cea17..87e2f7e 100644
--- a/vimrc.bundles
+++ b/vimrc.bundles
@@ -10,28 +10,20 @@ call vundle#begin()
 Plugin 'gmarik/Vundle.vim'
 
 " Define bundles via Github repos
-Plugin 'christoomey/vim-run-interactive'
 Plugin 'croaky/vim-colors-github'
 Plugin 'danro/rename.vim'
-Plugin 'kchmck/vim-coffee-script'
 Plugin 'kien/ctrlp.vim'
 Plugin 'pbrisbin/vim-mkdir'
 Plugin 'scrooloose/syntastic'
-Plugin 'slim-template/vim-slim'
-Plugin 'thoughtbot/vim-rspec'
-Plugin 'tpope/vim-bundler'
-Plugin 'tpope/vim-endwise'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-rails'
 Plugin 'tpope/vim-surround'
-Plugin 'vim-ruby/vim-ruby'
-Plugin 'vim-scripts/ctags.vim'
-Plugin 'vim-scripts/matchit.zip'
-Plugin 'vim-scripts/tComment'
 Plugin 'bling/vim-airline'
 
-if filereadable(expand("~/.vimrc.bundles.local"))
-  source ~/.vimrc.bundles.local
+" do mac specific stuff
+if has("unix")
+  let s:uname = system("uname -s")
+  if s:uname == "Darwin"
+     Plugin 'rizzatti/dash.vim'
+  endif
 endif
 
 call vundle#end()
diff --git a/vimrc.bundles.local b/vimrc.bundles.local
deleted file mode 100644
index 62597e1..0000000
--- a/vimrc.bundles.local
+++ /dev/null
@@ -1 +0,0 @@
-Plugin 'rizzatti/dash.vim'
diff --git a/zshrc b/zshrc
index 7ae6991..4035eb8 100644
--- a/zshrc
+++ b/zshrc
@@ -5,8 +5,7 @@ plugins=(git)
 source $ZSH/oh-my-zsh.sh
 
 
-
-# User configuration Exports
+export EDITOR=vim
 export LC_ALL=C
 export LANG=en_US.UTF-8
 export NPM_PACKAGES="${HOME}/.npm-packages"
@@ -22,10 +21,6 @@ export PATH="$HOME/bin:$HOME/.rvm.bin:$NPM_PACKAGES/bin:$GOPATH/bin:/usr/local/b
 # Sourcing aliases and functions
 source ~/.bash_aliases
 
-# Unset manpath so we can inherit from /etc/manpath via the `manpath`
-# command
-unset MANPATH # delete if you already modified MANPATH elsewhere in your config
-MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
 
 function adg {
     workon addgene