commit 1e51c5810db4a66ece2e3105b7474068cfb25db8
parent f8ff7403c89efff91f17096c736c2fbaa4eb487c
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date: Thu, 13 Oct 2016 12:14:01 -0700
Merge branch 'master' of github.com:anders-dc/dotfiles
Diffstat:
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/.spacemacs b/.spacemacs
@@ -254,19 +254,23 @@ layers configuration."
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(ahs-case-fold-search nil)
- '(ahs-default-range (quote ahs-range-whole-buffer))
- '(ahs-idle-interval 0.25)
+ '(ahs-case-fold-search nil t)
+ '(ahs-default-range (quote ahs-range-whole-buffer) t)
+ '(ahs-idle-interval 0.25 t)
'(ahs-idle-timer 0 t)
- '(ahs-inhibit-face-list nil)
+ '(ahs-inhibit-face-list nil t)
'(expand-region-contract-fast-key "V")
'(expand-region-reset-fast-key "r")
'(org-agenda-files (quote ("~/doc/org-mode-hints.org")))
- '(ring-bell-function (quote ignore) t))
+ '(package-selected-packages
+ (quote
+ (zonokai-theme zenburn-theme zen-and-art-theme xterm-color ws-butler window-numbering web-mode volatile-highlights vi-tilde-fringe underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tronesque-theme toxi-theme toc-org tao-theme tangotango-theme tango-plus-theme tango-2-theme tagedit sunny-day-theme sublime-themes subatomic256-theme subatomic-theme stekene-theme spaceline powerline spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smooth-scrolling smeargle slim-mode shell-pop seti-theme scss-mode sass-mode reverse-theme reveal-in-osx-finder restart-emacs rainbow-delimiters railscasts-theme pyvenv pytest pyenv-mode py-yapf purple-haze-theme professional-theme popwin planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme persp-mode pcre2el pbcopy pastels-on-dark-theme paradox hydra spinner page-break-lines osx-trash orgit organic-green-theme org-repo-todo org-present org-pomodoro alert log4e gntp org-plus-contrib org-bullets open-junk-file omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term move-text monokai-theme monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc markdown-mode majapahit-theme magit-gitflow magit-gh-pulls lush-theme lua-mode lorem-ipsum linum-relative light-soap-theme leuven-theme less-css-mode launchctl jbeans-theme jazz-theme jade-mode ir-black-theme inkpot-theme info+ indent-guide ido-vertical-mode hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation heroku-theme hemisu-theme help-fns+ helm-themes helm-swoop helm-pydoc helm-projectile helm-mode-manager helm-make projectile helm-gitignore request helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag hc-zenburn-theme haml-mode gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio gnuplot gitignore-mode github-clone github-browse-file gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gist gh marshal logito pcache ht gh-md gandalf-theme flycheck-pos-tip flycheck pkg-info epl flx-ido flx flatui-theme flatland-theme fish-mode firebelly-theme fill-column-indicator farmhouse-theme fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit magit magit-popup git-commit with-editor evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-args evil-anzu anzu eval-sexp-fu highlight espresso-theme eshell-prompt-extras esh-help emmet-mode dracula-theme django-theme disaster define-word darktooth-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme company-web web-completion-data company-statistics company-quickhelp pos-tip company-c-headers company-auctex company-anaconda company colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized cmake-mode clues-theme clean-aindent-mode clang-format cherry-blossom-theme busybee-theme buffer-move bubbleberry-theme bracketed-paste birds-of-paradise-plus-theme badwolf-theme auto-yasnippet yasnippet auto-highlight-symbol auctex apropospriate-theme anti-zenburn-theme anaconda-mode pythonic f dash s ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core async ac-ispell auto-complete popup quelpa package-build use-package which-key bind-key bind-map evil spacemacs-theme)))
+ '(ring-bell-function (quote ignore)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- )
+ '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
+ '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))))
diff --git a/bin/uu b/bin/uu
@@ -41,11 +41,11 @@ echo "## Updating dotfiles"
cd ~/code/dotfiles && \
git pull; cd -
-echo "## Updating spacemacs"
-#git pull --rebase && \
-cd ~/.emacs.d && \
-git pull && \
-git submodule sync; git submodule update
+#echo "## Updating spacemacs"
+##git pull --rebase && \
+#cd ~/.emacs.d && \
+#git pull && \
+#git submodule sync; git submodule update
echo "## Updating pip"
pip install --upgrade pip
diff --git a/osx-install.sh b/osx-install.sh
@@ -3,7 +3,8 @@
# install homebrew
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-brew tap railwaycat/emacsmacport
+#brew tap railwaycat/emacsmacport
+brew tap d12frosted/emacs-plus
# launch and monitor services with `brew services list`, `brew services start
# offlineimap`, etc.
@@ -24,7 +25,7 @@ brews=( \
"catimg"\
"cmake"\
"ctags-exuberant"\
- "emacs-mac --with-spacemacs-icon"\
+ "emacs-plus"\
"exiftool"\
"ffmpeg"\
"fortune"\
@@ -75,8 +76,12 @@ brews=( \
for brew in "${brews[@]}"; do
brew install $brew
+ if [[ "$brew" == "emacs-plus" ]]; then
+ brew linkapps emacs-plus
+ fi
done
+
# from `brew cask list`
casks=("adobe-reader"\
"alfred"\
