From a6445a4f2e0b2645ccfa6ee87552fff170043e36 Mon Sep 17 00:00:00 2001
From: Josh Sherman <josh@gravityblvd.com>
Date: Fri, 20 Mar 2015 11:50:40 -0400
Subject: [PATCH] Just some updates

---
 .gitignore                 |  3 +++
 README.md                  |  9 +++++++--
 tilde.yml                  |  2 +-
 vim/after/ftplugin/php.vim |  1 +
 vim/vimrc                  |  6 +++---
 zsh/zsh-theme              | 32 ++++++++------------------------
 zsh/zshrc                  |  2 +-
 7 files changed, 24 insertions(+), 31 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ad32f9d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+vim/bundle
+vim/.netrwhist
+
diff --git a/README.md b/README.md
index 73865bf..7d0aa3d 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,7 @@
-joshtronic dotfiles
-===================
+# Josh and the Amazing Technicolor Dotfiles
+
+My dotfiles bring all the nerds to the yard.
+
+## Installation
+
+Funny you should ask about that...
diff --git a/tilde.yml b/tilde.yml
index 8a66589..9183329 100644
--- a/tilde.yml
+++ b/tilde.yml
@@ -4,9 +4,9 @@ packages:
     - Homebrew/homebrew-php
     - joshtronic/homebrew-formulae
     - bash
-    - ghi
     - git
     - git-extras
+    - gpg
     - imagemagick
     - likes
     - memcached
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 289b7cd..4f12d94 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -1,2 +1,3 @@
 setlocal shiftwidth=4
+setlocal softtabstop=4
 setlocal tabstop=4
diff --git a/vim/vimrc b/vim/vimrc
index a302fa8..00c217f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -58,7 +58,7 @@ Bundle 'cakebaker/scss-syntax.vim'
 Bundle 'ervandew/supertab'
 "Bundle 'garbas/vim-snipmate'
 Bundle 'groenewege/vim-less'
-"Bundle 'joshtronic/php.vim'
+Bundle 'joshtronic/php.vim'
 "Bundle 'jQuery'
 Bundle 'kien/ctrlp.vim'
 Bundle 'hail2u/vim-css3-syntax'
@@ -72,8 +72,8 @@ Bundle 'nanotech/jellybeans.vim'
 Bundle 'pangloss/vim-javascript.git'
 "Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
 "Bundle 'skammer/vim-css-color'
-"Bundle 'scrooloose/syntastic'
-"Bundle 'shawncplus/phpcomplete.vim'
+Bundle 'scrooloose/syntastic'
+Bundle 'shawncplus/phpcomplete.vim'
 "Bundle 'SearchComplete'
 
 colorscheme jellybeans
diff --git a/zsh/zsh-theme b/zsh/zsh-theme
index d291473..d710050 100644
--- a/zsh/zsh-theme
+++ b/zsh/zsh-theme
@@ -1,39 +1,23 @@
 function username()
 {
-	if [[ `whoami` != 'josh' ]];
-	then
-		echo %{$FG[248]%}%n
-	fi
+  if [[ `whoami` != 'josh' ]];
+  then
+    echo %{$FG[248]%}%n
+  fi
 }
 
 function server()
 {
-	if [[ `hostname` != *.local ]];
-	then
-		echo "%{$FG[244]%}@%{$fg[magenta]%}%m "
-	fi
-}
-
-function unread_email()
-{
-	file=/tmp/UNREAD_GMAIL
-
-	if [[ -a $file ]];
-	then
-		unread=( $(<${file}) )
-
-		if [[ unread -ge 5 ]];
-		then
-			echo 📩 
-		fi
-	fi
+  if [[ `hostname` != *.home ]];
+  then
+    echo "%{$FG[244]%}@%{$fg[magenta]%}%m "
+  fi
 }
 
 USER="$(username)$(server)"
 PROMPT='
 %{$USER%}%{$fg[blue]%}%~ $(git_prompt_info)
 %{$FG[244]%}%# %{$reset_color%}'
-RPROMPT='$(unread_email)'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
diff --git a/zsh/zshrc b/zsh/zshrc
index 7d66dc1..cfaf057 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -38,7 +38,7 @@ alias     vd="vimdiff"
 export CLICOLOR=1
 export LSCOLORS=Exfxcxdxbxegedabagacad
 
-export GREP_OPTIONS="--color=auto"
+export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules"
 
 export EDITOR=vim