From 7376f0c40148186a45883028cb9f9682b9ddc52e Mon Sep 17 00:00:00 2001 From: Kat Huang Date: Fri, 8 Sep 2017 12:35:21 -0700 Subject: [PATCH 1/7] [travis] Add evm bin to PATH --- gen-gh-pages/compile.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh index 5d1721ff..e7cae1ad 100755 --- a/gen-gh-pages/compile.sh +++ b/gen-gh-pages/compile.sh @@ -8,6 +8,7 @@ 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 From cb13c569cd9ca8398687c2be8d11c65e877c78de Mon Sep 17 00:00:00 2001 From: Kat Huang Date: Fri, 8 Sep 2017 12:35:51 -0700 Subject: [PATCH 2/7] [Brew] Add source code pro to essential --- tasks/brewfiles/essential | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/brewfiles/essential b/tasks/brewfiles/essential index 8035a56e..08936e06 100644 --- a/tasks/brewfiles/essential +++ b/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' From 96c8d729c3a1f9a8e9af707212766cb854f033ba Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 8 Sep 2017 12:51:01 -0700 Subject: [PATCH 3/7] [Emacs] Fix flycheck start whenever programming mode used --- dotfiles/emacs.d/README.org | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index e55bd79b..3fdab32a 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2088,7 +2088,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 @@ -4724,6 +4724,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 From f4e072823713268fe824103189fe66c21b4597c2 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 8 Sep 2017 12:57:43 -0700 Subject: [PATCH 4/7] [travis] Run make on org --- gen-gh-pages/compile.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh index e7cae1ad..c384b32a 100755 --- a/gen-gh-pages/compile.sh +++ b/gen-gh-pages/compile.sh @@ -13,6 +13,18 @@ export PATH="$HOME/.evm/bin:$PATH" curl -fsSkL https://raw.github.com/cask/cask/master/go | python cask install +run_make_on_org cask exec emacs --script generate-html.el mv "$THIS_DIR/../dotfiles/emacs.d/README.html" . + + +function run_make_on_org () { + original="$(pwd)" + cd .cask + cd "$(ls | head)" + cd elpa + cd "$(ls | grep org-plus)" + make autoloads + cd $original +} From 50c8aeca07ac09e16a388f14a17810e258dd2f65 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 8 Sep 2017 12:59:08 -0700 Subject: [PATCH 5/7] [travis] Show path --- gen-gh-pages/compile.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh index c384b32a..872990c8 100755 --- a/gen-gh-pages/compile.sh +++ b/gen-gh-pages/compile.sh @@ -11,6 +11,9 @@ 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" cask install run_make_on_org From d9ea3ecff2a6b6e436f21d6996e387035cd4a3f4 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 8 Sep 2017 12:59:33 -0700 Subject: [PATCH 6/7] [travis] Show emacs --- gen-gh-pages/compile.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh index 872990c8..76d751c4 100755 --- a/gen-gh-pages/compile.sh +++ b/gen-gh-pages/compile.sh @@ -14,6 +14,7 @@ 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 From fe145769ee0a04cfecc86c284730b1d6163345b4 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 8 Sep 2017 13:00:19 -0700 Subject: [PATCH 7/7] [travis] Move run_make_on_org to top --- gen-gh-pages/compile.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh index 76d751c4..3af25e92 100755 --- a/gen-gh-pages/compile.sh +++ b/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 )" @@ -22,13 +32,3 @@ cask exec emacs --script generate-html.el mv "$THIS_DIR/../dotfiles/emacs.d/README.html" . - -function run_make_on_org () { - original="$(pwd)" - cd .cask - cd "$(ls | head)" - cd elpa - cd "$(ls | grep org-plus)" - make autoloads - cd $original -}