From 69a086121c0ced038b5cdc91485e6ddbb5e2f76c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 20 Oct 2014 16:48:24 -0700 Subject: [PATCH] Add dependencies. --- .gitignore | 3 ++- dotfiles/emacs.d | 2 +- tasks/linux.py | 2 +- tasks/osx.py | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 727e3569..225dead7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ dotfiles/sbt/0.13/plugins/project/ dotfiles/sbt/0.13/plugins/target/ dotfiles/sbt/boot/ dotfiles/.pip/download_cache -dotfiles/.pip/pip.log \ No newline at end of file +dotfiles/.pip/pip.log +dotfiles/config/hub \ No newline at end of file diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d index 7e87d26e..53f4c485 160000 --- a/dotfiles/emacs.d +++ b/dotfiles/emacs.d @@ -1 +1 @@ -Subproject commit 7e87d26e6e063d00f73f10219eb8d36942a7b847 +Subproject commit 53f4c485126eccf9666e8304ea09fd1f48193624 diff --git a/tasks/linux.py b/tasks/linux.py index 6fa7e8cd..1cb38d0c 100644 --- a/tasks/linux.py +++ b/tasks/linux.py @@ -10,7 +10,7 @@ def all(ctx): linux_pacakges = ('zsh', 'tmux', 'emacs24-nox', 'nmap', 'scala', 'default-jdk', 'default-jre', 'python-virtualenv', 'htop', 'netcat', 'wget', 'zlib1g-dev', 'libxml2-dev', 'libxslt1-dev', 'python-dev', - 'libncurses5-dev', 'npm') + 'libncurses5-dev', 'npm', 'python3-dev') @ctask def apt_get(ctx): install_command = 'sudo apt-get -y install' diff --git a/tasks/osx.py b/tasks/osx.py index 23395f68..a4098031 100644 --- a/tasks/osx.py +++ b/tasks/osx.py @@ -15,7 +15,7 @@ def all(ctx): ESSENTIAL = ( - "emacs", "tmux", "python --with-brewed-openssl", "htop", "zsh", "make", + "emacs --cocoa --srgb --with-x", "tmux", "python --with-brewed-openssl", "htop", "zsh", "make", "macvim --override-system-vim --custom-system-icons --with-features=huge " "--enable-rubyinterp --enable-pythoninterp --enable-perlinterp --enable-cscope" ) @@ -34,7 +34,7 @@ MISC = ("file-formula", "less", "openssh --with-brewed-openssl", "perl518", "rsync", "svn", "unzip", "docker", "boot2docker", "pandoc", "mercurial") -CASKS = ('alfred', 'caffeine', 'flux', 'google-chrome', 'iterm2', 'spotify', 'vlc', 'virtualbox') +CASKS = ('alfred', 'caffeine', 'flux', 'google-chrome', 'iterm2', 'spotify', 'vlc', 'virtualbox', 'xquartz') @ctask def osx_config(ctx): ctx.run('source {0}; osx_config'.format(os.path.join(RESOURCES_DIRECTORY, 'osx.sh')))