2016 Annual Presets cleanup

Author: David Bell

BrewFile

@@ -0,0 +1,24 @@
+brew 'awscli'
+brew 'docker'
+brew 'docker-machine'
+brew 'docker-compose'
+brew 'git'
+brew 'hub'
+brew 'macvim'
+brew 'vim'
+brew 'unrar'
+brew 'tmux'
+brew 'zsh'
+brew 'zsh-syntax-highlighting'
+
+brew 'ruby-build'
+brew 'rbenv'
+
+brew 'rust'
+
+brew 'haskell-stack'
+
+brew 'maven'
+
+brew 'go'
+brew 'bazel'

bootstrap

@@ -1,64 +1,11 @@
 #!/bin/zsh
 
 # move ourselves into the scripts directory
-canonical="$(dirname "$0")"
+canonical="$PWD"
 
 # Defaults
 ZSH_PATH=/usr/local/bin/zsh
 
-# Env arguments
-
-taps=(
-   caskroom/cask
-   caskroom/versions
-   caskroom/fonts
-)
-
-binaries=(
-   ack
-   cabal-install
-   coreutils
-   findutils
-   git
-   hub
-   leiningen
-   maven
-   mackup
-   rbenv
-   ruby-build
-   tarsnap
-   tree
-   vim
-   zsh
-   zsh-syntax-highlighting
-)
-
-apps=(
-   alfred
-   dropbox
-   eclipse-java
-   firefox
-   flux
-   google-chrome
-   github
-   intellij-idea
-   iterm2
-   macvim
-   qlmarkdown
-   rubymine
-   skype
-   spotify
-   sublime-text3
-   tarsnap
-   transmission
-   virtualbox
-   vagrant
-)
-
-# fonts
-fonts=(
-   font-source-code-pro
-)
 
 # Try and install xcode if necessary
 if xcode-select -p &> /dev/null
@@ -72,40 +19,17 @@ fi
 # Install homebrew, and check the path
 if command -v brew &> /dev/null
 then
-   print "Homebrew already installed, skipping"
+   print "Homebrew already installed, cleaning..."
+   brew uninstall --force `brew list`
 else
    print "Installing Homebrew"
    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
    brew update
 fi
 
-for tap in $taps
-do
-   brew tap $tap
-done
-
-# Install homebrew cask
-if brew cask &> /dev/null
-then
-   print "Homebrew Cask installed, skipping"
-else
-   print "Installing Homebrew Cask"
-   brew install caskroom/cask/brew-cask
-fi
-
-# Install homebrew binaries
-print "installing binaries..."
-brew install ${binaries[@]}
-brew cleanup
-
-# Install homebrew apps
-print "installing apps..."
-brew cask install --appdir="/Applications" ${apps[@]}
-
-# Install homebrew fonts
-print "installing fonts..."
-#brew tap caskroom/fonts
-brew cask install ${fonts[@]}
+# Install Homebrew packages
+brew tap Homebrew/bundle
+brew bundle
 
 # Set up zsh
 if ! grep "$ZSH_PATH" /etc/shells &> /dev/null
@@ -121,11 +45,13 @@ then
 fi
 
 print "Linking dotfiles..."
-ln -s $canonical/dotfiles/vim $HOME/.vim
-ln -s $canonical/dotfiles/vimrc $HOME/.vimrc
-ln -s $canonical/dotfiles/vimrc.bundles $HOME/.vimrc.bundles
-ln -s $canonical/dotfiles/zshrc $HOME/.zshrc
-ln -s $canonical/dotfiles/zsh $HOME/.zsh
+echo $HOME
+ln -sf $canonical/dotfiles/gitconfig $HOME/.gitconfig
+ln -sf $canonical/dotfiles/vim $HOME/.vim
+ln -sf $canonical/dotfiles/vimrc $HOME/.vimrc
+ln -sf $canonical/dotfiles/vimrc.bundles $HOME/.vimrc.bundles
+ln -sf $canonical/dotfiles/zshrc $HOME/.zshrc
+ln -sf $canonical/dotfiles/zsh $HOME/.zsh
 
 # Set up vim
 # print "Generating neobundle..."

config

