Runs .osx file in bootstrap.sh

changed vimrc theme color section to be easier to switch

included my iterm2 plist

runs the macvim install last, incase the vim install fails because of
missing xcode.

.gitconfig

@@ -136,7 +136,7 @@
 [pull]
 	default = current
 [user]
-	email = adam@veldhousen.ninja
+	email = adamveld12@gmail.com
 	name = Adam Veldhousen
 	signingkey = 415C0B9C
 [commit]

.osx

@@ -65,7 +65,7 @@ defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int
 defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false
 
 # Set a blazingly fast keyboard repeat rate
-defaults write NSGlobalDomain KeyRepeat -int 0
+defaults write NSGlobalDomain KeyRepeat -int 15
 
 # Automatically illuminate built-in MacBook keyboard in low light
 defaults write com.apple.BezelServices kDim -bool true
@@ -104,7 +104,7 @@ defaults write com.apple.finder DisableAllAnimations -bool true
 
 
 # Finder: show hidden files by default
-defaults write com.apple.Finder AppleShowAllFiles -bool true
+# defaults write com.apple.Finder AppleShowAllFiles -bool true
 
 # Finder: show all filename extensions
 defaults write NSGlobalDomain AppleShowAllExtensions -bool true

.vimrc

@@ -8,31 +8,31 @@ execute pathogen#helptags()
 "we don't want vi compatibility AKA Make Vim more useful
 set nocompatible 
 
-" color schemes
-colorscheme CandyPaper
-"sunburst
-"jellybeans 
-"hickop
-"pablo
-"torte
-"slate
-"evening
-"darkblue
-"desert
-"base16-flat
-"inkpot
-"jellybeans
-"liquidcarbon
-"molokai
-"moria
-"pinksea
-"sonofobsidian
-"vividchalk
-"wombat256mod
-"evening
-"koehler
-"morning
-"elflord
+"color schemes
+colorscheme jellybeans
+"colorscheme molokai
+"colorscheme moria
+"colorscheme CandyPaper
+"colorscheme sunburst
+"colorscheme hickop
+"colorscheme pablo
+"colorscheme torte
+"colorscheme slate
+"colorscheme evening
+"colorscheme darkblue
+"colorscheme desert
+"colorscheme base16-flat
+"colorscheme inkpot
+"colorscheme jellybeans
+"colorscheme liquidcarbon
+"colorscheme pinksea
+"colorscheme sonofobsidian
+"colorscheme vividchalk
+"colorscheme wombat256mod
+"colorscheme evening
+"colorscheme koehler
+"colorscheme morning
+"colorscheme elflord
 
 set omnifunc=syntaxcomplete#Complete
 set completeopt-=preview

bootstrap.sh

@@ -59,6 +59,8 @@ else
 fi
 
 if [[ $(uname -s) == "Darwin" ]]; then 
+  echo "running .osx file"
+  ./.osx
   echo "installing brew"
   ./brew.sh
 fi

brew.sh

@@ -19,9 +19,10 @@ brew update && brew install \
   wget;
 
 brew install go --cross-compile-all;
-brew install macvim --override-system-vim --with-lua --with-python;
 
 brew link --force openssl;
 
 rbenv install 1.9.3-p125;
 rbenv global 1.9.3-p125;
+
+brew install macvim --override-system-vim --with-lua --with-python;