diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d index 8c5f224f..6929aa19 160000 --- a/dotfiles/emacs.d +++ b/dotfiles/emacs.d @@ -1 +1 @@ -Subproject commit 8c5f224f709b5680145616e3acaca86328b22bb2 +Subproject commit 6929aa194c4759e6115bcc20464653700dd3a657 diff --git a/tasks/osx.py b/tasks/osx.py index 569dbfb2..23395f68 100644 --- a/tasks/osx.py +++ b/tasks/osx.py @@ -31,7 +31,8 @@ SHOULD_INSTALL = ( "sbt", "node", "npm" ) MISC = ("file-formula", "less", "openssh --with-brewed-openssl", - "perl518", "rsync", "svn", "unzip", "docker", "boot2docker", "pandoc") + "perl518", "rsync", "svn", "unzip", "docker", "boot2docker", "pandoc", + "mercurial") CASKS = ('alfred', 'caffeine', 'flux', 'google-chrome', 'iterm2', 'spotify', 'vlc', 'virtualbox') @ctask