Refactor solaire-mode init (fix startup errors in #285)

This commit is contained in:
Henrik Lissner 2017-12-09 16:52:23 -05:00
parent 4a04406b2b
commit 0ff5966379
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -3,7 +3,10 @@
;; <https://github.com/hlissner/emacs-doom-theme> ;; <https://github.com/hlissner/emacs-doom-theme>
(def-package! doom-themes (def-package! doom-themes
:config :config
(unless doom-theme (setq doom-theme 'doom-one)) (unless doom-theme
(setq doom-theme 'doom-one)
(after! solaire-mode
(add-hook 'doom-init-ui-hook #'solaire-mode-swap-bg t)))
;; Ensure `doom/reload-load-path' reloads common faces ;; Ensure `doom/reload-load-path' reloads common faces
(defun +doom|reload-theme () (load "doom-themes-common.el" nil t)) (defun +doom|reload-theme () (load "doom-themes-common.el" nil t))
@ -31,15 +34,17 @@
(def-package! solaire-mode (def-package! solaire-mode
:hook (gist-mode twittering-mode mu4e-view-mode org-tree-slide-mode +regex-mode)
:hook (after-change-major-mode . turn-on-solaire-mode) :hook (after-change-major-mode . turn-on-solaire-mode)
:hook (doom-popup-mode . turn-off-solaire-mode) :hook (doom-popup-mode . turn-off-solaire-mode)
:hook (doom-init-ui . solaire-mode-swap-bg)
:config :config
(setq solaire-mode-real-buffer-fn #'doom-real-buffer-p) (setq solaire-mode-real-buffer-fn #'doom-real-buffer-p)
;; Prevent color glitches when reloading either DOOM or the theme ;; Prevent color glitches when reloading either DOOM or the theme
(advice-add #'load-theme :after #'solaire-mode-reset) (add-hook! '(doom-init-ui-hook doom-reload-hook) #'solaire-mode-reset)
(add-hook! '(doom-init-ui-hook doom-reload-hook) #'solaire-mode-reset))
(add-hook!
(gist-mode twittering-mode mu4e-view-mode org-tree-slide-mode +regex-mode)
#'solaire-mode))
(after! hideshow (after! hideshow