Merge cask and brewfile

README.md

@@ -16,14 +16,6 @@ When setting up a new Mac, you may want to install some common [Homebrew](http:/
 brew bundle ~/.brewfile
 ```
 
-### Install native apps with `brew cask`
-
-You could also install native apps with [`brew cask`](https://github.com/phinze/homebrew-cask):
-
-```bash
-./.cask
-```
-
 ### Copy dotfiles
 
 ```

brewfile

@@ -4,10 +4,6 @@ update
 # Upgrade any already-installed formulae
 upgrade
 
-# Install RC manager
-tap thoughtbot/formulae
-install rcm
-
 # Install GNU core utilities (those that come with OS X are outdated)
 # Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
 install coreutils
@@ -16,41 +12,43 @@ install findutils
 # Install Bash 4
 install bash
 
-# Install wget with IRI support
-install wget --enable-iri
-
-# Install RingoJS and Narwhal
-# Note that the order in which these are installed is important; see http://git.io/brew-narwhal-ringo.
-install ringojs
-install narwhal
-
-# Install more recent versions of some OS X tools
-install vim --override-system-vi
-tap homebrew/dupes
-install homebrew/dupes/grep
-tap josegonzalez/homebrew-php
-install php55
+# Install wget
+install wget
 
-# This formula didn’t work well last time I tried it:
-#install homebrew/dupes/screen
-
-# Install other useful binaries
-install ack
-#install exiv2
+# Install tools for development
 install git
-#install imagemagick
-install lynx
 install node
-install pigz
-install rename
-install rhino
-install tree
-install webkit2png
-install zopfli
-install p7zip
-
-tap homebrew/versions
-install lua52
+install memcached
+install openssl
+install postgresql
+install redis
+
+# Install RC manager
+tap thoughtbot/formulae
+install rcm
+
+############
+### CASK ###
+############
+
+# Bootstrap
+tap phinze/homebrew-cask
+install brew-cask
+
+# Required for Sublime Text 3
+tap caskroom/versions
+
+# Cask packages
+cask install beamer
+cask install dropbox
+cask install firefox
+cask install google-chrome
+cask install hipchat
+cask install skype
+cask install spotify
+cask install sublime-text3
+cask install totalterminal
+cask install transmission
 
 # Remove outdated versions from the cellar
 cleanup

gitconfig

@@ -10,7 +10,7 @@
 	pl = pull
 	ps = push
 	# Remove cached files and add them again.
-	rma = "!r() {rm -r --cached $1; add $1}; r"
+	rma = "!r() { git rm -rq --cached $1; git add $1; }; r"
 	# View the current working tree status using the short format
 	# Interactive rebase with the given number of latest commits
 	squash = "!r() { git rebase -i HEAD~$1; }; r"