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

ui/doom: remove +doom-solaire-themes var

Browse source 
We'll simply activate solaire-mode and swap the bg faces for any doom-*
theme.

Also: add doom-themes extensions for org, treemacs and neotree sooner,
so an `after!` block isn't necessary to disable them.
This commit is contained in:
Henrik Lissner 2020-03-05 13:59:49 -05:00
parent 9ef3cdb673
commit 4170b72d91
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 2 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,52 +1,10 @@
;;; ui/doom/config.el -*- lexical-binding: t; -*- ;;; ui/doom/config.el -*- lexical-binding: t; -*-
(defvar +doom-solaire-themes
'((doom-acario-dark . t)
(doom-acario-light . t)
(doom-challenger-deep . t)
(doom-city-lights . t)
(doom-dark+ . t)
(doom-dracula . t)
(doom-fairy-floss . t)
(doom-gruvbox . t)
(doom-horizon . t)
(doom-laserwave . t)
(doom-losvkem . t)
(doom-manegarm . t)
(doom-material . t)
(doom-molokai . t)
(doom-moonlight . t)
(doom-nord . t)
(doom-nord-light . t)
(doom-nova . t)
(doom-oceanic-next . t)
(doom-one . t)
(doom-one-light . t)
(doom-outrun-electric . t)
(doom-opera . t)
(doom-palenight . t)
(doom-peacock . t)
(doom-snazzy . t)
(doom-solarized-dark . t)
(doom-solarized-light)
(doom-sourcerer . t)
(doom-spacegrey . t)
(doom-tomorrow-day . t)
(doom-tomorrow-night . t)
(doom-vibrant . t))
"An alist of themes that support `solaire-mode'. If CDR is t, then
`solaire-mode-swap-bg' will be used automatically, when the theme is loaded.")
;;
;;; Packages
(use-package! doom-themes (use-package! doom-themes
:defer t :defer t
:init :init
(unless doom-theme (unless doom-theme
(setq doom-theme 'doom-one)) (setq doom-theme 'doom-one))
:config
;; improve integration w/ org-mode ;; improve integration w/ org-mode
(add-hook 'doom-load-theme-hook #'doom-themes-org-config) (add-hook 'doom-load-theme-hook #'doom-themes-org-config)
;; more Atom-esque file icons for neotree/treemacs ;; more Atom-esque file icons for neotree/treemacs
@ -65,9 +23,9 @@
:init :init
(add-hook! 'doom-load-theme-hook :append (add-hook! 'doom-load-theme-hook :append
(defun +doom-solaire-mode-swap-bg-maybe-h () (defun +doom-solaire-mode-swap-bg-maybe-h ()
(pcase-let ((`(,_theme . ,swap) (assq doom-theme +doom-solaire-themes))) (when (string-prefix-p "doom-" (symbol-name doom-theme))
(require 'solaire-mode) (require 'solaire-mode)
(if swap (solaire-mode-swap-bg))))) (solaire-mode-swap-bg))))
:config :config
;; fringe can become unstyled when deleting or focusing frames ;; fringe can become unstyled when deleting or focusing frames
(add-hook 'focus-in-hook #'solaire-mode-reset) (add-hook 'focus-in-hook #'solaire-mode-reset)