Breaking my mac bootstrap thing

bootstrap-mac.sh

@@ -6,72 +6,18 @@ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
 # Homebrew
 brew update
 brew upgrade
-#brew tap homebrew/versions
 brew tap homebrew/dupes
 brew tap phinze/homebrew-cask
 brew tap jimbojsb/launchrocket
+brew tap homebrew/versions
 
-brew install coreutils
+# TODO
-brew install findutils
+
-brew install aspell
+#brew cask install gpgtools
-brew install git
-brew install perforce
-brew install tmux
-brew install wget --enable-iri
-brew install weechat --with-aspell --with-python --with-ruby
-brew install ranger
-brew install bash
-brew install zsh
-brew install ack
-brew install tree
-brew install imagesnap
-brew install imagemagick
-brew install openssl
-brew install openssh --with-brewed-openssl
-brew install ssh-copy-id
-brew install ffind
-brew install node
-brew install ruby-install
-# brew install chruby
-brew install python --with-brewed-openssl
-brew install macvim --HEAD --override-system-vim
-brew install msmtp
-brew install watch
-brew install urlview
-brew install isync
-brew install mosh
-brew install haskell-platform
-brew install brew-cask
-brew install gnupg
-brew install gpg-agent
-brew install gpgme
-brew cask install rdio
-brew cask install alfred
-brew cask alfred link
-brew cask install slate
-brew cask install google-chrome
-brew cask install charles
-brew cask install dropbox
-brew cask install iterm2
-#brew cask install macvim
-brew cask install vlc
-brew cask install transmission
-brew cask install firefox
-brew cask install the-unarchiver
-brew cask install electrum
-brew cask install steam
-brew cask install sketchup
-brew cask install gpgtools
-#brew cask install vagrant
-#brew cask install bittorrent-sync
-#brew cask install truecrypt
-brew cask install asepsis
-brew cask install keyremap4macbook
-brew cask install audacity
-brew cask install launchrocket
-brew cask install thunderbird
 brew cleanup
 
+brew cask alfred link
+
 # Symlinks
 bash ~/dotfiles/symlinks.sh
 
@@ -80,10 +26,9 @@ pip install --upgrade setuptools
 pip install --upgrade pip
 pip install git+git://github.com/Lokaltog/powerline
 
-# Ruby TODO -- set up chruby, ruby-install some stuff
+# Ruby TODO -- set up chruby, ruby-build some stuff
-ruby-install ruby 1.9
+ruby-build 2.1.0 ~/.rubies/ruby-2.1.0
-ruby-install ruby 2.1
+chruby 2.1.0
-chruby 1.9
 
 # Gems TODO
 gem install earthquake

packages

@@ -1,70 +1,180 @@
-// Keys must be one of:
+# Keys: brew, cask, arch, aur, pip, gem, npm
-// brew, cask, arch, aur, pip, gem, npm
 
