From 6794d1fdd383f1b51fb62af578630badccc22116 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 14 Feb 2020 11:10:40 +0000 Subject: [PATCH] chore(themes): Update custom tweaks to doom-themes At some point I need to make a common function or something for any/all doom themes, as I tweak them all the same way :P --- themes/siren-theme-doom-nord-light.el | 28 +++++++++++++++++--------- themes/siren-theme-doom-nord.el | 28 +++++++++++++++++--------- themes/siren-theme-doom-one.el | 28 +++++++++++++++++--------- themes/siren-theme-doom-opera-light.el | 28 +++++++++++++++++--------- themes/siren-theme-doom-vibrant.el | 28 +++++++++++++++++--------- 5 files changed, 95 insertions(+), 45 deletions(-) diff --git a/themes/siren-theme-doom-nord-light.el b/themes/siren-theme-doom-nord-light.el index 511c399..c639a95 100644 --- a/themes/siren-theme-doom-nord-light.el +++ b/themes/siren-theme-doom-nord-light.el @@ -36,16 +36,26 @@ ;; (doom-themes-org-config) ;; Override some of doom-nord-light's colors. - (setq fci-rule-color (doom-color 'base3)) - (set-face-attribute 'hideshowvis-hidable-face nil - :foreground (doom-color 'base7)) - (set-face-attribute 'font-lock-variable-name-face nil - :foreground (doom-lighten (doom-color 'blue) 0.25)) - (set-face-attribute 'vertical-border nil - :foreground (doom-darken (doom-color 'vertical-bar) 0.1)) + (set-face-foreground 'font-lock-variable-name-face (doom-lighten 'blue 0.25)) + (set-face-foreground 'vertical-border (doom-darken 'vertical-bar 0.1)) + (set-face-background 'vertical-border (doom-darken 'vertical-bar 0.1)) + (when (not (version< emacs-version "27.0")) - (set-face-attribute 'fill-column-indicator nil - :foreground (doom-lighten (doom-color 'base3) 0.10)))) + (set-face-foreground 'fill-column-indicator (doom-lighten 'base3 0.10))) + + (with-eval-after-load 'diff-hl + (set-face-foreground 'diff-hl-insert (doom-blend 'vc-added 'bg 0.7)) + (set-face-background 'diff-hl-insert (doom-blend 'vc-added 'bg 0.2)) + (set-face-foreground 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.7)) + (set-face-background 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.2)) + (set-face-foreground 'diff-hl-change (doom-blend 'vc-modified 'bg 0.7)) + (set-face-background 'diff-hl-change (doom-blend 'vc-modified 'bg 0.2))) + + (with-eval-after-load 'hideshowvis + (set-face-foreground 'hideshowvis-hidable-face (doom-color 'base7))) + + (with-eval-after-load 'fill-column-indicator + (setq fci-rule-color (doom-lighten (doom-color 'base3) 0.10)))) (provide 'siren-theme-doom-nord-light) ;;; siren-theme-doom-nord-light.el ends here diff --git a/themes/siren-theme-doom-nord.el b/themes/siren-theme-doom-nord.el index d90b106..fbf2531 100644 --- a/themes/siren-theme-doom-nord.el +++ b/themes/siren-theme-doom-nord.el @@ -36,16 +36,26 @@ ;; (doom-themes-org-config) ;; Override some of doom-nord's colors. - (setq fci-rule-color (doom-color 'base3)) - (set-face-attribute 'hideshowvis-hidable-face nil - :foreground (doom-color 'base7)) - (set-face-attribute 'font-lock-variable-name-face nil - :foreground (doom-lighten (doom-color 'blue) 0.25)) - (set-face-attribute 'vertical-border nil - :foreground (doom-darken (doom-color 'vertical-bar) 0.1)) + (set-face-foreground 'font-lock-variable-name-face (doom-lighten 'blue 0.25)) + (set-face-foreground 'vertical-border (doom-darken 'vertical-bar 0.1)) + (set-face-background 'vertical-border (doom-darken 'vertical-bar 0.1)) + (when (not (version< emacs-version "27.0")) - (set-face-attribute 'fill-column-indicator nil - :foreground (doom-lighten (doom-color 'base3) 0.10)))) + (set-face-foreground 'fill-column-indicator (doom-lighten 'base3 0.10))) + + (with-eval-after-load 'diff-hl + (set-face-foreground 'diff-hl-insert (doom-blend 'vc-added 'bg 0.7)) + (set-face-background 'diff-hl-insert (doom-blend 'vc-added 'bg 0.2)) + (set-face-foreground 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.7)) + (set-face-background 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.2)) + (set-face-foreground 'diff-hl-change (doom-blend 'vc-modified 'bg 0.7)) + (set-face-background 'diff-hl-change (doom-blend 'vc-modified 'bg 0.2))) + + (with-eval-after-load 'hideshowvis + (set-face-foreground 'hideshowvis-hidable-face (doom-color 'base7))) + + (with-eval-after-load 'fill-column-indicator + (setq fci-rule-color (doom-lighten (doom-color 'base3) 0.10)))) (provide 'siren-theme-doom-nord) ;;; siren-theme-doom-nord.el ends here diff --git a/themes/siren-theme-doom-one.el b/themes/siren-theme-doom-one.el index 5f2ee6c..b458e8a 100644 --- a/themes/siren-theme-doom-one.el +++ b/themes/siren-theme-doom-one.el @@ -35,16 +35,26 @@ ;; (doom-themes-org-config) ;; Override some of doom-one's colors. - (setq fci-rule-color (doom-color 'base3)) - (set-face-attribute 'hideshowvis-hidable-face nil - :foreground (doom-color 'base7)) - (set-face-attribute 'font-lock-variable-name-face nil - :foreground (doom-lighten (doom-color 'blue) 0.25)) - (set-face-attribute 'vertical-border nil - :foreground (doom-darken (doom-color 'vertical-bar) 0.1)) + (set-face-foreground 'font-lock-variable-name-face (doom-lighten 'blue 0.25)) + (set-face-foreground 'vertical-border (doom-darken 'vertical-bar 0.1)) + (set-face-background 'vertical-border (doom-darken 'vertical-bar 0.1)) + (when (not (version< emacs-version "27.0")) - (set-face-attribute 'fill-column-indicator nil - :foreground (doom-lighten (doom-color 'base3) 0.10)))) + (set-face-foreground 'fill-column-indicator (doom-lighten 'base3 0.10))) + + (with-eval-after-load 'diff-hl + (set-face-foreground 'diff-hl-insert (doom-blend 'vc-added 'bg 0.7)) + (set-face-background 'diff-hl-insert (doom-blend 'vc-added 'bg 0.2)) + (set-face-foreground 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.7)) + (set-face-background 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.2)) + (set-face-foreground 'diff-hl-change (doom-blend 'vc-modified 'bg 0.7)) + (set-face-background 'diff-hl-change (doom-blend 'vc-modified 'bg 0.2))) + + (with-eval-after-load 'hideshowvis + (set-face-foreground 'hideshowvis-hidable-face (doom-color 'base7))) + + (with-eval-after-load 'fill-column-indicator + (setq fci-rule-color (doom-lighten (doom-color 'base3) 0.10)))) (provide 'siren-theme-doom-one) ;;; siren-theme-doom-one.el ends here diff --git a/themes/siren-theme-doom-opera-light.el b/themes/siren-theme-doom-opera-light.el index 6e54c13..1b97064 100644 --- a/themes/siren-theme-doom-opera-light.el +++ b/themes/siren-theme-doom-opera-light.el @@ -36,16 +36,26 @@ ;; (doom-themes-org-config) ;; Override some of doom-opera-light's colors. - (setq fci-rule-color (doom-color 'base3)) - (set-face-attribute 'hideshowvis-hidable-face nil - :foreground (doom-color 'base7)) - (set-face-attribute 'font-lock-variable-name-face nil - :foreground (doom-lighten (doom-color 'blue) 0.25)) - (set-face-attribute 'vertical-border nil - :foreground (doom-darken (doom-color 'vertical-bar) 0.1)) + (set-face-foreground 'font-lock-variable-name-face (doom-lighten 'blue 0.25)) + (set-face-foreground 'vertical-border (doom-darken 'vertical-bar 0.1)) + (set-face-background 'vertical-border (doom-darken 'vertical-bar 0.1)) + (when (not (version< emacs-version "27.0")) - (set-face-attribute 'fill-column-indicator nil - :foreground (doom-lighten (doom-color 'base3) 0.10)))) + (set-face-foreground 'fill-column-indicator (doom-lighten 'base3 0.10))) + + (with-eval-after-load 'diff-hl + (set-face-foreground 'diff-hl-insert (doom-blend 'vc-added 'bg 0.7)) + (set-face-background 'diff-hl-insert (doom-blend 'vc-added 'bg 0.2)) + (set-face-foreground 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.7)) + (set-face-background 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.2)) + (set-face-foreground 'diff-hl-change (doom-blend 'vc-modified 'bg 0.7)) + (set-face-background 'diff-hl-change (doom-blend 'vc-modified 'bg 0.2))) + + (with-eval-after-load 'hideshowvis + (set-face-foreground 'hideshowvis-hidable-face (doom-color 'base7))) + + (with-eval-after-load 'fill-column-indicator + (setq fci-rule-color (doom-lighten (doom-color 'base3) 0.10)))) (provide 'siren-theme-doom-opera-light) ;;; siren-theme-doom-opera-light.el ends here diff --git a/themes/siren-theme-doom-vibrant.el b/themes/siren-theme-doom-vibrant.el index 7d1f767..b3b9d16 100644 --- a/themes/siren-theme-doom-vibrant.el +++ b/themes/siren-theme-doom-vibrant.el @@ -35,16 +35,26 @@ ;; (doom-themes-org-config) ;; Override some of doom-vibrant's colors. - (setq fci-rule-color (doom-color 'base3)) - (set-face-attribute 'hideshowvis-hidable-face nil - :foreground (doom-color 'base7)) - (set-face-attribute 'font-lock-variable-name-face nil - :foreground (doom-lighten (doom-color 'blue) 0.25)) - (set-face-attribute 'vertical-border nil - :foreground (doom-darken (doom-color 'vertical-bar) 0.1)) + (set-face-foreground 'font-lock-variable-name-face (doom-lighten 'blue 0.25)) + (set-face-foreground 'vertical-border (doom-darken 'vertical-bar 0.1)) + (set-face-background 'vertical-border (doom-darken 'vertical-bar 0.1)) + (when (not (version< emacs-version "27.0")) - (set-face-attribute 'fill-column-indicator nil - :foreground (doom-lighten (doom-color 'base3) 0.10)))) + (set-face-foreground 'fill-column-indicator (doom-lighten 'base3 0.10))) + + (with-eval-after-load 'diff-hl + (set-face-foreground 'diff-hl-insert (doom-blend 'vc-added 'bg 0.7)) + (set-face-background 'diff-hl-insert (doom-blend 'vc-added 'bg 0.2)) + (set-face-foreground 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.7)) + (set-face-background 'diff-hl-delete (doom-blend 'vc-deleted 'bg 0.2)) + (set-face-foreground 'diff-hl-change (doom-blend 'vc-modified 'bg 0.7)) + (set-face-background 'diff-hl-change (doom-blend 'vc-modified 'bg 0.2))) + + (with-eval-after-load 'hideshowvis + (set-face-foreground 'hideshowvis-hidable-face (doom-color 'base7))) + + (with-eval-after-load 'fill-column-indicator + (setq fci-rule-color (doom-lighten (doom-color 'base3) 0.10)))) (provide 'siren-theme-doom-vibrant) ;;; siren-theme-doom-vibrant.el ends here