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.
osx
Adam Veldhousen 8 years ago
parent 058c23c09a
commit 9dea08b23f
Signed by: adam
GPG Key ID: 6DB29003C6DD1E4B

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

4
.osx vendored

@ -65,7 +65,7 @@ defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int
defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false
# Set a blazingly fast keyboard repeat rate # 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 # Automatically illuminate built-in MacBook keyboard in low light
defaults write com.apple.BezelServices kDim -bool true 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 # 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 # Finder: show all filename extensions
defaults write NSGlobalDomain AppleShowAllExtensions -bool true defaults write NSGlobalDomain AppleShowAllExtensions -bool true

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

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

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

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save