@@ -0,0 +1,40 @@
+[user]
+	name = David Bell
+   email = [email protected]
+[core]
+   editor = vim
+   whitespace = trailing-space,space-before-tab
+[web]
+   browser = safari
+[instaweb]
+   httpd = apache2 -f
+[rerere]
+   enabled = 1
+   autoupdate = 1
+[push]
+   default = simple
+[color]
+   ui = auto
+[color "branch"]
+   current = yellow bold
+   local = green bold
+   remote = cyan bold
+[color "diff"]
+   meta = yellow bold
+   frag = magenta bold
+   old = red bold
+   new = green bold
+   whitespace = red reverse
+[color "status"]
+   added = green bold
+   changed = yellow bold
+   untracked = red bold
+[diff]
+   tool = vimdiff
+[difftool]
+   prompt = false
+[merge]
+   tool = vimdiff
+[alias]
+   co = checkout
+   st = status

dotfiles/gitconfig

@@ -6,7 +6,7 @@
       filetype off
       set rtp+=~/.vim/bundle/neobundle.vim/
       call neobundle#begin(expand('~/.vim/bundle'))
-      " NeoBundleFetch 'Shougo/neobundle.vim'
+      NeoBundleFetch 'Shougo/neobundle.vim'
 
    " }
 
@@ -28,6 +28,9 @@
 
 " }
 
+   " Update bundles
+   NeoBundleCheck
+
 " Settings {
 
    " Define colorscheme
@@ -181,7 +184,7 @@
    let mapleader = ","
 
    " Rebind for leaving insert mode
-   inoremap jj <ESC>
+   " inoremap jj <ESC>
 
    " Rebind search to use magic mode
    nnoremap / /\v
@@ -243,9 +246,9 @@
 
    " General {
 
-      au BufRead,BufNewFile *.* set tabstop=3
-      au BufRead,BufNewFile *.* set shiftwidth=3
-      au BufRead,BufNewFile *.* set softtabstop=3
+      au BufRead,BufNewFile * set tabstop=3
+      au BufRead,BufNewFile * set shiftwidth=3
+      au BufRead,BufNewFile * set softtabstop=3
 
    " }
 
@@ -256,5 +259,13 @@
       au BufRead,BufNewFile *.rs set softtabstop=4
 
    " }
+   
+   " Ruby {
+
+      au BufRead,BufNewFile *.rb set tabstop=2
+      au BufRead,BufNewFile *.rb set shiftwidth=2
+      au BufRead,BufNewFile *.rb set softtabstop=2
+
+   " }
 
 " }

dotfiles/vim/.netrwhist

@@ -2,5 +2,12 @@
    " GitHub-defined NeoBundles {
       NeoBundle 'flazz/vim-colorschemes'
       NeoBundle 'sheerun/vim-polyglot'
+      NeoBundle 'airblade/vim-gitgutter'
+      NeoBundle 'tpope/vim-surround'
+      NeoBundle 'mattn/emmet-vim'
+      NeoBundle 'lambdatoast/elm.vim'
+      NeoBundle 'neovimhaskell/haskell-vim'
+      NeoBundle 'eagletmt/ghcmod-vim'
+      NeoBundle 'dag/vim-fish'
    " }
 " }

dotfiles/vimrc

@@ -1 +1 @@
-./Presets/dotfiles/zsh
+/Users/dastbe/Presets/dotfiles/zsh

dotfiles/vimrc.bundles

@@ -40,6 +40,9 @@ alias t='tail -f'
 # Better grep
 alias grep='grep --color'
 
+# Force vi to alias the most specific vim on path
+alias vi=vim
+
 # For faster cd navigation
 alias -g ..='../'
 alias -g ...='../../'
@@ -50,9 +53,21 @@ alias -g .....='../../../../'
 alias cpv="rsync -poghb --backup-dir=/tmp/rsync -e /dev/null --progress --"
 
 # Syntax Highlighting
-source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+if [ -e /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]
+then 
+   source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi
+
+if [ -e /usr/local/share/zsh/site-functions/_aws ]
+then 
+   source /usr/local/share/zsh/site-functions/_aws
+fi
 
 # Set up Homebrew path
 export PATH="/usr/local/bin:$PATH"
 
-function gi() { curl http://www.gitignore.io/api/$@ ;}
+# Set up rbenv path
+if command -v rbenv > /dev/null
+then
+   export PATH="/Users/dastbe/.rbenv/shims:$PATH"
+fi