-var packages = [
+# Buildy stuff
+brew-cask:
+    brew: brew-cask
+node:
+    brew: node
+    arch: nodejs
+openssl:
+    brew: openssl
+    arch: openssl
+python:
+    brew: python --with-brewed-openssl
+    arch: python2
+ruby:
+    brew: chruby ruby-build
+    aur: chruby ruby-build
+haskell:
+    brew: haskell-platform
+    arch: ghc cabal-install haddock happy alex
 
-// With which to build
+# Unixy stuff
-{ brew: "node", arch: "nodejs" },
+coreutils:
-{ brew: "python --with-brewed-openssl", arch: "python2" },
+    brew: coreutils
-{ brew: "ruby-install" },
+    arch: coreutils
-//{ brew: "chruby", aur: "chruby" }, // TODO chruby fish
+findutils:
-{ brew: "haskell-platform" },
+    brew: findutils
-{ arch: "ghc cabal-install haddock happy alex" }, // No Haskell-Platform on Arch
+    arch: findutils
+aspell:
+    brew: aspell
+    arch: apsell
+git:
+    brew: git
+    arch: git
+perforce:
+    brew: perforce
+    aur: p4
+tmux:
+    brew: tmux
+    arch: tmux
+wget:
+    brew: wget --enable-iri
+    arch: wget
+weechat:
+    brew: weechat --with-aspell --with-python --with-ruby
+    arch: weechat
+ranger:
+    brew: ranger
+    arch: ranger
+bash:
+    brew: bash
+    arch: bash
+zsh:
+    brew: zsh
+    arch: zsh
+ack:
+    brew: ack
+    arch: ack
+tree:
+    brew: tree
+    arch: tree
+openssh:
+    brew: openssh --with-brewed-openssl
+ssh-copy-id:
+    brew: ssh-copy-id
+ffind:
+    brew: ffind # No arch package
+vim:
+    brew: macvim --HEAD --override-system-vim
+    arch: gvim
+imagemagick:
+    brew: imagemagick
+    arch: imagemagick
+imagesnap:
+    brew: imagesnap # TODO Linux
+mosh:
+    brew: mosh
+    arch: mosh
+ca-certificates:
+    brew: curl-ca-bundle
+    arch: ca-certificates
+watch:
+    brew: watch
+gnupg:
+    brew: gnupg
+    arch: gnupg
+gpg-agent:
+    brew: gpg-agent
+gpgme:
+    brew: gpgme
+    arch: gpgme
+mplayer:
+    brew: mplayer
+    arch: mplayer
+ncmpcpp:
+    brew: ncmpcpp --clock --outputs --visualizer --HEAD
+    arch: ncmpcpp
+mopidy: # TODO
+    pip: mopidy
+gstreamer:
+    brew: gstreamer010 # TODO gst-plugnis*** --with-***
 
-// Command Line Utils
+# Mail stuff
-{ brew: "coreutils" },
+msmtp:
-{ brew: "findutils" },
+    brew: msmtp
-{ brew: "aspell" },
+    arch: msmtp
-{ brew: "git" },
+urlview:
-{ brew: "perforce", aur: "p4" },
+    brew: urlview
-{ brew: "tmux", arch: "tmux" },
+    aur: urlview
-{ brew: "wget" },
+offlineimap:
-{ brew: "weechat", arch: "weechat" },
+    brew: offlineimap
-{ brew: "ranger", arch: "ranger" },
+    arch: offlineimap
-{ brew: "bash" },
+notmuch:
-{ brew: "fish", arch: "fish" },
+    brew: notmuch
-{ brew: "ack", arch: "ack" },
+    arch: notmuch
-{ brew: "openssl" },
+alot:
-{ brew: "openssh --with-brewed-openssl" },
+    aur: alot
-{ brew: "ssh-copy-id" },
+    # brew: alot # TODO
-{ brew: "ffind" },
+#afew: # TODO
-{ brew: "vim --HEAD --override-system-vim", arch: "gvim" },
-{ brew: "msmtp", arch: "msmtp" },
-{ brew: "mutt", aur: "mutt-sidebar" }, // TODO sidebar patch
-{ brew: "urlview", aur: "urlview" },
-{ brew: "isync", aur: "isync" },
-{ brew: "mosh", arch: "mosh" },
-{ brew: "tree", arch: "tree" },
-{ brew: "imagesnap" }, // TODO linux
-{ brew: "imagemagick", arch: "imagemagick" },
 
-// Desktop Applications
+# Multiplatform desktop stuff
-// Mac Only
-{ brew: "brew-cask" },
-{ cask: "rdio" },
-{ cask: "alfred" },
-{ cask: "slate" },
-{ cask: "charles" },
-{ cask: "iterm2" },
-{ cask: "asepsis" },
-{ cask: "keyremap4macbook" },
-{ cask: "the-unarchiver" },
-{ cask: "launchrocket" },
-{ cask: "thunderbird" },
-
-// Linux Only
-{ arch: "rxvt-unicode" },
-// TODO wm
 
+spotify:
+    cask: spotify
+    aur: spotify
 // All OSes
-{ cask: "google-chrome", arch: "chromium" },
+firefox:
-{ cask: "firefox", arch: "firefox" },
+    cask: firefox
-{ cask: "dropbox", aur: "dropbox" },
+    arch: firefox
-{ cask: "vlc", arch: "vlc" },
+chrome:
-{ cask: "transmission" }, // TODO linux
+    cask: google-chrome
-{ cask: "electrum", aur: "electrum" },
+    arch: chromium
-{ cask: "steam" }, // TODO linux
+dropbox:
-{ cask: "sketchup" }, // TODO linux
+    cask: dropbox
-{ cask: "audacity", arch: "audacity" },
+    aur: dropbox
+google-drive:
+    cask: google-drive # TODO linux
+vlc:
+    cask: vlc
+    arch: vlc
+electrum:
+    cask: electrum
+    aur: electrum
+steam:
+    cask: steam
+    arch: steam
+sketchup:
+    cask: sketchup # TODO linux
+truecrypt:
+    cask: truecrypt
+    arch: truecrypt
+
+# Mac-only desktop stuff
+alfred:
+    cask: alfred
+slate:
+    cask: slate
+charles:
+    cask: charles
+iterm2:
+    brew: iterm2
+keyremap4macbook:
+    cask: keyremap4macbook
+the-unarchiver:
+    cask: the-unarchiver
+launchrocket:
+    cask: launchrocket
+flux:
+    cask: flux
+xquartz:
+    cask: xquartz
+macpass:
+    cask: macpass
+time-out:
+    cask: time-out
 
-];
+# Linux-only
+urxvt:
+    arch: rxvt-unicode
+# TODO wm

ruby-version

@@ -1 +1 @@
-ruby-1.9
+ruby-2.1.0