emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ui/doom: update hooks, refactor & simplify

Browse source 
+ doom-init-ui-hook => doom-init-theme-hook
+ Remove specific mode hooks for solaire-mode (need to revisit this)
+ Preemptive removal of doom-popup-mode hook
+ Use function for hs-set-up-overlay instead of lambda
This commit is contained in:
Henrik Lissner 2018-01-03 14:28:00 -05:00
parent 565726b765
commit 93f3f0ef38
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
modules/ui/doom/config.el
View file

@ -6,25 +6,21 @@
(unless doom-theme (unless doom-theme
(setq doom-theme 'doom-one) (setq doom-theme 'doom-one)
(after! solaire-mode (after! solaire-mode
(add-hook 'doom-init-ui-hook #'solaire-mode-swap-bg t))) (add-hook 'doom-init-theme-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))
(add-hook 'doom-pre-reload-theme-hook #'+doom|reload-theme) (add-hook 'doom-pre-reload-theme-hook #'+doom|reload-theme)
;; improve integration w/ org-mode ;; improve integration w/ org-mode
(add-hook 'doom-init-ui-hook #'doom-themes-org-config) (add-hook 'doom-init-theme-hook #'doom-themes-org-config)
;; more Atom-esque file icons for neotree ;; more Atom-esque file icons for neotree
(add-hook 'doom-init-ui-hook #'doom-themes-neotree-config) (add-hook 'doom-init-theme-hook #'doom-themes-neotree-config)
(setq doom-neotree-enable-variable-pitch t (setq doom-neotree-enable-variable-pitch t
doom-neotree-file-icons 'simple doom-neotree-file-icons 'simple
doom-neotree-line-spacing 2) doom-neotree-line-spacing 2)
;; blink mode-line on errors
;; FIXME Breaks modeline
;; (add-hook 'doom-init-ui-hook #'doom-themes-visual-bell-config)
(after! neotree (after! neotree
(defun +doom|neotree-fix-popup () (defun +doom|neotree-fix-popup ()
"Ensure the fringe settings are maintained on popup restore." "Ensure the fringe settings are maintained on popup restore."
@ -35,16 +31,10 @@
(def-package! solaire-mode (def-package! solaire-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)
: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
(add-hook! '(doom-init-ui-hook doom-reload-hook) #'solaire-mode-reset) (add-hook! '(doom-init-theme-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
@ -57,18 +47,18 @@
:group 'doom) :group 'doom)
;; Nicer code-folding overlays (with fringe indicators) ;; Nicer code-folding overlays (with fringe indicators)
(setq hs-set-up-overlay (defun +doom-set-up-overlay (ov)
(lambda (ov) (when (eq 'code (overlay-get ov 'hs))
(when (eq 'code (overlay-get ov 'hs)) (when (featurep 'vimish-fold)
(when (featurep 'vimish-fold) (overlay-put
(overlay-put ov 'before-string
ov 'before-string (propertize "…" 'display
(propertize "…" 'display (list vimish-fold-indication-mode
(list vimish-fold-indication-mode 'empty-line
'empty-line 'vimish-fold-fringe))))
'vimish-fold-fringe)))) (overlay-put
(overlay-put ov 'display (propertize " [...] " 'face '+doom-folded-face))))
ov 'display (propertize " [...] " 'face '+doom-folded-face)))))) (setq hs-set-up-overlay #'+doom-set-up-overlay))
;; NOTE Adjust these bitmaps if you change `doom-fringe-size' ;; NOTE Adjust these bitmaps if you change `doom-fringe-size'