Merge branch 'master' of git.alanpearce.uk:alan/dotfiles
Alan Pearce alan@alanpearce.uk
Sun, 03 Jul 2016 20:58:51 +0200
3 files changed, 19 insertions(+), 10 deletions(-)
D Brewfile
@@ -1,9 +0,0 @@-install direnv -install emacs --cocoa --srgb --with-gnutls -install fasd -install git -install htop -install hub -install mobile-shell -install ssh-copy-id -install zsh
A brew.sh
@@ -0,0 +1,18 @@+brew install android-platform-tools +brew install ansible +brew install gitup +brew install h2o +brew install launchdns +brew install mackup +brew install mariadb --with-archive-storage-engine --with-local-infile +brew tap homebrew/versions +brew install homebrew/versions/node4-lts --with-debug +brew install postgresql +brew install redis +brew install ssh-copy-id +brew install syncthing +brew install syncthing-inotify +brew install trash +brew install xhyve +brew install zplug +brew install zsh-completions
M tag-emacs/emacs.d/init.org → tag-emacs/emacs.d/init.org
@@ -180,7 +180,7 @@ ((eq window-system 'ns) (let ((displays (string-to-number (shell-command-to-string "system_profiler SPDisplaysDataType | grep \"Online: Yes\" | wc -l")))) (if (eq displays 1) (ap/set-fonts "PT Mono" 12 "Lucide Grande" 12 t) - (ap/set-fonts "Anonymous Pro" 11 "Lucida Grande" 12 nil)))) + (ap/set-fonts "ProggyOptiS" 11 "Lucida Grande" 12 nil)))) ((eq window-system 'x) (ap/set-fonts "Source Code Pro" 10 "Input Sans" 10 t))))