From 0a72c333cbf33131ab0b693b58cb6b4551976a42 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 15 Jul 2022 22:57:50 +0100 Subject: [PATCH] chore(themes/doom-overrides): use doom-themes-set-faces helper The doom-themes-set-faces essentially just lets you apply a doom-themes faces spec against any theme you want. Since we're defining a theme meant to override and extend various faces from doom-themes, this makes it easier to do so, but also enables the use of targeting light and dark theme variants with &light and &dark. --- themes/siren-doom-themes-overrides-theme.el | 236 ++++++++++---------- 1 file changed, 120 insertions(+), 116 deletions(-) diff --git a/themes/siren-doom-themes-overrides-theme.el b/themes/siren-doom-themes-overrides-theme.el index f3ade69..cc4e27d 100644 --- a/themes/siren-doom-themes-overrides-theme.el +++ b/themes/siren-doom-themes-overrides-theme.el @@ -11,144 +11,148 @@ ;;; Code: +(require 'doom-themes) + (deftheme siren-doom-themes-overrides "Siren overrides for doom-themes.") -(custom-theme-set-faces - 'siren-doom-themes-overrides +(doom-themes-set-faces + 'siren-doom-themes-overrides + '(font-lock-variable-name-face :foreground (doom-lighten blue 0.25)) + '(vertical-border :foreground (doom-darken vertical-bar + (if window-system 0.4 0.0)) + :background (doom-color bg) ) + '(font-lock-comment-face :foreground (doom-lighten comments 0.15)) - `(font-lock-variable-name-face ((t (:foreground ,(doom-lighten 'blue 0.25))))) - `(vertical-border ((t ( :foreground ,(doom-darken 'vertical-bar - (if window-system 0.4 0.0)) - :background ,(doom-color 'bg) )))) - `(font-lock-comment-face ((t ( :foreground ,(doom-lighten 'comments 0.15) )))) + ;; whitespace-mode + '(whitespace-tab :foreground (doom-color base4) + :background (doom-color bg)) + '(trailing-whitespace :foregroup (doom-color base4) + :background (doom-color red)) - ;; whitespace-mode - `(whitespace-tab ((t ( :foreground ,(doom-color 'base4) - :background ,(doom-color 'bg) )))) - `(trailing-whitespace ((t ( :foregroup ,(doom-color 'base4) - :background ,(doom-color 'red) )))) + ;; fill-column-indicator + '(fill-column-indicator :foreground (doom-lighten base3 0.10)) - ;; fill-column-indicator - `(fill-column-indicator ((t ( :foreground ,(doom-lighten 'base3 0.10) )))) + ;; magit + '(magit-diff-hunk-heading :foreground (doom-color violet) + :background (doom-blend violet bg 0.3)) - ;; magit - `(magit-diff-hunk-heading ((t ( :foreground ,(doom-color 'violet) - :background ,(doom-blend 'violet 'bg 0.3))))) + ;; diff-hl + '(diff-hl-insert :foreground (doom-blend vc-added bg 0.7) + :background (doom-blend vc-added bg 0.2)) + '(diff-hl-delete :foreground (doom-blend vc-deleted bg 0.7) + :background (doom-blend vc-deleted bg 0.2)) + '(diff-hl-change :foreground (doom-blend vc-modified bg 0.7) + :background (doom-blend vc-modified bg 0.2)) - ;; diff-hl - `(diff-hl-insert ((t ( :foreground ,(doom-blend 'vc-added 'bg 0.7) - :background ,(doom-blend 'vc-added 'bg 0.2))))) - `(diff-hl-delete ((t ( :foreground ,(doom-blend 'vc-deleted 'bg 0.7) - :background ,(doom-blend 'vc-deleted 'bg 0.2))))) - `(diff-hl-change ((t ( :foreground ,(doom-blend 'vc-modified 'bg 0.7) - :background ,(doom-blend 'vc-modified 'bg 0.2))))) + '(siren-diff-hl-insert :foreground (doom-blend vc-added bg 0.7) + :background (doom-color bg)) + '(siren-diff-hl-delete :foreground (doom-blend vc-deleted bg 0.8) + :background (doom-color bg)) + '(siren-diff-hl-change :foreground (doom-blend vc-modified bg 0.7) + :background (doom-color bg)) - `(siren-diff-hl-insert ((t ( :foreground ,(doom-blend 'vc-added 'bg 0.7) - :background ,(doom-color 'bg))))) - `(siren-diff-hl-delete ((t ( :foreground ,(doom-blend 'vc-deleted 'bg 0.8) - :background ,(doom-color 'bg))))) - `(siren-diff-hl-change ((t ( :foreground ,(doom-blend 'vc-modified 'bg 0.7) - :background ,(doom-color 'bg))))) + ;; diff-hl-margin + '(diff-hl-margin-insert :foreground (doom-blend vc-added bg 0.6) + :background (doom-color bg)) + '(diff-hl-margin-delete :foreground (doom-blend vc-deleted bg 0.7) + :background (doom-color bg)) + '(diff-hl-margin-change :foreground (doom-blend vc-modified bg 0.6) + :background (doom-color bg)) - ;; diff-hl-margin - `(diff-hl-margin-insert ((t ( :foreground ,(doom-blend 'vc-added 'bg 0.6) - :background ,(doom-color 'bg))))) - `(diff-hl-margin-delete ((t ( :foreground ,(doom-blend 'vc-deleted 'bg 0.7) - :background ,(doom-color 'bg))))) - `(diff-hl-margin-change ((t ( :foreground ,(doom-blend 'vc-modified 'bg 0.6) - :background ,(doom-color 'bg))))) + ;; git-gutter + '(git-gutter:added :foreground (doom-blend vc-added bg 0.9)) + '(git-gutter:deleted :foreground (doom-blend vc-deleted bg 0.9)) + '(git-gutter:modified :foreground (doom-blend vc-modified bg 0.7)) - ;; git-gutter - `(git-gutter:added ((t ( :foreground ,(doom-blend 'vc-added 'bg 0.9) )))) - `(git-gutter:deleted ((t ( :foreground ,(doom-blend 'vc-deleted 'bg 0.9) )))) - `(git-gutter:modified ((t ( :foreground ,(doom-blend 'vc-modified 'bg 0.7) )))) + ;; git-gutter-fringe + '(git-gutter-fr:added :foreground (doom-blend vc-added bg 0.7) + :background (doom-blend vc-added bg 0.0)) + '(git-gutter-fr:deleted :foreground (doom-blend vc-deleted bg 0.7) + :background (doom-blend vc-deleted bg 0.0)) + '(git-gutter-fr:modified :foreground (doom-blend vc-modified bg 0.7) + :background (doom-blend vc-modified bg 0.0)) - ;; git-gutter-fringe - `(git-gutter-fr:added ((t ( :foreground ,(doom-blend 'vc-added 'bg 0.7) - :background ,(doom-blend 'vc-added 'bg 0.0) )))) - `(git-gutter-fr:deleted ((t ( :foreground ,(doom-blend 'vc-deleted 'bg 0.7) - :background ,(doom-blend 'vc-deleted 'bg 0.0) )))) - `(git-gutter-fr:modified ((t ( :foreground ,(doom-blend 'vc-modified 'bg 0.7) - :background ,(doom-blend 'vc-modified 'bg 0.0) )))) - ;; tree-sitter - `(tree-sitter-hl-face:property ((t (:inherit font-lock-constant-face)))) ;; disable italic - `(tree-sitter-hl-face:method.call ((t ( :foreground ,(doom-blend 'functions 'keywords 0.6) )))) - `(tree-sitter-hl-face:function.call ((t ( :foreground ,(doom-blend 'functions 'keywords 0.8) )))) + ;; tree-sitter + '(tree-sitter-hl-face:property :inherit font-lock-constant-face) ;; disable italic + '(tree-sitter-hl-face:method.call :foreground (doom-blend functions keywords 0.6)) + '(tree-sitter-hl-face:function.call :foreground (doom-blend functions keywords 0.8)) - ;; highlight-indent-guides - `(highlight-indent-guides-odd-face ((t ( :background ,(doom-lighten 'bg 0.06) )))) - `(highlight-indent-guides-top-odd-face ((t ( :background ,(doom-lighten 'bg 0.12) )))) - `(highlight-indent-guides-stack-odd-face ((t ( :background ,(doom-lighten 'bg 0.12) )))) - `(highlight-indent-guides-even-face ((t ( :background ,(doom-lighten 'bg 0.07) )))) - `(highlight-indent-guides-top-even-face ((t ( :background ,(doom-lighten 'bg 0.14) )))) - `(highlight-indent-guides-stack-even-face ((t ( :background ,(doom-lighten 'bg 0.14) )))) - `(highlight-indent-guides-character-face ((t ( :foreground ,(doom-lighten 'bg 0.12) )))) - `(highlight-indent-guides-top-character-face ((t ( :foreground ,(doom-lighten 'bg 0.25) )))) - `(highlight-indent-guides-stack-character-face ((t ( :foreground ,(doom-lighten 'bg 0.25) )))) + ;; highlight-indent-guides + '(highlight-indent-guides-odd-face :background (doom-lighten bg 0.06)) + '(highlight-indent-guides-top-odd-face :background (doom-lighten bg 0.12)) + '(highlight-indent-guides-stack-odd-face :background (doom-lighten bg 0.12)) + '(highlight-indent-guides-even-face :background (doom-lighten bg 0.07)) + '(highlight-indent-guides-top-even-face :background (doom-lighten bg 0.14)) + '(highlight-indent-guides-stack-even-face :background (doom-lighten bg 0.14)) + '(highlight-indent-guides-character-face :foreground (doom-lighten bg 0.12)) + '(highlight-indent-guides-top-character-face :foreground (doom-lighten bg 0.25)) + '(highlight-indent-guides-stack-character-face :foreground (doom-lighten bg 0.25)) - ;; hideshowvis - `(hideshowvis-hidable-face ((t ( :foreground ,(doom-color 'base7) )))) + ;; hideshowvis + '(hideshowvis-hidable-face :foreground (doom-color base7)) - ;; auto-highlight-symbol - `(ahs-definition-face ((t ( :foreground 'unspecified - :background ,(doom-lighten 'bg 0.1) - :underline t )))) - `(ahs-edit-mode-face ((t ( :foreground ,(doom-lighten 'fg 1.0) - :background ,(doom-darken 'red 0.25) )))) - `(ahs-face ((t ( :foreground 'unspecified - :background ,(doom-lighten 'bg 0.1) )))) - `(ahs-plugin-bod-face ((t ( :foreground 'unspecified - :background ,(doom-color 'bg-alt) )))) - `(ahs-plugin-defalt-face ((t ( :foreground 'unspecified - :background ,(doom-color 'bg-alt) )))) - `(ahs-plugin-whole-buffer-face ((t ( :foreground 'unspecified - :background ,(doom-color 'bg-alt) )))) - `(ahs-warning-face ((t ( :foreground ,(doom-color 'red) - :background 'unspecified )))) + ;; auto-highlight-symbol + '(ahs-definition-face :foreground 'unspecified + :background (doom-lighten bg 0.1) + :underline t) + '(ahs-edit-mode-face :foreground (doom-lighten fg 1.0) + :background (doom-darken red 0.25)) + '(ahs-face :foreground 'unspecified + :background (doom-lighten bg 0.1)) + '(ahs-plugin-bod-face :foreground 'unspecified + :background (doom-color bg-alt)) + '(ahs-plugin-defalt-face :foreground 'unspecified + :background (doom-color bg-alt)) + '(ahs-plugin-whole-buffer-face :foreground 'unspecified + :background (doom-color bg-alt)) + '(ahs-warning-face :foreground (doom-color red) + :background 'unspecified) - ;; dired+ - `(diredp-dir-heading ((t ( :foreground ,(doom-color 'magenta) )))) - `(diredp-dir-name ((t ( :foreground ,(doom-lighten 'magenta 0.25) )))) - `(diredp-flag-mark ((t ( :foreground ,(doom-color 'green) - :background ,(doom-blend 'bg 'orange 0.5) )))) - `(diredp-flag-mark-line ((t ( :foreground ,(doom-color 'base8) - :background ,(doom-blend 'bg 'orange 0.7) )))) - `(diredp-deletion ((t ( :foreground ,(doom-color 'yellow) - :background ,(doom-darken 'red 0.25) )))) - `(diredp-deletion-file-name ((t ( :foreground ,(doom-color 'red) )))) - `(diredp-compressed-file-name ((t ( :foreground ,(doom-color 'blue) )))) + ;; dired+ + '(diredp-dir-heading :foreground (doom-color magenta)) + '(diredp-dir-name :foreground (doom-lighten magenta 0.25)) + '(diredp-flag-mark :foreground (doom-color green) + :background (doom-blend bg orange 0.5)) + '(diredp-flag-mark-line :foreground (doom-color base8) + :background (doom-blend bg orange 0.7)) + '(diredp-deletion :foreground (doom-color yellow) + :background (doom-darken red 0.25)) + '(diredp-deletion-file-name :foreground (doom-color red)) + '(diredp-compressed-file-name :foreground (doom-color blue)) - ;; treemacs - `(siren-treemacs-line-highlight ((t ( :background ,(doom-blend 'violet 'bg 0.2) - :extend t )))) + ;; treemacs + '(siren-treemacs-line-highlight :background (doom-blend violet bg 0.2) + :extend t) - ;; selectrum - `(selectrum-current-candidate ((t ( :background ,(doom-blend 'violet 'bg 0.2) - :foreground ,(doom-blend 'violet 'fg 0.3) - :distant-foreground nil :extend t )))) - `(selectrum-prescient-primary-highlight ((t ( :foreground ,(doom-lighten 'magenta 0.15) - :weight 'light )))) - `(selectrum-prescient-secondary-highlight ((t ( :foreground ,(doom-blend 'magenta 'red 0.6) - :weight 'bold )))) + ;; selectrum + '(selectrum-current-candidate :background (doom-blend violet bg 0.2) + :foreground (doom-blend violet fg 0.3) + :distant-foreground nil + :extend t) + '(selectrum-prescient-primary-highlight :foreground (doom-lighten magenta 0.15) + :weight 'light) + '(selectrum-prescient-secondary-highlight :foreground (doom-blend magenta red 0.6) + :weight 'bold) - ;; vertico - `(vertico-current ((t ( :background ,(doom-blend 'violet 'bg 0.2) - :foreground ,(doom-blend 'violet 'fg 0.3) - :distant-foreground nil :extend t )))) + ;; vertico + '(vertico-current :background (doom-blend violet bg 0.2) + :foreground (doom-blend violet fg 0.3) + :distant-foreground nil + :extend t) - ;; orderless - `(orderless-match-face-0 ((t ( :foreground ,(doom-lighten 'magenta 0.15) )))) - `(orderless-match-face-1 ((t ( :foreground ,(doom-lighten 'magenta '0.3) )))) - `(orderless-match-face-2 ((t ( :foreground ,(doom-blend 'magenta 'red 0.4) )))) - `(orderless-match-face-3 ((t ( :foreground ,(doom-blend 'magenta 'red 0.7) )))) + ;; orderless + '(orderless-match-face-0 :foreground (doom-lighten magenta 0.15)) + '(orderless-match-face-1 :foreground (doom-lighten magenta 0.3)) + '(orderless-match-face-2 :foreground (doom-blend magenta red 0.4)) + '(orderless-match-face-3 :foreground (doom-blend magenta red 0.7)) - ;; helm - `(helm-selection ((t ( :inherit 'bold - :background ,(doom-blend 'violet 'bg 0.2) - :extend t )))) - `(helm-posframe-border ((t ( :background ,(doom-color 'dark-blue) ))))) + ;; helm + '(helm-selection :inherit 'bold + :background (doom-blend violet bg 0.2) + :extend t) + '(helm-posframe-border :background (doom-color dark-blue))) (custom-theme-set-variables 'siren-doom-themes-overrides