Merge branch 'master' of github.com:IvanMalison/dotfiles

dotfiles/emacs.d/README.org

@@ -2099,7 +2099,7 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
 #+BEGIN_SRC emacs-lisp
 (use-package flycheck
   :commands flycheck-mode
-  :init (add-hook 'prog-major-mode 'flycheck-mode)
+  :init (add-hook 'prog-mode-hook 'flycheck-mode)
   :config
   (progn
     (use-package flycheck-package
@@ -4743,6 +4743,8 @@ Ensure all themes that I use are installed:
 
 (use-package doom-themes
   :defer t)
+
+(use-package badwolf-theme)
 #+END_SRC
 ** all-the-icons
 #+BEGIN_SRC emacs-lisp

gen-gh-pages/compile.sh

@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+function run_make_on_org () {
+	original="$(pwd)"
+	cd .cask
+	cd "$(ls | head)"
+	cd elpa
+	cd "$(ls | grep org-plus)"
+	make autoloads
+	cd $original
+}
+
 export PATH="$HOME/.cask/bin:$HOME/.evm/bin:$PATH"
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -8,10 +18,17 @@ TARGET=$(readlink -f "$THIS_DIR/../dotfiles/emacs.d/README.org")
 git clone https://github.com/rejeep/evm.git "$HOME/.evm"
 evm config path /tmp
 evm install emacs-25.1-travis --use --skip
+export PATH="$HOME/.evm/bin:$PATH"
 
 curl -fsSkL https://raw.github.com/cask/cask/master/go | python
+export PATH="/home/travis/.cask/bin:$PATH"
+
+echo "this is PATH $PATH"
+type -a emacs
 
 cask install
+run_make_on_org
 cask exec emacs --script generate-html.el
 
 mv "$THIS_DIR/../dotfiles/emacs.d/README.html" .
+

tasks/brewfiles/essential

@@ -12,6 +12,7 @@ brew 'gnutls'
 brew 'go'
 brew 'htop-osx'
 brew 'leiningen'
+brew 'pass'
 brew 'pyenv'
 brew 'rcm'
 brew 'rbenv'
@@ -24,7 +25,6 @@ brew 'zsh'
 
 cask 'font-source-code-pro'
 cask 'alfred'
-cask 'flash'
 cask 'flycut'
 cask 'google-chrome'
 cask 'google-hangouts'
@@ -39,3 +39,4 @@ cask 'synergy'
 cask 'transmission'
 cask 'vlc'
 cask 'xquartz'
+cask 'font-source-code-pro'