Brewfile

@@ -1,50 +1,32 @@
-tap "thoughtbot/formulae"
+tap homebrew/dupes
-brew "asdf"
+tap homebrew/versions
-brew "direnv"
+tap linode/cli
-brew "git"
+tap thoughtbot/formulae
-brew "imagemagick"
+install apg
-brew "mas"
+# install apple-gcc42
-brew "mackup"
+install direnv
-brew "postgresql"
+# install elasticsearch
-brew "pv"
+install git
-brew "ripgrep"
+install heroku-toolbelt
-brew "rcm"
+install imagemagick
-brew "rsync"
+install linode-cli
-brew "tig"
+install mackup
-brew "tmux"
+install mariadb
-brew "vim"
+install mercurial
-brew "watch"
+install nginx
-brew "wget"
+install node
-brew "zsh"
+install phantomjs
-
+install postgresql
-cask "1password"
+install pv
-cask "acorn"
+install rbenv
-cask "choosy"
+install rbenv-gem-rehash
-cask "colorpicker-skalacolor"
+install rcm
-cask "dropbox"
+install rsync
-cask "fantastical"
+install ruby-build
-cask "firefox"
+install the_silver_searcher
-cask "google-chrome"
+install tig
-cask "imagealpha"
+install tmux
-cask "imageoptim"
+install vim
-cask "istat-menus"
+install watch
-cask "iterm2"
+install wget
-cask "ivolume"
+install zsh
-cask "kaleidoscope"
-cask "macvim"
-cask "mplayerx"
-cask "mpv"
-cask "phantomjs"
-cask "sequel-pro"
-cask "skype"
-cask "spotify"
-cask "superduper"
-cask "textmate"
-cask "vmware-fusion"
-cask "vlc"
-
-tap "caskroom/fonts"
-cask "font-vollkorn"
-cask "font-source-code-pro"
-cask "font-source-sans-pro"
-cask "font-courier-prime"

Caskfile

@@ -0,0 +1,48 @@
+tap caskroom/cask
+tap caskroom/versions
+install brew-cask
+cask install 1password
+cask install acorn
+cask install adium
+cask install anvil
+# cask install arq
+# cask install bittorrent-sync
+# cask install choosy
+# cask install cloud
+# cask install coconutbattery
+cask install colorpicker-skalacolor
+# cask install commandq
+cask install dropbox
+cask install fantastical
+cask install firefox
+cask install flux
+cask install google-chrome
+cask install imagealpha
+cask install imageoptim
+cask install istat-menus
+cask install iterm2-beta
+cask install ivolume
+cask install java
+cask install kaleidoscope
+cask install macvim
+cask install mplayerx
+cask install mpv
+# cask install orbit
+# cask install prey
+cask install quicksilver
+cask install sequel-pro
+cask install skype
+cask install smoothmouse
+cask install spotify
+cask install superduper
+cask install textmate
+# cask install vmware-fusion
+cask install vlc
+
+tap caskroom/fonts
+cask install font-vollkorn
+cask install font-source-code-pro
+cask install font-source-sans-pro
+# cask install font-redacted
+# cask install font-comic-neue
+cask install font-courier-prime

mas.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-mas install 904280696
-mas install 13764025890
-mas install 1084713122
-mas install 1107421413
-mas install 409183694
-mas install 403504866
-mas install 1278508951
-mas install 918858936
-mas install 530458789
-mas install 734335183
-mas install 409203825
-mas install 497799835
-mas install 409201541
-mas install 1179623856
-mas install 1082624744
-mas install 1225570693
-mas install 924726344

setup.sh

@@ -1,23 +1,21 @@
 #!/bin/sh
 
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
 # We want to be in the user home directory.
 cd ~
 
+# Tap boneyard for bundle command
+brew tap homebrew/boneyard
+
 # Get Brewfiles.
-echo 'Downloading...'
+echo 'Downloading Brewfiles...'
 curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/Brewfile > ~/Brewfile
-curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/mas.sh > ~/mas.sh
+curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/Caskfile > ~/Caskfile
-chmod +x ~/mas.sh
 
 # Install brew bundles
-echo 'Installing Homebrew bundle...'
+echo 'Installing...'
-brew bundle
+brew bundle && brew bundle Caskfile
-
-# Install Mac App Store apps
-echo 'Installing App Store apps'
-~/mas.sh
 
 echo 'Done!'