;; Author: Protesilaos Stavrou <info@protesilaos.com>
;; URL: https://gitlab.com/protesilaos/modus-themes
-;; Version: 1.2.4
+;; Version: 1.3.2
+;; Last-Modified: <2021-04-18 06:25:05 +0300>
;; Package-Requires: ((emacs "26.1"))
;; Keywords: faces, theme, accessibility
;; modus-themes-mode-line (choice)
;; modus-themes-diffs (choice)
;; modus-themes-syntax (choice)
-;; modus-themes-intense-hl-line (boolean)
+;; modus-themes-hl-line (choice)
;; modus-themes-subtle-line-numbers (boolean)
;; modus-themes-paren-match (choice)
;; modus-themes-region (choice)
;; compilation-mode
;; completions
;; consult
+;; corfu
;; counsel
;; counsel-css
;; counsel-notmuch
;; eldoc-box
;; elfeed
;; elfeed-score
+;; embark
;; emms
-;; enhanced-ruby-mode
+;; enh-ruby-mode (enhanced-ruby-mode)
;; epa
;; equake
;; erc
;; outline-minor-faces
;; package (M-x list-packages)
;; page-break-lines
+;; pandoc-mode
;; paradox
;; paren-face
;; parrot
;; swoop
;; sx
;; symbol-overlay
+;; syslog-mode
+;; tab-bar-groups
;; tab-bar-mode
;; tab-line-mode
-;; syslog-mode
;; table (built-in table.el)
+;; telega
;; telephone-line
;; terraform-mode
;; term
;; vc (built-in mode line status for version control)
;; vc-annotate (C-x v g)
;; vdiff
+;; vertico
;; vimish-fold
;; visible-mark
;; visual-regexp
;;; News:
;;
;; Users updating from older versions to >= 1.0.0, are advised to read
-;; the anouncement on the emacs-devel mailing list:
+;; the announcement on the emacs-devel mailing list:
;; <https://lists.gnu.org/archive/html/emacs-devel/2021-03/msg00300.html>.
;;
;; The web page of the change log is also available:
(bg-alt . "#f0f0f0") (fg-alt . "#505050")
;; specifically for on/off states and must be combined with
;; themselves, though the backgrounds are also meant to be used with
- ;; other "active" values, defined further below
+ ;; other "active" values, defined further below; bg-active-accent
+ ;; can work as a substitute for bg-active
(bg-active . "#d7d7d7") (fg-active . "#0a0a0a")
(bg-inactive . "#efefef") (fg-inactive . "#404148")
+ (bg-active-accent . "#d0d6ff")
;; these special values are intended as alternatives to the base
;; values for cases where we need to avoid confusion between the
;; highlighted constructs; they must either be used as pairs based
;; those foregrounds are meant exclusively for bg-active, bg-inactive
(red-active . "#8a0000")
(green-active . "#004c2e")
- (yellow-active . "#702d1f")
+ (yellow-active . "#702f00")
(blue-active . "#0030b4")
(magenta-active . "#5c2092")
(cyan-active . "#003f8a")
;; the "subtle" values below be combined with fg-dim, while the
;; "intense" should be paired with fg-main
(red-subtle-bg . "#f2b0a2")
- (red-intense-bg . "#ff8892")
+ (red-intense-bg . "#ff9f9f")
(green-subtle-bg . "#aecf90")
(green-intense-bg . "#5ada88")
(yellow-subtle-bg . "#e4c340")
(yellow-intense-bg . "#f5df23")
(blue-subtle-bg . "#b5d0ff")
- (blue-intense-bg . "#6aaeff")
+ (blue-intense-bg . "#77baff")
(magenta-subtle-bg . "#f0d3ff")
(magenta-intense-bg . "#d5baff")
(cyan-subtle-bg . "#c0efff")
(red-refine-bg . "#ffcccc") (red-refine-fg . "#780000")
(green-refine-bg . "#aceaac") (green-refine-fg . "#004c00")
(yellow-refine-bg . "#fff29a") (yellow-refine-fg . "#604000")
- (blue-refine-bg . "#8ac7ff") (blue-refine-fg . "#002288")
+ (blue-refine-bg . "#8fcfff") (blue-refine-fg . "#002f88")
(magenta-refine-bg . "#ffccff") (magenta-refine-fg . "#770077")
(cyan-refine-bg . "#8eecf4") (cyan-refine-fg . "#004850")
;; the "nuanced" backgrounds can be combined with all of the above
;; work with all accents that cover those two, plus bg-main
;;
;; bg-hl-alt and bg-hl-alt-intense should only be used when no
- ;; other greyscale or fairly neutral background is available to
+ ;; other grayscale or fairly neutral background is available to
;; properly draw attention to a given construct
;;
;; bg-header is between bg-active and bg-inactive, so it
;; can be combined with any of the "active" values, plus the
;; "special" and base foreground colors
;;
- ;; bg-paren-match, bg-paren-match-intense, bg-region and
- ;; bg-tab-active must be combined with fg-main, while
- ;; bg-tab-inactive should be combined with fg-dim, whereas
+ ;; bg-paren-match, bg-paren-match-intense, bg-region,
+ ;; bg-region-accent and bg-tab-active must be combined with fg-main,
+ ;; while bg-tab-inactive should be combined with fg-dim, whereas
;; bg-tab-inactive-alt goes together with fg-main
;;
;; bg-tab-bar is only intended for the bar that holds the tabs and
;; can only be combined with fg-main
;;
- ;; fg-tab-active is meant to be combined with bg-tab-active,
+ ;; fg-tab-accent is meant to be combined with bg-tab-active,
;; though only for styling special elements, such as underlining
;; the current tab
;;
(bg-paren-match . "#e0af82")
(bg-paren-match-intense . "#c488ff")
(bg-region . "#bcbcbc")
+ (bg-region-accent . "#afafef")
(bg-tab-bar . "#d5d5d5")
(bg-tab-active . "#f6f6f6")
(bg-tab-inactive . "#bdbdbd")
(bg-tab-inactive-alt . "#999999")
- (fg-tab-active . "#30169e")
+ (fg-tab-accent . "#30169e")
+
+ (red-tab . "#680000")
+ (green-tab . "#003900")
+ (yellow-tab . "#393000")
+ (orange-tab . "#502300")
+ (blue-tab . "#000080")
+ (cyan-tab . "#052f60")
+ (magenta-tab . "#5f004d")
+ (purple-tab . "#400487")
(fg-escape-char-construct . "#8b1030")
(fg-escape-char-backslash . "#654d0f")
(bg-diff-focus-changed . "#ecdfbf") (fg-diff-focus-changed . "#392900")
(bg-diff-focus-removed . "#efcbcf") (fg-diff-focus-removed . "#4a0000")
- (bg-diff-neutral-0 . "#979797") (fg-diff-neutral-0 . "#040404")
- (bg-diff-neutral-1 . "#b0b0b0") (fg-diff-neutral-1 . "#252525")
- (bg-diff-neutral-2 . "#cccccc") (fg-diff-neutral-2 . "#3a3a3a")
-
(bg-mark-sel . "#a0f0cf") (fg-mark-sel . "#005040")
(bg-mark-del . "#ffccbb") (fg-mark-del . "#840040")
(bg-mark-alt . "#f5d88f") (fg-mark-alt . "#782900"))
(defconst modus-themes-vivendi-colors
'(;; base values
(bg-main . "#000000") (fg-main . "#ffffff")
- (bg-dim . "#110b11") (fg-dim . "#e0e6f0")
- (bg-alt . "#181a20") (fg-alt . "#a8a8a8")
+ (bg-dim . "#100f10") (fg-dim . "#e0e6f0")
+ (bg-alt . "#191a1b") (fg-alt . "#a8a8a8")
;; specifically for on/off states and must be combined with
;; themselves, though the backgrounds are also meant to be used with
- ;; other "active" values, defined further below
+ ;; other "active" values, defined further below; bg-active-accent
+ ;; can work as a substitute for bg-active
(bg-active . "#323232") (fg-active . "#f4f4f4")
(bg-inactive . "#1e1e1e") (fg-inactive . "#bfc0c4")
+ (bg-active-accent . "#2a2a66")
;; these special values are intended as alternatives to the base
;; values for cases where we need to avoid confusion between the
;; highlighted constructs; they must either be used as pairs based
(red-refine-bg . "#77002a") (red-refine-fg . "#ffb9ab")
(green-refine-bg . "#00422a") (green-refine-fg . "#9ff0cf")
(yellow-refine-bg . "#693200") (yellow-refine-fg . "#e2d980")
- (blue-refine-bg . "#242679") (blue-refine-fg . "#8ec6ff")
+ (blue-refine-bg . "#242679") (blue-refine-fg . "#8ecfff")
(magenta-refine-bg . "#71206a") (magenta-refine-fg . "#ffcaf0")
(cyan-refine-bg . "#004065") (cyan-refine-fg . "#8ae4f2")
;; the "nuanced" backgrounds can be combined with all of the above
;; work with all accents that cover those two, plus bg-main
;;
;; bg-hl-alt and bg-hl-alt-intense should only be used when no
- ;; other greyscale or fairly neutral background is available to
+ ;; other grayscale or fairly neutral background is available to
;; properly draw attention to a given construct
;;
;; bg-header is between bg-active and bg-inactive, so it
;; can be combined with any of the "active" values, plus the
;; "special" and base foreground colors
;;
- ;; bg-paren-match, bg-paren-match-intense, bg-region and
- ;; bg-tab-active must be combined with fg-main, while
- ;; bg-tab-inactive should be combined with fg-dim, whereas
+ ;; bg-paren-match, bg-paren-match-intense, bg-region,
+ ;; bg-region-accent and bg-tab-active must be combined with fg-main,
+ ;; while bg-tab-inactive should be combined with fg-dim, whereas
;; bg-tab-inactive-alt goes together with fg-main
;;
;; bg-tab-bar is only intended for the bar that holds the tabs and
;; can only be combined with fg-main
;;
- ;; fg-tab-active is meant to be combined with bg-tab-active,
+ ;; fg-tab-accent is meant to be combined with bg-tab-active,
;; though only for styling special elements, such as underlining
;; the current tab
;;
(bg-paren-match . "#5f362f")
(bg-paren-match-intense . "#7416b5")
(bg-region . "#3c3c3c")
+ (bg-region-accent . "#4f3d88")
(bg-tab-bar . "#2c2c2c")
(bg-tab-active . "#0e0e0e")
(bg-tab-inactive . "#3d3d3d")
(bg-tab-inactive-alt . "#595959")
- (fg-tab-active . "#5ac3cf")
+ (fg-tab-accent . "#5ac3cf")
+
+ (red-tab . "#ffc0bf")
+ (green-tab . "#88ef88")
+ (yellow-tab . "#d2e580")
+ (orange-tab . "#f5ca80")
+ (blue-tab . "#92d9ff")
+ (cyan-tab . "#60e7e0")
+ (magenta-tab . "#ffb8ff")
+ (purple-tab . "#cfcaff")
(fg-escape-char-construct . "#e7a59a")
(fg-escape-char-backslash . "#abab00")
(bg-diff-focus-changed . "#4a3a10") (fg-diff-focus-changed . "#d0daaf")
(bg-diff-focus-removed . "#5e2526") (fg-diff-focus-removed . "#eebdba")
- (bg-diff-neutral-0 . "#575757") (fg-diff-neutral-0 . "#fcfcfc")
- (bg-diff-neutral-1 . "#454545") (fg-diff-neutral-1 . "#dddddd")
- (bg-diff-neutral-2 . "#313131") (fg-diff-neutral-2 . "#bfbfbf")
-
(bg-mark-sel . "#002f2f") (fg-mark-sel . "#60cfa2")
(bg-mark-del . "#5a0000") (fg-mark-del . "#ff99aa")
(bg-mark-alt . "#3f2210") (fg-mark-alt . "#f0aa20"))
;; These faces are used internally to ensure consistency between various
;; groups and to streamline the evaluation of relevant customization
;; options.
-(defface modus-theme-subtle-red nil
+(defface modus-themes-subtle-red nil
"Subtle red background combined with a dimmed foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-subtle-green nil
+(defface modus-themes-subtle-green nil
"Subtle green background combined with a dimmed foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-subtle-yellow nil
+(defface modus-themes-subtle-yellow nil
"Subtle yellow background combined with a dimmed foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-subtle-blue nil
+(defface modus-themes-subtle-blue nil
"Subtle blue background combined with a dimmed foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-subtle-magenta nil
+(defface modus-themes-subtle-magenta nil
"Subtle magenta background combined with a dimmed foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-subtle-cyan nil
+(defface modus-themes-subtle-cyan nil
"Subtle cyan background combined with a dimmed foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-subtle-neutral nil
+(defface modus-themes-subtle-neutral nil
"Subtle gray background combined with a dimmed foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-intense-red nil
+(defface modus-themes-intense-red nil
"Intense red background combined with the main foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-intense-green nil
+(defface modus-themes-intense-green nil
"Intense green background combined with the main foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-intense-yellow nil
+(defface modus-themes-intense-yellow nil
"Intense yellow background combined with the main foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-intense-blue nil
+(defface modus-themes-intense-blue nil
"Intense blue background combined with the main foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-intense-magenta nil
+(defface modus-themes-intense-magenta nil
"Intense magenta background combined with the main foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-intense-cyan nil
+(defface modus-themes-intense-cyan nil
"Intense cyan background combined with the main foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-intense-neutral nil
+(defface modus-themes-intense-neutral nil
"Intense gray background combined with the main foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-refine-red nil
+(defface modus-themes-refine-red nil
"Combination of accented red background and foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-refine-green nil
+(defface modus-themes-refine-green nil
"Combination of accented green background and foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-refine-yellow nil
+(defface modus-themes-refine-yellow nil
"Combination of accented yellow background and foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-refine-blue nil
+(defface modus-themes-refine-blue nil
"Combination of accented blue background and foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-refine-magenta nil
+(defface modus-themes-refine-magenta nil
"Combination of accented magenta background and foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-refine-cyan nil
+(defface modus-themes-refine-cyan nil
"Combination of accented cyan background and foreground.
This is used for general purpose highlighting, mostly in buffers
or for completion interfaces.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-active-red nil
+(defface modus-themes-active-red nil
"A red background meant for use on the modeline or similar.
This is combined with the modelines primary foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-active-green nil
+(defface modus-themes-active-green nil
"A green background meant for use on the modeline or similar.
This is combined with the modelines primary foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-active-yellow nil
+(defface modus-themes-active-yellow nil
"A yellow background meant for use on the modeline or similar.
This is combined with the modelines primary foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-active-blue nil
+(defface modus-themes-active-blue nil
"A blue background meant for use on the modeline or similar.
This is combined with the modelines primary foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-active-magenta nil
+(defface modus-themes-active-magenta nil
"A magenta background meant for use on the modeline or similar.
This is combined with the modelines primary foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-active-cyan nil
+(defface modus-themes-active-cyan nil
"A cyan background meant for use on the modeline or similar.
This is combined with the modelines primary foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-fringe-red nil
+(defface modus-themes-fringe-red nil
"A red background meant for use on the fringe or similar.
This is combined with the main foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-fringe-green nil
+(defface modus-themes-fringe-green nil
"A green background meant for use on the fringe or similar.
This is combined with the main foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-fringe-yellow nil
+(defface modus-themes-fringe-yellow nil
"A yellow background meant for use on the fringe or similar.
This is combined with the main foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-fringe-blue nil
+(defface modus-themes-fringe-blue nil
"A blue background meant for use on the fringe or similar.
This is combined with the main foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-fringe-magenta nil
+(defface modus-themes-fringe-magenta nil
"A magenta background meant for use on the fringe or similar.
This is combined with the main foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-fringe-cyan nil
+(defface modus-themes-fringe-cyan nil
"A cyan background meant for use on the fringe or similar.
This is combined with the main foreground value.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-nuanced-red nil
+(defface modus-themes-nuanced-red nil
"A nuanced red background.
This does not specify a foreground of its own. Instead it is meant to
serve as the backdrop for elements such as Org blocks, headings, and any
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-nuanced-green nil
+(defface modus-themes-nuanced-green nil
"A nuanced green background.
This does not specify a foreground of its own. Instead it is meant to
serve as the backdrop for elements such as Org blocks, headings, and any
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-nuanced-yellow nil
+(defface modus-themes-nuanced-yellow nil
"A nuanced yellow background.
This does not specify a foreground of its own. Instead it is meant to
serve as the backdrop for elements such as Org blocks, headings, and any
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-nuanced-blue nil
+(defface modus-themes-nuanced-blue nil
"A nuanced blue background.
This does not specify a foreground of its own. Instead it is meant to
serve as the backdrop for elements such as Org blocks, headings, and any
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-nuanced-magenta nil
+(defface modus-themes-nuanced-magenta nil
"A nuanced magenta background.
This does not specify a foreground of its own. Instead it is meant to
serve as the backdrop for elements such as Org blocks, headings, and any
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-nuanced-cyan nil
+(defface modus-themes-nuanced-cyan nil
"A nuanced cyan background.
This does not specify a foreground of its own. Instead it is meant to
serve as the backdrop for elements such as Org blocks, headings, and any
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-special-cold nil
+(defface modus-themes-special-cold nil
"Combines the 'special cold' background and foreground values.
This is intended for cases when a neutral gray background is not
suitable and where a combination of more saturated colors would not be
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-special-mild nil
+(defface modus-themes-special-mild nil
"Combines the 'special mild' background and foreground values.
This is intended for cases when a neutral gray background is not
suitable and where a combination of more saturated colors would not be
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-special-warm nil
+(defface modus-themes-special-warm nil
"Combines the 'special warm' background and foreground values.
This is intended for cases when a neutral gray background is not
suitable and where a combination of more saturated colors would not be
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-special-calm nil
+(defface modus-themes-special-calm nil
"Combines the 'special calm' background and foreground values.
This is intended for cases when a neutral gray background is not
suitable and where a combination of more saturated colors would not be
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-added nil
+(defface modus-themes-diff-added nil
"Combines green colors for the 'added' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-changed nil
+(defface modus-themes-diff-changed nil
"Combines yellow colors for the 'changed' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-removed nil
+(defface modus-themes-diff-removed nil
"Combines red colors for the 'removed' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-refine-added nil
+(defface modus-themes-diff-refine-added nil
"Combines green colors for word-wise 'added' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-refine-changed nil
+(defface modus-themes-diff-refine-changed nil
"Combines yellow colors for word-wise 'changed' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-refine-removed nil
+(defface modus-themes-diff-refine-removed nil
"Combines red colors for word-wise 'removed' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-focus-added nil
+(defface modus-themes-diff-focus-added nil
"Combines green colors for the focused 'added' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-focus-changed nil
+(defface modus-themes-diff-focus-changed nil
"Combines yellow colors for the focused 'changed' state in.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-focus-removed nil
+(defface modus-themes-diff-focus-removed nil
"Combines red colors for the focused 'removed' state in diffs.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-diff-heading nil
+(defface modus-themes-diff-heading nil
"Combines blue colors for the diff hunk heading.
The applied colors are contingent on the value assigned to
`modus-themes-diffs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-pseudo-header nil
+(defface modus-themes-pseudo-header nil
"Generic style for some elements that function like headings.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-mark-alt nil
- "Combines yellow colors for marking special lines
+(defface modus-themes-mark-alt nil
+ "Combines yellow colors for marking special lines.
This is intended for use in modes such as Dired, Ibuffer, Proced.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-mark-del nil
- "Combines red colors for marking deletable lines
+(defface modus-themes-mark-del nil
+ "Combines red colors for marking deletable lines.
This is intended for use in modes such as Dired, Ibuffer, Proced.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-mark-sel nil
- "Combines green colors for marking lines
+(defface modus-themes-mark-sel nil
+ "Combines green colors for marking lines.
This is intended for use in modes such as Dired, Ibuffer, Proced.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-mark-symbol nil
+(defface modus-themes-mark-symbol nil
"Applies a blue color and other styles for mark indicators.
This is intended for use in modes such as Dired, Ibuffer, Proced.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-1 nil
- "General purpose face for use in headings level 1
+(defface modus-themes-heading-1 nil
+ "General purpose face for use in headings level 1.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-2 nil
+(defface modus-themes-heading-2 nil
"General purpose face for use in headings level 2.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-3 nil
+(defface modus-themes-heading-3 nil
"General purpose face for use in headings level 3.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-4 nil
+(defface modus-themes-heading-4 nil
"General purpose face for use in headings level 4.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-5 nil
+(defface modus-themes-heading-5 nil
"General purpose face for use in headings level 5.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-6 nil
+(defface modus-themes-heading-6 nil
"General purpose face for use in headings level 6.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-7 nil
+(defface modus-themes-heading-7 nil
"General purpose face for use in headings level 7.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-heading-8 nil
+(defface modus-themes-heading-8 nil
"General purpose face for use in headings level 8.
The exact attributes assigned to this face are contingent on the values
assigned to the `modus-themes-headings' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-hl-line nil
+(defface modus-themes-hl-line nil
"General purpose face for the current line.
The exact attributes assigned to this face are contingent on the values
-assigned to the `modus-themes-intense-hl-line' variable.
+assigned to the `modus-themes-hl-line' variable.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-bold nil
+(defface modus-themes-bold nil
"Generic face for applying a conditional bold weight.
This behaves in accordance with `modus-themes-bold-constructs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-slant nil
+(defface modus-themes-slant nil
"Generic face for applying a conditional slant (italics).
This behaves in accordance with `modus-themes-slanted-constructs'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-variable-pitch nil
+(defface modus-themes-variable-pitch nil
"Generic face for applying a conditional `variable-pitch'.
This behaves in accordance with `modus-themes-no-mixed-fonts',
`modus-themes-variable-pitch-headings' for all heading levels, and
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-red-0 nil
+(defface modus-themes-graph-red-0 nil
"Special subdued red face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-red-1 nil
+(defface modus-themes-graph-red-1 nil
"Special prominent red face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-green-0 nil
+(defface modus-themes-graph-green-0 nil
"Special subdued green face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-green-1 nil
+(defface modus-themes-graph-green-1 nil
"Special prominent green face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-yellow-0 nil
+(defface modus-themes-graph-yellow-0 nil
"Special subdued yellow face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-yellow-1 nil
+(defface modus-themes-graph-yellow-1 nil
"Special prominent yellow face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-blue-0 nil
+(defface modus-themes-graph-blue-0 nil
"Special subdued blue face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-blue-1 nil
+(defface modus-themes-graph-blue-1 nil
"Special prominent blue face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-magenta-0 nil
+(defface modus-themes-graph-magenta-0 nil
"Special subdued magenta face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-magenta-1 nil
+(defface modus-themes-graph-magenta-1 nil
"Special prominent magenta face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-cyan-0 nil
+(defface modus-themes-graph-cyan-0 nil
"Special subdued cyan face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-graph-cyan-1 nil
+(defface modus-themes-graph-cyan-1 nil
"Special prominent cyan face for use in graphs.
This is intended to be applied in contexts such as the Org agenda habit
graph where faithfulness to the semantics of a color value is of
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-lang-note nil
+(defface modus-themes-lang-note nil
"Generic face for linter or spell checker notes.
The exact attributes and color combinations are controlled by
`modus-themes-lang-checkers'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-lang-warning nil
+(defface modus-themes-lang-warning nil
"Generic face for linter or spell checker warnings.
The exact attributes and color combinations are controlled by
`modus-themes-lang-checkers'.
The actual styling of the face is done by `modus-themes-faces'.")
-(defface modus-theme-lang-error nil
+(defface modus-themes-lang-error nil
"Generic face for linter or spell checker errors.
The exact attributes and color combinations are controlled by
`modus-themes-lang-checkers'.
The actual styling of the face is done by `modus-themes-faces'.")
+(defface modus-themes-reset-soft nil
+ "Generic face to set most face properties to nil.
+
+This is intended to be inherited by faces that should not retain
+properties from their context (e.g. an overlay over an underlined
+text should not be underlined as well) yet still blend in. Also
+see `modus-themes-reset-hard'.
+
+The actual styling of the face is done by `modus-themes-faces'.")
+
+(defface modus-themes-reset-hard nil
+ "Generic face to set all face properties to nil.
+
+This is intended to be inherited by faces that should not retain
+properties from their context (e.g. an overlay over an underlined
+text should not be underlined as well) and not blend in. Also
+see `modus-themes-reset-soft'.
+
+The actual styling of the face is done by `modus-themes-faces'.")
+
+(defface modus-themes-key-binding nil
+ "Generic face for key bindings.
+The actual styling of the face is done by `modus-themes-faces'.")
+
\f
;;; Customization options
:type 'boolean
:link '(info-link "(modus-themes) No mixed fonts"))
-(defcustom modus-themes-headings
- '((t . nil))
+(defconst modus-themes--headings-choice
+ '(choice
+ (const :format "[%v] %t\n" :tag "Fairly desaturated foreground with bold weight (default)" nil)
+ (const :format "[%v] %t\n" :tag "Same as the default (backward-compatible)" t)
+ (const :format "[%v] %t\n" :tag "Like the default without bold weight" no-bold)
+ (const :format "[%v] %t\n" :tag "Like the default plus overline" line)
+ (const :format "[%v] %t\n" :tag "Like `line' without bold weight" line-no-bold)
+ (const :format "[%v] %t\n" :tag "Like the default but with more colorful foreground" rainbow)
+ (const :format "[%v] %t\n" :tag "Like `rainbow' plus overline" rainbow-line)
+ (const :format "[%v] %t\n" :tag "Like `rainbow' without bold weight" rainbow-no-bold)
+ (const :format "[%v] %t\n" :tag "Like `rainbow-line' without bold weight" rainbow-line-no-bold)
+ (const :format "[%v] %t\n" :tag "Like the default plus subtle background" highlight)
+ (const :format "[%v] %t\n" :tag "Like `highlight' without bold weight" highlight-no-bold)
+ (const :format "[%v] %t\n" :tag "Like `highlight' with more colorful foreground" rainbow-highlight)
+ (const :format "[%v] %t\n" :tag "Like `rainbow-highlight' without bold weight" rainbow-highlight-no-bold)
+ (const :format "[%v] %t\n" :tag "Like `highlight' plus overline" section)
+ (const :format "[%v] %t\n" :tag "Like `section' without bold weight" section-no-bold)
+ (const :format "[%v] %t\n" :tag "Like `section' with more colorful foreground" rainbow-section)
+ (const :format "[%v] %t\n" :tag "Like `rainbow-section' without bold weight" rainbow-section-no-bold)
+ (const :format "[%v] %t\n" :tag "Do not use any distinct foreground color; just bold weight" no-color)
+ (const :format "[%v] %t\n" :tag "Like `no-bold' but without the distinct foreground color" no-color-no-bold))
+ "Refer to the doc string of `modus-themes-headings'.
+This is a helper variable intended for internal use.")
+
+(defcustom modus-themes-headings nil
"Alist of styles for headings, with optional value per level.
To control faces per level from 1-8, use something like this:
(setq modus-themes-headings
'((t . rainbow-line-no-bold)))
-The default uses a fairly desaturated foreground value in
+The default value uses a fairly desaturated foreground color in
combination with a bold typographic weight. To specify this
style for a given level N (assuming you wish to have another
-fallback option), just specify the value t like this:
+fallback option), just specify the value nil like this:
(setq modus-themes-headings
- '((1 . t)
+ '((1 . nil)
(2 . line)
+ (3) ; same as nil
(t . rainbow-line-no-bold)))
-A description of all possible values:
+A description of all other possible values:
+ `no-bold' retains the default text color while removing the
typographic weight.
+ `no-color-no-bold' is like `no-color' but without the bold
weight."
:group 'modus-themes
- :package-version '(modus-themes . "1.2.0")
+ :package-version '(modus-themes . "1.3.0")
:version "28.1"
- :type
- '(alist
- :key-type symbol
- :value-type
- (choice (const :tag "Fairly desaturated foreground with bold weight (default)" t)
- (const :tag "Like the default without bold weight" no-bold)
- (const :tag "Like the default plus overline" line)
- (const :tag "Like `line' without bold weight" line-no-bold)
- (const :tag "Like the default but with more colorful foreground" rainbow)
- (const :tag "Like `rainbow' plus overline" rainbow-line)
- (const :tag "Like `rainbow' without bold weight" rainbow-no-bold)
- (const :tag "Like `rainbow-line' without bold weight" rainbow-line-no-bold)
- (const :tag "Like the default plus subtle background" highlight)
- (const :tag "Like `highlight' without bold weight" highlight-no-bold)
- (const :tag "Like `highlight' with more colorful foreground" rainbow-highlight)
- (const :tag "Like `rainbow-highlight' without bold weight" rainbow-highlight-no-bold)
- (const :tag "Like `highlight' plus overline" section)
- (const :tag "Like `section' without bold weight" section-no-bold)
- (const :tag "Like `section' with more colorful foreground" rainbow-section)
- (const :tag "Like `rainbow-section' without bold weight" rainbow-section-no-bold)
- (const :tag "Do not use any distinct foreground color; just bold weight" no-color)
- (const :tag "Like `no-bold' but without the distinct foreground color" no-color-no-bold)))
+ :type `(alist
+ :options ,(mapcar (lambda (el)
+ (list el modus-themes--headings-choice))
+ '(1 2 3 4 5 6 7 8 t))
+ :key-type symbol
+ :value-type ,modus-themes--headings-choice)
:link '(info-link "(modus-themes) Heading styles"))
(defcustom modus-themes-scale-headings nil
"Define the visibility of fringes.
Nil means the fringes have no background color. Option `subtle'
-will apply a greyscale value that is visible yet close to the
+will apply a grayscale value that is visible yet close to the
main buffer background color. Option `intense' will use a more
-pronounced greyscale value."
+pronounced grayscale value."
:group 'modus-themes
:package-version '(modus-themes . "1.0.0")
:version "28.1"
:type '(choice
- (const :tag "No visible fringes (default)" nil)
- (const :tag "Subtle greyscale background" subtle)
- (const :tag "Intense greyscale background" intense))
+ (const :format "[%v] %t\n" :tag "No visible fringes (default)" nil)
+ (const :format "[%v] %t\n" :tag "Subtle grayscale background" subtle)
+ (const :format "[%v] %t\n" :tag "Intense grayscale background" intense))
:link '(info-link "(modus-themes) Fringes"))
(defcustom modus-themes-lang-checkers nil
:package-version '(modus-themes . "1.1.0")
:version "28.1"
:type '(choice
- (const :tag "Only color-coded wavy underline (default)" nil)
- (const :tag "Like the default, but with a straight underline" straight-underline)
- (const :tag "Color-coded wavy underline; subtle foreground" subtle-foreground)
- (const :tag "Combines `straight-underline' and `subtle-foreground'" subtle-foreground-straight-underline)
- (const :tag "Color-coded wavy underline; intense foreground" intense-foreground)
- (const :tag "Combines `straight-underline' and `intense-foreground'" intense-foreground-straight-underline)
- (const :tag "Color-coded background, foreground, straight underline" colored-background))
+ (const :format "[%v] %t\n" :tag "Only color-coded wavy underline (default)" nil)
+ (const :format "[%v] %t\n" :tag "Like the default, but with a straight underline" straight-underline)
+ (const :format "[%v] %t\n" :tag "Color-coded wavy underline; subtle foreground" subtle-foreground)
+ (const :format "[%v] %t\n" :tag "Combines `straight-underline' and `subtle-foreground'" subtle-foreground-straight-underline)
+ (const :format "[%v] %t\n" :tag "Color-coded wavy underline; intense foreground" intense-foreground)
+ (const :format "[%v] %t\n" :tag "Combines `straight-underline' and `intense-foreground'" intense-foreground-straight-underline)
+ (const :format "[%v] %t\n" :tag "Color-coded background, foreground, straight underline" colored-background))
:link '(info-link "(modus-themes) Language checkers"))
(defcustom modus-themes-org-blocks nil
:package-version '(modus-themes . "1.0.0")
:version "28.1"
:type '(choice
- (const :tag "No Org block background (default)" nil)
- (const :tag "Subtle gray block background" grayscale)
- (const :tag "Subtle gray block background (alt spelling)" greyscale)
- (const :tag "Color-coded background per programming language" rainbow))
+ (const :format "[%v] %t\n" :tag "No Org block background (default)" nil)
+ (const :format "[%v] %t\n" :tag "Subtle gray block background" grayscale)
+ (const :format "[%v] %t\n" :tag "Subtle gray block background (alt spelling)" greyscale)
+ (const :format "[%v] %t\n" :tag "Color-coded background per programming language" rainbow))
:link '(info-link "(modus-themes) Org mode blocks"))
(defcustom modus-themes-org-habit nil
:package-version '(modus-themes . "1.1.0")
:version "28.1"
:type '(choice
- (const :tag "Respect the original design of org-habit (default)" nil)
- (const :tag "Like the default, but do not distinguish between present and future variants" simplified)
- (const :tag "Like `simplified', but only use red, yellow, green" traffic-light))
+ (const :format "[%v] %t\n" :tag "Respect the original design of org-habit (default)" nil)
+ (const :format "[%v] %t\n" :tag "Like the default, but do not distinguish between present and future variants" simplified)
+ (const :format "[%v] %t\n" :tag "Like `simplified', but only use red, yellow, green" traffic-light))
:link '(info-link "(modus-themes) Org agenda habits"))
(defcustom modus-themes-mode-line nil
"Adjust the overall style of the mode line.
-Nil is a two-dimensional rectangle with a border around it. The
-active and the inactive modelines use different shades of
-greyscale values for the background and foreground.
+The default (nil) is a two-dimensional rectangle with a border
+around it. The active and the inactive modelines use different
+shades of grayscale values for the background and foreground.
A `3d' value will apply a three-dimensional effect to the active
modeline. The inactive modelines remain two-dimensional and are
However, to ensure that the inactive modelines remain visible,
they apply a slightly more prominent background to them than what
their counterparts do (same inactive background as with the
-default)."
+default).
+
+Similarly, `accented', `accented-3d', and `accented-moody'
+correspond to the default (nil), `3d', and `moody' styles
+respectively, except that the active mode line uses a colored
+background instead of the standard shade of gray."
:group 'modus-themes
- :package-version '(modus-themes . "1.0.0")
+ :package-version '(modus-themes . "1.3.0")
:version "28.1"
:type '(choice
- (const :tag "Two-dimensional box (default)" nil)
- (const :tag "Three-dimensional style for the active mode line" 3d)
- (const :tag "No box effects, which are optimal for use with the `moody' library" moody)
- (const :tag "Like the default, but without border effects" borderless)
- (const :tag "Like `3d', but without noticeable border" borderless-3d)
- (const :tag "Like `moody', but without noticeable border" borderless-moody))
+ (const :format "[%v] %t\n" :tag "Two-dimensional box (default)" nil)
+ (const :format "[%v] %t\n" :tag "Three-dimensional style for the active mode line" 3d)
+ (const :format "[%v] %t\n" :tag "No box effects, which are optimal for use with the `moody' library" moody)
+ (const :format "[%v] %t\n" :tag "Like the default, but without border effects" borderless)
+ (const :format "[%v] %t\n" :tag "Like `3d', but without noticeable border" borderless-3d)
+ (const :format "[%v] %t\n" :tag "Like `moody', but without noticeable border" borderless-moody)
+ (const :format "[%v] %t\n" :tag "Two-dimensional box with a colored background" accented)
+ (const :format "[%v] %t\n" :tag "Like `3d', but with a colored background" accented-3d)
+ (const :format "[%v] %t\n" :tag "Like `moody', but with a colored background" accented-moody))
:link '(info-link "(modus-themes) Mode line"))
(defcustom modus-themes-diffs nil
from word-wise changes. It instead uses color-coded foreground
values to differentiate between added/removed/changed lines. If
a background is necessary, such as with `ediff', then a subtle
-greyscale value is used.
+grayscale value is used.
Option `bg-only' applies a background but does not override the
text's foreground. This makes it suitable for a non-nil value
:package-version '(modus-themes . "1.2.0")
:version "28.1"
:type '(choice
- (const :tag "Intensely colored backgrounds (default)" nil)
- (const :tag "Slightly accented backgrounds with tinted text" desaturated)
- (const :tag "No backgrounds, except for refined diffs" fg-only)
- (const :tag "Apply color-coded backgrounds; keep syntax colors in tact" bg-only)
- (const :tag "Optimized for red-green color defficiency" deuteranopia))
+ (const :format "[%v] %t\n" :tag "Intensely colored backgrounds (default)" nil)
+ (const :format "[%v] %t\n" :tag "Slightly accented backgrounds with tinted text" desaturated)
+ (const :format "[%v] %t\n" :tag "No backgrounds, except for refined diffs" fg-only)
+ (const :format "[%v] %t\n" :tag "Apply color-coded backgrounds; keep syntax colors in tact" bg-only)
+ (const :format "[%v] %t\n" :tag "Optimized for red-green color defficiency" deuteranopia))
:link '(info-link "(modus-themes) Diffs"))
(defcustom modus-themes-completions nil
:package-version '(modus-themes . "1.0.0")
:version "28.1"
:type '(choice
- (const :tag "Respect the framework's established aesthetic (default)" nil)
- (const :tag "Subtle backgrounds for various elements" moderate)
- (const :tag "Radical alternative to the framework's looks" opinionated))
+ (const :format "[%v] %t\n" :tag "Respect the framework's established aesthetic (default)" nil)
+ (const :format "[%v] %t\n" :tag "Subtle backgrounds for various elements" moderate)
+ (const :format "[%v] %t\n" :tag "Radical alternative to the framework's looks" opinionated))
:link '(info-link "(modus-themes) Completion UIs"))
(defcustom modus-themes-prompts nil
`subtle-accented' and `intense-accented' counterparts, except
they use grayscale values instead of accented ones."
:group 'modus-themes
- :package-version '(modus-themes . "1.0.0")
+ :package-version '(modus-themes . "1.1.0")
:version "28.1"
:type '(choice
;; `subtle' is the same as `subtle-accented', while `intense' is
;; equal to `intense-accented' for backward compatibility
- (const :tag "No prompt background (default)" nil)
- (const :tag "Subtle accented background for the prompt" subtle-accented)
- (const :tag "Same as `subtle-accented' for compatibility with older versions" subtle)
- (const :tag "Intense accented background and foreground for the prompt" intense-accented)
- (const :tag "Same as `intense-accented' for compatibility with older versions" intense)
- (const :tag "Like `subtle-accented' but grayscale" subtle-gray)
- (const :tag "Like `intense-accented' but grayscale" intense-gray))
+ (const :format "[%v] %t\n" :tag "No prompt background (default)" nil)
+ (const :format "[%v] %t\n" :tag "Subtle accented background for the prompt" subtle-accented)
+ (const :format "[%v] %t\n" :tag "Same as `subtle-accented' for compatibility with older versions" subtle)
+ (const :format "[%v] %t\n" :tag "Intense accented background and foreground for the prompt" intense-accented)
+ (const :format "[%v] %t\n" :tag "Same as `intense-accented' for compatibility with older versions" intense)
+ (const :format "[%v] %t\n" :tag "Like `subtle-accented' but grayscale" subtle-gray)
+ (const :format "[%v] %t\n" :tag "Like `intense-accented' but grayscale" intense-gray))
:link '(info-link "(modus-themes) Command prompts"))
(defcustom modus-themes-intense-hl-line nil
:type 'boolean
:link '(info-link "(modus-themes) Line highlighting"))
+(make-obsolete 'modus-themes-intense-hl-line 'modus-themes-hl-line "1.3.0")
+
+(defcustom modus-themes-hl-line nil
+ "Control the current line highlight of HL-line mode.
+
+The default (nil) is to apply a subtle neutral background to the
+current line.
+
+Option `intense-background' uses a prominent neutral background.
+
+Option `accented-background' uses a subtle colored background.
+
+Option `underline-neutral' combines a subtle neutral background
+with a gray underline.
+
+Option `underline-accented' draws an underline while applying a
+subtle colored background.
+
+Option `underline-only-neutral' uses just a neutral underline,
+without any added change to the background.
+
+Option `underline-only-accented' uses just a colored underline,
+without any added change to the background.
+
+Set `x-underline-at-descent-line' to a non-nil value for better
+results with underlines."
+ :group 'modus-themes
+ :package-version '(modus-themes . "1.3.0")
+ :version "28.1"
+ :type '(choice
+ (const :format "[%v] %t\n" :tag "Subtle neutral background (default)" nil)
+ (const :format "[%v] %t\n" :tag "Prominent neutral background" intense-background)
+ (const :format "[%v] %t\n" :tag "Subtle colored background" accented-background)
+ (const :format "[%v] %t\n" :tag "Underline with a subtle neutral background" underline-neutral)
+ (const :format "[%v] %t\n" :tag "Underline with a subtle colored background" underline-accented)
+ (const :format "[%v] %t\n" :tag "Just a neutral underline, without a background" underline-only-neutral)
+ (const :format "[%v] %t\n" :tag "Just an accented underline, without a background" underline-only-accented))
+ :link '(info-link "(modus-themes) Line highlighting"))
+
(defcustom modus-themes-subtle-line-numbers nil
"Use more subtle style for command `display-line-numbers-mode'."
:group 'modus-themes
:package-version '(modus-themes . "1.0.0")
:version "28.1"
:type '(choice
- (const :tag "Sublte tinted background (default)" nil)
- (const :tag "Like the default, but also use bold typographic weight" subtle-bold)
- (const :tag "Intense saturated background" intense)
- (const :tag "Like `intense' but with bold weight" intense-bold))
+ (const :format "[%v] %t\n" :tag "Sublte tinted background (default)" nil)
+ (const :format "[%v] %t\n" :tag "Like the default, but also use bold typographic weight" subtle-bold)
+ (const :format "[%v] %t\n" :tag "Intense saturated background" intense)
+ (const :format "[%v] %t\n" :tag "Like `intense' but with bold weight" intense-bold))
:link '(info-link "(modus-themes) Matching parentheses"))
(defcustom modus-themes-syntax nil
:package-version '(modus-themes . "1.2.0")
:version "28.1"
:type '(choice
- (const :tag "Balanced use of blue, cyan, magenta, purple variants (default)" nil)
- (const :tag "Like the default, but with desaturated color values" faint)
- (const :tag "Apply yellow tint to comments, keep the default style for the rest" yellow-comments)
- (const :tag "Use green for strings, keep the default style for the rest" green-strings)
- (const :tag "Use green for strings, yellow for comments, keep the default style for the rest" yellow-comments-green-strings)
- (const :tag "Refashion syntax highlighting with more colors, gray comments" alt-syntax)
- (const :tag "Like `alt-syntax' but with yellow comments" alt-syntax-yellow-comments)
- (const :tag "Like `faint' but with yellow comments" faint-yellow-comments))
+ (const :format "[%v] %t\n" :tag "Balanced use of blue, cyan, magenta, purple variants (default)" nil)
+ (const :format "[%v] %t\n" :tag "Like the default, but with desaturated color values" faint)
+ (const :format "[%v] %t\n" :tag "Apply yellow tint to comments, keep the default style for the rest" yellow-comments)
+ (const :format "[%v] %t\n" :tag "Use green for strings, keep the default style for the rest" green-strings)
+ (const :format "[%v] %t\n" :tag "Use green for strings, yellow for comments, keep the default style for the rest" yellow-comments-green-strings)
+ (const :format "[%v] %t\n" :tag "Refashion syntax highlighting with more colors, gray comments" alt-syntax)
+ (const :format "[%v] %t\n" :tag "Like `alt-syntax' but with yellow comments" alt-syntax-yellow-comments)
+ (const :format "[%v] %t\n" :tag "Like `faint' but with yellow comments" faint-yellow-comments))
:link '(info-link "(modus-themes) Syntax styles"))
(defcustom modus-themes-links nil
Option `faint' applies desaturated colors to the link's text and
underline.
-Option `neutral-underline' applies a subtle grey underline, while
+Option `neutral-underline' applies a subtle gray underline, while
retaining the link's foreground.
Option `faint-neutral-underline' combines a desaturated text
-color with a subtle grey underline.
+color with a subtle gray underline.
Option `no-underline' removes link underlines altogether, while
retaining their original fairly vivid color.
:package-version '(modus-themes . "1.2.0")
:version "28.1"
:type '(choice
- (const :tag "Undeline link using the same color as the text (default)" nil)
- (const :tag "Like the default, but apply less intense colors to links" faint)
- (const :tag "Change the color of link underlines to a neutral grey" neutral-underline)
- (const :tag "Desaturated foreground with neutral grey underline" faint-neutral-underline)
- (const :tag "Remove underline property from links, keeping their foreground as-is" no-underline)
- (const :tag "Apply underline only; use default foreground" underline-only)
- (const :tag "Like `underline-only' but with a subtle underline" neutral-underline-only))
+ (const :format "[%v] %t\n" :tag "Undeline link using the same color as the text (default)" nil)
+ (const :format "[%v] %t\n" :tag "Like the default, but apply less intense colors to links" faint)
+ (const :format "[%v] %t\n" :tag "Change the color of link underlines to a neutral gray" neutral-underline)
+ (const :format "[%v] %t\n" :tag "Desaturated foreground with neutral gray underline" faint-neutral-underline)
+ (const :format "[%v] %t\n" :tag "Remove underline property from links, keeping their foreground as-is" no-underline)
+ (const :format "[%v] %t\n" :tag "Apply underline only; use default foreground" underline-only)
+ (const :format "[%v] %t\n" :tag "Like `underline-only' but with a subtle underline" neutral-underline-only))
:link '(info-link "(modus-themes) Link styles"))
(defcustom modus-themes-region nil
window.
Option `bg-only-no-extend' is a combination of the `bg-only' and
-`no-extend' options."
+`no-extend' options.
+
+Option `accent' uses a more colorful background with a neutral
+foreground. It overrides all syntax highlighting and extends to
+the edge of the window.
+
+Option `accent-no-extend' is like the above, but stretches only
+to the end of each line within the region."
:group 'modus-themes
- :package-version '(modus-themes . "1.0.0")
+ :package-version '(modus-themes . "1.3.0")
:version "28.1"
:type '(choice
- (const :tag "Intense background; overrides colors; extends to edge of window (default)" nil)
- (const :tag "As with the default, but does not extend" no-extend)
- (const :tag "Subtle background; preserves colors; extends to edge of window" bg-only)
- (const :tag "As with the `subtle' option, but does not extend" bg-only-no-extend))
+ (const :format "[%v] %t\n" :tag "Intense background; overrides colors; extends to edge of window (default)" nil)
+ (const :format "[%v] %t\n" :tag "As with the default, but does not extend" no-extend)
+ (const :format "[%v] %t\n" :tag "Subtle background; preserves colors; extends to edge of window" bg-only)
+ (const :format "[%v] %t\n" :tag "As with the `subtle' option, but does not extend" bg-only-no-extend)
+ (const :format "[%v] %t\n" :tag "Like the default, but with an accented background" accent)
+ (const :format "[%v] %t\n" :tag "As with the `accent' option, but does not extend" accent-no-extend))
:link '(info-link "(modus-themes) Active region"))
\f
(defun modus-themes--fringe (mainbg subtlebg intensebg)
"Conditional use of background colors for fringes.
-MAINBG is the default. SUBTLEBG should be a subtle greyscale
-value. INTENSEBG must be a more pronounced greyscale color."
+MAINBG is the default. SUBTLEBG should be a subtle grayscale
+value. INTENSEBG must be a more pronounced grayscale color."
(pcase modus-themes-fringes
('intense (list :background intensebg))
('subtle (list :background subtlebg))
('intense (list :background intensebg :foreground intensefg))
('subtle-accented (list :background subtlebg :foreground subtlefg))
('subtle (list :background subtlebg :foreground subtlefg))
- ('subtle-gray (list :inherit 'modus-theme-subtle-neutral))
- ('intense-gray (list :inherit 'modus-theme-intense-neutral))
- (_ (list :background nil :foreground mainfg))))
+ ('subtle-gray (list :inherit 'modus-themes-subtle-neutral))
+ ('intense-gray (list :inherit 'modus-themes-intense-neutral))
+ (_ (list :background 'unspecified :foreground mainfg))))
(defun modus-themes--paren (normalbg intensebg)
"Conditional use of intense colors for matching parentheses.
BG, FG, BGACCENT, FGACCENT apply a background and foreground
color respectively.
-The former pair is a greyscale combination that should be more
+The former pair is a grayscale combination that should be more
distinct than the background of the block. It is applied to the
default styles or when `modus-themes-org-blocks' is set
-to `greyscale'.
+to `grayscale' (or `greyscale').
The latter pair should be more subtle than the background of the
block, as it is used when `modus-themes-org-blocks' is
(_ (list :background default))))
(defun modus-themes--mode-line-attrs
- (fg bg fg-alt bg-alt border border-3d &optional alt-style border-width fg-distant)
+ (fg bg fg-alt bg-alt fg-accent bg-accent border border-3d &optional alt-style border-width fg-distant)
"Color combinations for `modus-themes-mode-line'.
FG and BG are the default colors. FG-ALT and BG-ALT are meant to
accommodate the options for a 3D modeline or a `moody' compliant
-one. BORDER applies to all permutations of the modeline, except
-the three-dimensional effect, where BORDER-3D is used instead.
+one. FG-ACCENT and BG-ACCENT are used for all variants. BORDER
+applies to all permutations of the modeline, except the
+three-dimensional effect, where BORDER-3D is used instead.
Optional ALT-STYLE applies an appropriate style to the mode
line's box property.
`(:background ,bg :foreground ,fg
:underline ,bg :overline ,bg
:distant-foreground ,fg-distant))
+ ('accented
+ `(:foreground ,fg-accent :background ,bg-accent :box ,border))
+ ('accented-3d
+ `(:background ,bg-accent :foreground ,fg-accent
+ :box (:line-width ,(or border-width 1)
+ :color ,border-3d
+ :style ,(and alt-style 'released-button))))
+ ('accented-moody
+ `(:background ,bg-accent :foreground ,fg-accent
+ :underline ,border :overline ,border
+ :distant-foreground ,fg-distant))
(_
`(:foreground ,fg :background ,bg :box ,border))))
"Conditional application of link styles.
FG is the link's default color for its text and underline
property. FGFAINT is a desaturated color for the text and
-underline. UNDERLINE is a grey color only for the undeline."
+underline. UNDERLINE is a gray color only for the undeline."
(pcase modus-themes-links
('faint (list :foreground fgfaint :underline t))
('neutral-underline (list :foreground fg :underline underline))
(when modus-themes-scale-headings
(list :height amount)))
-(defun modus-themes--region (bg fg bgsubtle)
+(defun modus-themes--region (bg fg bgsubtle bgaccent)
"Apply `modus-themes-region' styles.
BG and FG are the main values that are used by default. BGSUBTLE
is a subtle background value that can be combined with all colors
-used to fontify text and code syntax."
+used to fontify text and code syntax. BGACCENT is a colored
+background that combines well with FG."
(pcase modus-themes-region
('bg-only (list :background bgsubtle))
('bg-only-no-extend (list :background bgsubtle :extend nil))
('no-extend (list :background bg :foreground fg :extend nil))
+ ('accent (list :background bgaccent :foreground fg))
+ ('accent-no-extend (list :background bgaccent :foreground fg :extend nil))
(_ (list :background bg :foreground fg))))
+(defun modus-themes--hl-line (bgdefault bgintense bgaccent lineneutral lineaccent)
+ "Apply `modus-themes-hl-line' styles.
+
+BGDEFAULT is a subtle neutral background. BGINTENSE is like the
+default, but more prominent. BGACCENT is a subtle accented
+background. LINENEUTRAL and LINEACCENT are a color values that
+can remain distinct against the buffer's possible backgrounds:
+the former is neutral, the latter is accented. LINEONLY must be
+a prominent neutral color."
+ (pcase modus-themes-hl-line
+ ('intense-background (list :background bgintense))
+ ('accented-background (list :background bgaccent))
+ ('underline-neutral (list :background bgdefault :underline lineneutral))
+ ('underline-accented (list :background bgaccent :underline lineaccent))
+ ('underline-only-neutral (list :background 'unspecified :underline lineneutral))
+ ('underline-only-accented (list :background 'unspecified :underline lineaccent))
+ (_ (list :background bgdefault))))
+
\f
;;;; Utilities for DIY users
;;;; custom faces
;; these bespoke faces are inherited by other constructs below
;;;;; subtle colored backgrounds
- `(modus-theme-subtle-red ((,class :background ,red-subtle-bg :foreground ,fg-dim)))
- `(modus-theme-subtle-green ((,class :background ,green-subtle-bg :foreground ,fg-dim)))
- `(modus-theme-subtle-yellow ((,class :background ,yellow-subtle-bg :foreground ,fg-dim)))
- `(modus-theme-subtle-blue ((,class :background ,blue-subtle-bg :foreground ,fg-dim)))
- `(modus-theme-subtle-magenta ((,class :background ,magenta-subtle-bg :foreground ,fg-dim)))
- `(modus-theme-subtle-cyan ((,class :background ,cyan-subtle-bg :foreground ,fg-dim)))
- `(modus-theme-subtle-neutral ((,class :background ,bg-inactive :foreground ,fg-inactive)))
+ `(modus-themes-subtle-red ((,class :background ,red-subtle-bg :foreground ,fg-dim)))
+ `(modus-themes-subtle-green ((,class :background ,green-subtle-bg :foreground ,fg-dim)))
+ `(modus-themes-subtle-yellow ((,class :background ,yellow-subtle-bg :foreground ,fg-dim)))
+ `(modus-themes-subtle-blue ((,class :background ,blue-subtle-bg :foreground ,fg-dim)))
+ `(modus-themes-subtle-magenta ((,class :background ,magenta-subtle-bg :foreground ,fg-dim)))
+ `(modus-themes-subtle-cyan ((,class :background ,cyan-subtle-bg :foreground ,fg-dim)))
+ `(modus-themes-subtle-neutral ((,class :background ,bg-inactive :foreground ,fg-inactive)))
;;;;; intense colored backgrounds
- `(modus-theme-intense-red ((,class :background ,red-intense-bg :foreground ,fg-main)))
- `(modus-theme-intense-green ((,class :background ,green-intense-bg :foreground ,fg-main)))
- `(modus-theme-intense-yellow ((,class :background ,yellow-intense-bg :foreground ,fg-main)))
- `(modus-theme-intense-blue ((,class :background ,blue-intense-bg :foreground ,fg-main)))
- `(modus-theme-intense-magenta ((,class :background ,magenta-intense-bg :foreground ,fg-main)))
- `(modus-theme-intense-cyan ((,class :background ,cyan-intense-bg :foreground ,fg-main)))
- `(modus-theme-intense-neutral ((,class :background ,bg-active :foreground ,fg-main)))
+ `(modus-themes-intense-red ((,class :background ,red-intense-bg :foreground ,fg-main)))
+ `(modus-themes-intense-green ((,class :background ,green-intense-bg :foreground ,fg-main)))
+ `(modus-themes-intense-yellow ((,class :background ,yellow-intense-bg :foreground ,fg-main)))
+ `(modus-themes-intense-blue ((,class :background ,blue-intense-bg :foreground ,fg-main)))
+ `(modus-themes-intense-magenta ((,class :background ,magenta-intense-bg :foreground ,fg-main)))
+ `(modus-themes-intense-cyan ((,class :background ,cyan-intense-bg :foreground ,fg-main)))
+ `(modus-themes-intense-neutral ((,class :background ,bg-active :foreground ,fg-main)))
;;;;; refined background and foreground combinations
;; general purpose styles that use an accented foreground against an
;; accented background
- `(modus-theme-refine-red ((,class :background ,red-refine-bg :foreground ,red-refine-fg)))
- `(modus-theme-refine-green ((,class :background ,green-refine-bg :foreground ,green-refine-fg)))
- `(modus-theme-refine-yellow ((,class :background ,yellow-refine-bg :foreground ,yellow-refine-fg)))
- `(modus-theme-refine-blue ((,class :background ,blue-refine-bg :foreground ,blue-refine-fg)))
- `(modus-theme-refine-magenta ((,class :background ,magenta-refine-bg :foreground ,magenta-refine-fg)))
- `(modus-theme-refine-cyan ((,class :background ,cyan-refine-bg :foreground ,cyan-refine-fg)))
+ `(modus-themes-refine-red ((,class :background ,red-refine-bg :foreground ,red-refine-fg)))
+ `(modus-themes-refine-green ((,class :background ,green-refine-bg :foreground ,green-refine-fg)))
+ `(modus-themes-refine-yellow ((,class :background ,yellow-refine-bg :foreground ,yellow-refine-fg)))
+ `(modus-themes-refine-blue ((,class :background ,blue-refine-bg :foreground ,blue-refine-fg)))
+ `(modus-themes-refine-magenta ((,class :background ,magenta-refine-bg :foreground ,magenta-refine-fg)))
+ `(modus-themes-refine-cyan ((,class :background ,cyan-refine-bg :foreground ,cyan-refine-fg)))
;;;;; "active" combinations, mostly for use on the mode line
- `(modus-theme-active-red ((,class :background ,red-active :foreground ,bg-active)))
- `(modus-theme-active-green ((,class :background ,green-active :foreground ,bg-active)))
- `(modus-theme-active-yellow ((,class :background ,yellow-active :foreground ,bg-active)))
- `(modus-theme-active-blue ((,class :background ,blue-active :foreground ,bg-active)))
- `(modus-theme-active-magenta ((,class :background ,magenta-active :foreground ,bg-active)))
- `(modus-theme-active-cyan ((,class :background ,cyan-active :foreground ,bg-active)))
+ `(modus-themes-active-red ((,class :background ,red-active :foreground ,bg-active)))
+ `(modus-themes-active-green ((,class :background ,green-active :foreground ,bg-active)))
+ `(modus-themes-active-yellow ((,class :background ,yellow-active :foreground ,bg-active)))
+ `(modus-themes-active-blue ((,class :background ,blue-active :foreground ,bg-active)))
+ `(modus-themes-active-magenta ((,class :background ,magenta-active :foreground ,bg-active)))
+ `(modus-themes-active-cyan ((,class :background ,cyan-active :foreground ,bg-active)))
;;;;; nuanced backgrounds
;; useful for adding an accented background that is suitable for all
;; main foreground colors (intended for use in Org source blocks)
- `(modus-theme-nuanced-red ((,class :background ,red-nuanced-bg :extend t)))
- `(modus-theme-nuanced-green ((,class :background ,green-nuanced-bg :extend t)))
- `(modus-theme-nuanced-yellow ((,class :background ,yellow-nuanced-bg :extend t)))
- `(modus-theme-nuanced-blue ((,class :background ,blue-nuanced-bg :extend t)))
- `(modus-theme-nuanced-magenta ((,class :background ,magenta-nuanced-bg :extend t)))
- `(modus-theme-nuanced-cyan ((,class :background ,cyan-nuanced-bg :extend t)))
+ `(modus-themes-nuanced-red ((,class :background ,red-nuanced-bg :extend t)))
+ `(modus-themes-nuanced-green ((,class :background ,green-nuanced-bg :extend t)))
+ `(modus-themes-nuanced-yellow ((,class :background ,yellow-nuanced-bg :extend t)))
+ `(modus-themes-nuanced-blue ((,class :background ,blue-nuanced-bg :extend t)))
+ `(modus-themes-nuanced-magenta ((,class :background ,magenta-nuanced-bg :extend t)))
+ `(modus-themes-nuanced-cyan ((,class :background ,cyan-nuanced-bg :extend t)))
;;;;; fringe-specific combinations
- `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground ,fg-main)))
- `(modus-theme-fringe-green ((,class :background ,green-fringe-bg :foreground ,fg-main)))
- `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg :foreground ,fg-main)))
- `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground ,fg-main)))
- `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg :foreground ,fg-main)))
- `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground ,fg-main)))
+ `(modus-themes-fringe-red ((,class :background ,red-fringe-bg :foreground ,fg-main)))
+ `(modus-themes-fringe-green ((,class :background ,green-fringe-bg :foreground ,fg-main)))
+ `(modus-themes-fringe-yellow ((,class :background ,yellow-fringe-bg :foreground ,fg-main)))
+ `(modus-themes-fringe-blue ((,class :background ,blue-fringe-bg :foreground ,fg-main)))
+ `(modus-themes-fringe-magenta ((,class :background ,magenta-fringe-bg :foreground ,fg-main)))
+ `(modus-themes-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground ,fg-main)))
;;;;; special base values
;; these are closer to the grayscale than the accents defined above
;; and should only be used when the next closest alternative would be
- ;; a greyscale value than an accented one
- `(modus-theme-special-cold ((,class :background ,bg-special-cold :foreground ,fg-special-cold)))
- `(modus-theme-special-mild ((,class :background ,bg-special-mild :foreground ,fg-special-mild)))
- `(modus-theme-special-warm ((,class :background ,bg-special-warm :foreground ,fg-special-warm)))
- `(modus-theme-special-calm ((,class :background ,bg-special-calm :foreground ,fg-special-calm)))
+ ;; a grayscale value than an accented one
+ `(modus-themes-special-cold ((,class :background ,bg-special-cold :foreground ,fg-special-cold)))
+ `(modus-themes-special-mild ((,class :background ,bg-special-mild :foreground ,fg-special-mild)))
+ `(modus-themes-special-warm ((,class :background ,bg-special-warm :foreground ,fg-special-warm)))
+ `(modus-themes-special-calm ((,class :background ,bg-special-calm :foreground ,fg-special-calm)))
;;;;; diff-specific combinations
;; intended for `diff-mode' or equivalent
- `(modus-theme-diff-added
+ `(modus-themes-diff-added
((,class ,@(modus-themes--diff
bg-main green
bg-diff-focus-added fg-diff-focus-added
green-nuanced-bg fg-diff-added
bg-diff-focus-added-deuteran fg-diff-focus-added-deuteran))))
- `(modus-theme-diff-changed
+ `(modus-themes-diff-changed
((,class ,@(modus-themes--diff
bg-main yellow
bg-diff-focus-changed fg-diff-focus-changed
yellow-nuanced-bg fg-diff-changed))))
- `(modus-theme-diff-removed
+ `(modus-themes-diff-removed
((,class ,@(modus-themes--diff
bg-main red
bg-diff-focus-removed fg-diff-focus-removed
red-nuanced-bg fg-diff-removed))))
- `(modus-theme-diff-refine-added
+ `(modus-themes-diff-refine-added
((,class ,@(modus-themes--diff
bg-diff-added fg-diff-added
bg-diff-refine-added fg-diff-refine-added
bg-diff-focus-added fg-diff-focus-added
bg-diff-refine-added-deuteran fg-diff-refine-added-deuteran))))
- `(modus-theme-diff-refine-changed
+ `(modus-themes-diff-refine-changed
((,class ,@(modus-themes--diff
bg-diff-changed fg-diff-changed
bg-diff-refine-changed fg-diff-refine-changed
bg-diff-focus-changed fg-diff-focus-changed))))
- `(modus-theme-diff-refine-removed
+ `(modus-themes-diff-refine-removed
((,class ,@(modus-themes--diff
bg-diff-removed fg-diff-removed
bg-diff-refine-removed fg-diff-refine-removed
bg-diff-focus-removed fg-diff-focus-removed))))
- `(modus-theme-diff-focus-added
+ `(modus-themes-diff-focus-added
((,class ,@(modus-themes--diff
bg-dim green
bg-diff-focus-added fg-diff-focus-added
bg-diff-added fg-diff-added
bg-diff-focus-added-deuteran fg-diff-focus-added-deuteran))))
- `(modus-theme-diff-focus-changed
+ `(modus-themes-diff-focus-changed
((,class ,@(modus-themes--diff
bg-dim yellow
bg-diff-focus-changed fg-diff-focus-changed
bg-diff-changed fg-diff-changed))))
- `(modus-theme-diff-focus-removed
+ `(modus-themes-diff-focus-removed
((,class ,@(modus-themes--diff
bg-dim red
bg-diff-focus-removed fg-diff-focus-removed
bg-diff-removed fg-diff-removed))))
- `(modus-theme-diff-heading
+ `(modus-themes-diff-heading
((,class ,@(modus-themes--diff
bg-main blue
bg-diff-heading fg-diff-heading
t))))
;;;;; mark indicators
;; color combinations intended for Dired, Ibuffer, or equivalent
- `(modus-theme-pseudo-header ((,class :inherit bold :foreground ,fg-main)))
- `(modus-theme-mark-alt ((,class :inherit bold :background ,bg-mark-alt :foreground ,fg-mark-alt)))
- `(modus-theme-mark-del ((,class :inherit bold :background ,bg-mark-del :foreground ,fg-mark-del)))
- `(modus-theme-mark-sel ((,class :inherit bold :background ,bg-mark-sel :foreground ,fg-mark-sel)))
- `(modus-theme-mark-symbol ((,class :inherit bold :foreground ,blue-alt)))
+ `(modus-themes-pseudo-header ((,class :inherit bold :foreground ,fg-main)))
+ `(modus-themes-mark-alt ((,class :inherit bold :background ,bg-mark-alt :foreground ,fg-mark-alt)))
+ `(modus-themes-mark-del ((,class :inherit bold :background ,bg-mark-del :foreground ,fg-mark-del)))
+ `(modus-themes-mark-sel ((,class :inherit bold :background ,bg-mark-sel :foreground ,fg-mark-sel)))
+ `(modus-themes-mark-symbol ((,class :inherit bold :foreground ,blue-alt)))
;;;;; heading levels
;; styles for regular headings used in Org, Markdown, Info, etc.
- `(modus-theme-heading-1
+ `(modus-themes-heading-1
((,class ,@(modus-themes--heading
1 fg-main magenta-alt-other magenta-nuanced-bg bg-region)
,@(modus-themes--scale modus-themes-scale-4))))
- `(modus-theme-heading-2
+ `(modus-themes-heading-2
((,class ,@(modus-themes--heading
2 fg-special-warm magenta-alt red-nuanced-bg bg-region)
,@(modus-themes--scale modus-themes-scale-3))))
- `(modus-theme-heading-3
+ `(modus-themes-heading-3
((,class ,@(modus-themes--heading
3 fg-special-cold blue blue-nuanced-bg bg-region)
,@(modus-themes--scale modus-themes-scale-2))))
- `(modus-theme-heading-4
+ `(modus-themes-heading-4
((,class ,@(modus-themes--heading
4 fg-special-mild cyan cyan-nuanced-bg bg-region)
,@(modus-themes--scale modus-themes-scale-1))))
- `(modus-theme-heading-5
+ `(modus-themes-heading-5
((,class ,@(modus-themes--heading
5 fg-special-calm green-alt-other green-nuanced-bg bg-region))))
- `(modus-theme-heading-6
+ `(modus-themes-heading-6
((,class ,@(modus-themes--heading
6 yellow-nuanced-fg yellow-alt-other yellow-nuanced-bg bg-region))))
- `(modus-theme-heading-7
+ `(modus-themes-heading-7
((,class ,@(modus-themes--heading
7 red-nuanced-fg red-alt red-nuanced-bg bg-region))))
- `(modus-theme-heading-8
+ `(modus-themes-heading-8
((,class ,@(modus-themes--heading
8 fg-dim magenta bg-alt bg-region))))
;;;;; graph-specific faces
- `(modus-theme-graph-red-0 ((,class :background ,red-graph-0-bg)))
- `(modus-theme-graph-red-1 ((,class :background ,red-graph-1-bg)))
- `(modus-theme-graph-green-0 ((,class :background ,green-graph-0-bg)))
- `(modus-theme-graph-green-1 ((,class :background ,green-graph-1-bg)))
- `(modus-theme-graph-yellow-0 ((,class :background ,yellow-graph-0-bg)))
- `(modus-theme-graph-yellow-1 ((,class :background ,yellow-graph-1-bg)))
- `(modus-theme-graph-blue-0 ((,class :background ,blue-graph-0-bg)))
- `(modus-theme-graph-blue-1 ((,class :background ,blue-graph-1-bg)))
- `(modus-theme-graph-magenta-0 ((,class :background ,magenta-graph-0-bg)))
- `(modus-theme-graph-magenta-1 ((,class :background ,magenta-graph-1-bg)))
- `(modus-theme-graph-cyan-0 ((,class :background ,cyan-graph-0-bg)))
- `(modus-theme-graph-cyan-1 ((,class :background ,cyan-graph-1-bg)))
+ `(modus-themes-graph-red-0 ((,class :background ,red-graph-0-bg)))
+ `(modus-themes-graph-red-1 ((,class :background ,red-graph-1-bg)))
+ `(modus-themes-graph-green-0 ((,class :background ,green-graph-0-bg)))
+ `(modus-themes-graph-green-1 ((,class :background ,green-graph-1-bg)))
+ `(modus-themes-graph-yellow-0 ((,class :background ,yellow-graph-0-bg)))
+ `(modus-themes-graph-yellow-1 ((,class :background ,yellow-graph-1-bg)))
+ `(modus-themes-graph-blue-0 ((,class :background ,blue-graph-0-bg)))
+ `(modus-themes-graph-blue-1 ((,class :background ,blue-graph-1-bg)))
+ `(modus-themes-graph-magenta-0 ((,class :background ,magenta-graph-0-bg)))
+ `(modus-themes-graph-magenta-1 ((,class :background ,magenta-graph-1-bg)))
+ `(modus-themes-graph-cyan-0 ((,class :background ,cyan-graph-0-bg)))
+ `(modus-themes-graph-cyan-1 ((,class :background ,cyan-graph-1-bg)))
;;;;; language checkers
- `(modus-theme-lang-error ((,class ,@(modus-themes--lang-check fg-lang-underline-error fg-lang-error red red-nuanced-bg))))
- `(modus-theme-lang-note ((,class ,@(modus-themes--lang-check fg-lang-underline-note fg-lang-note blue-alt blue-nuanced-bg))))
- `(modus-theme-lang-warning ((,class ,@(modus-themes--lang-check fg-lang-underline-warning fg-lang-warning yellow yellow-nuanced-bg))))
+ `(modus-themes-lang-error ((,class ,@(modus-themes--lang-check fg-lang-underline-error fg-lang-error red red-nuanced-bg))))
+ `(modus-themes-lang-note ((,class ,@(modus-themes--lang-check fg-lang-underline-note fg-lang-note blue-alt blue-nuanced-bg))))
+ `(modus-themes-lang-warning ((,class ,@(modus-themes--lang-check fg-lang-underline-warning fg-lang-warning yellow yellow-nuanced-bg))))
;;;;; other custom faces
- `(modus-theme-bold ((,class ,@(modus-themes--bold-weight))))
- `(modus-theme-hl-line ((,class :background ,(if modus-themes-intense-hl-line
- bg-hl-line-intense bg-hl-line)
- :extend t)))
- `(modus-theme-slant ((,class :inherit italic :slant ,@(modus-themes--slant))))
- `(modus-theme-variable-pitch ((,class ,@(modus-themes--variable-pitch))))
+ `(modus-themes-bold ((,class ,@(modus-themes--bold-weight))))
+ `(modus-themes-hl-line ((,class ,@(modus-themes--hl-line bg-hl-line bg-hl-line-intense blue-nuanced-bg
+ bg-region blue-intense-bg)
+ :extend t)))
+ `(modus-themes-key-binding ((,class :inherit bold :foreground ,blue-alt-other)))
+ `(modus-themes-slant ((,class :inherit italic :slant ,@(modus-themes--slant))))
+ `(modus-themes-variable-pitch ((,class ,@(modus-themes--variable-pitch))))
+ `(modus-themes-reset-soft ((,class :background ,bg-main :foreground ,fg-main
+ :weight normal :slant normal :strike-through nil
+ :box nil :underline nil :overline nil :extend nil)))
+ `(modus-themes-reset-hard ((,class :inherit (fixed-pitch modus-themes-reset-soft))))
;;;; standard faces
;;;;; absolute essentials
`(default ((,class :background ,bg-main :foreground ,fg-main)))
`(bold-italic ((,class :inherit (bold italic))))
`(buffer-menu-buffer ((,class :inherit bold)))
`(comint-highlight-input ((,class :inherit bold)))
- `(comint-highlight-prompt ((,class :inherit modus-theme-bold
+ `(comint-highlight-prompt ((,class :inherit modus-themes-bold
,@(modus-themes--prompt
cyan
blue-nuanced-bg blue-alt
`(file-name-shadow ((,class :foreground ,fg-unfocused)))
`(header-line ((,class ,@(modus-themes--variable-pitch-ui)
:background ,bg-header :foreground ,fg-header)))
- `(header-line-highlight ((,class :inherit modus-theme-active-blue)))
- `(help-argument-name ((,class :inherit modus-theme-slant :foreground ,cyan)))
+ `(header-line-highlight ((,class :inherit modus-themes-active-blue)))
+ `(help-argument-name ((,class :inherit modus-themes-slant :foreground ,cyan)))
+ `(help-key-binding ((,class :box (:line-width (1 . -1) :color ,bg-region) ; NOTE: box syntax is for Emacs28
+ :background ,bg-inactive)))
`(homoglyph ((,class :foreground ,red-alt-faint)))
`(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other-faint)))
`(italic ((,class :slant italic)))
cyan-refine-bg fg-main))))
`(mm-command-output ((,class :foreground ,red-alt-other)))
`(mm-uu-extract ((,class :background ,bg-dim :foreground ,fg-special-mild)))
- `(next-error ((,class :inherit modus-theme-subtle-red)))
- `(rectangle-preview ((,class :inherit modus-theme-special-mild)))
- `(region ((,class ,@(modus-themes--region bg-region fg-main bg-hl-alt-intense))))
- `(secondary-selection ((,class :inherit modus-theme-special-cold)))
+ `(next-error ((,class :inherit modus-themes-subtle-red)))
+ `(rectangle-preview ((,class :inherit modus-themes-special-mild)))
+ `(region ((,class ,@(modus-themes--region bg-region fg-main bg-hl-alt-intense bg-region-accent))))
+ `(secondary-selection ((,class :inherit modus-themes-special-cold)))
`(shadow ((,class :foreground ,fg-alt)))
`(success ((,class :inherit bold :foreground ,green)))
`(trailing-whitespace ((,class :background ,red-intense-bg)))
`(widget-single-line-field ((,class :inherit widget-field)))
;;;;; ag
`(ag-hit-face ((,class :foreground ,fg-special-cold)))
- `(ag-match-face ((,class :inherit modus-theme-special-calm)))
+ `(ag-match-face ((,class :inherit modus-themes-special-calm)))
;;;;; alert
`(alert-high-face ((,class :inherit bold :foreground ,red-alt)))
`(alert-low-face ((,class :foreground ,fg-special-mild)))
`(all-the-icons-silver ((,class :foreground ,fg-special-cold)))
`(all-the-icons-yellow ((,class :foreground ,yellow)))
;;;;; annotate
- `(annotate-annotation ((,class :inherit modus-theme-subtle-blue)))
- `(annotate-annotation-secondary ((,class :inherit modus-theme-subtle-green)))
+ `(annotate-annotation ((,class :inherit modus-themes-subtle-blue)))
+ `(annotate-annotation-secondary ((,class :inherit modus-themes-subtle-green)))
`(annotate-highlight ((,class :background ,blue-nuanced-bg :underline ,blue-intense)))
`(annotate-highlight-secondary ((,class :background ,green-nuanced-bg :underline ,green-intense)))
;;;;; anzu
- `(anzu-match-1 ((,class :inherit modus-theme-subtle-cyan)))
- `(anzu-match-2 ((,class :inherit modus-theme-subtle-green)))
- `(anzu-match-3 ((,class :inherit modus-theme-subtle-yellow)))
+ `(anzu-match-1 ((,class :inherit modus-themes-subtle-cyan)))
+ `(anzu-match-2 ((,class :inherit modus-themes-subtle-green)))
+ `(anzu-match-3 ((,class :inherit modus-themes-subtle-yellow)))
`(anzu-mode-line ((,class :inherit bold :foreground ,green-active)))
`(anzu-mode-line-no-match ((,class :inherit bold :foreground ,red-active)))
- `(anzu-replace-highlight ((,class :inherit modus-theme-refine-yellow :underline t)))
- `(anzu-replace-to ((,class :inherit (modus-theme-intense-green bold))))
+ `(anzu-replace-highlight ((,class :inherit modus-themes-refine-yellow :underline t)))
+ `(anzu-replace-to ((,class :inherit (modus-themes-intense-green bold))))
;;;;; apropos
`(apropos-function-button ((,class :inherit button
,@(modus-themes--link-color
magenta-alt-other magenta-alt-other-faint))))
- `(apropos-keybinding ((,class :inherit bold :foreground ,cyan)))
+ `(apropos-keybinding ((,class :inherit modus-themes-key-binding)))
`(apropos-misc-button ((,class :inherit button
,@(modus-themes--link-color
cyan-alt-other cyan-alt-other-faint))))
- `(apropos-property ((,class :inherit modus-theme-bold :foreground ,magenta-alt)))
- `(apropos-symbol ((,class :inherit modus-theme-bold :foreground ,blue-alt-other)))
+ `(apropos-property ((,class :inherit modus-themes-bold :foreground ,magenta-alt)))
+ `(apropos-symbol ((,class :inherit modus-themes-bold :foreground ,magenta)))
`(apropos-user-option-button ((,class :inherit button
,@(modus-themes--link-color
green-alt-other green-alt-other-faint))))
`(apt-sources-list-type ((,class :foreground ,magenta)))
`(apt-sources-list-uri ((,class :foreground ,blue)))
;;;;; artbollocks-mode
- `(artbollocks-face ((,class :inherit modus-theme-lang-note)))
+ `(artbollocks-face ((,class :inherit modus-themes-lang-note)))
`(artbollocks-lexical-illusions-face ((,class :background ,bg-alt :foreground ,red-alt :underline t)))
- `(artbollocks-passive-voice-face ((,class :inherit modus-theme-lang-warning)))
- `(artbollocks-weasel-words-face ((,class :inherit modus-theme-lang-error)))
+ `(artbollocks-passive-voice-face ((,class :inherit modus-themes-lang-warning)))
+ `(artbollocks-weasel-words-face ((,class :inherit modus-themes-lang-error)))
;;;;; auctex and Tex
`(font-latex-bold-face ((,class :inherit bold :foreground ,fg-special-calm)))
- `(font-latex-doctex-documentation-face ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
- `(font-latex-doctex-preprocessor-face ((,class :inherit modus-theme-bold :foreground ,red-alt-other)))
+ `(font-latex-doctex-documentation-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold)))
+ `(font-latex-doctex-preprocessor-face ((,class :inherit modus-themes-bold :foreground ,red-alt-other)))
`(font-latex-italic-face ((,class :inherit italic :foreground ,fg-special-calm)))
`(font-latex-math-face ((,class :foreground ,cyan-alt-other)))
`(font-latex-script-char-face ((,class :foreground ,cyan-alt-other)))
- `(font-latex-sectioning-0-face ((,class :inherit modus-theme-variable-pitch :foreground ,blue-nuanced-fg)))
- `(font-latex-sectioning-1-face ((,class :inherit (bold modus-theme-variable-pitch) :foreground ,blue-nuanced-fg)))
- `(font-latex-sectioning-2-face ((,class :inherit (bold modus-theme-variable-pitch) :foreground ,blue-nuanced-fg)))
- `(font-latex-sectioning-3-face ((,class :inherit (bold modus-theme-variable-pitch) :foreground ,blue-nuanced-fg)))
- `(font-latex-sectioning-4-face ((,class :inherit (bold modus-theme-variable-pitch) :foreground ,blue-nuanced-fg)))
- `(font-latex-sectioning-5-face ((,class :inherit modus-theme-variable-pitch :foreground ,blue-nuanced-fg)))
- `(font-latex-sedate-face ((,class :inherit modus-theme-bold :foreground ,magenta-alt-other)))
- `(font-latex-slide-title-face ((,class :inherit (bold modus-theme-variable-pitch) :foreground ,cyan-nuanced-fg
+ `(font-latex-sectioning-0-face ((,class :inherit modus-themes-variable-pitch :foreground ,blue-nuanced-fg)))
+ `(font-latex-sectioning-1-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg)))
+ `(font-latex-sectioning-2-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg)))
+ `(font-latex-sectioning-3-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg)))
+ `(font-latex-sectioning-4-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg)))
+ `(font-latex-sectioning-5-face ((,class :inherit modus-themes-variable-pitch :foreground ,blue-nuanced-fg)))
+ `(font-latex-sedate-face ((,class :inherit modus-themes-bold :foreground ,magenta-alt-other)))
+ `(font-latex-slide-title-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,cyan-nuanced-fg
,@(modus-themes--scale modus-themes-scale-4))))
`(font-latex-string-face ((,class :inherit font-lock-string-face)))
`(font-latex-subscript-face ((,class :height 0.95)))
;;;;; auto-dim-other-buffers
`(auto-dim-other-buffers-face ((,class :background ,bg-alt)))
;;;;; avy
- `(avy-background-face ((,class :background ,bg-dim :foreground ,fg-dim)))
- `(avy-goto-char-timer-face ((,class :inherit (modus-theme-intense-yellow bold))))
- `(avy-lead-face ((,class :inherit (modus-theme-intense-magenta bold))))
- `(avy-lead-face-0 ((,class :inherit (modus-theme-intense-blue bold))))
- `(avy-lead-face-1 ((,class :inherit (modus-theme-intense-red bold))))
- `(avy-lead-face-2 ((,class :inherit (modus-theme-intense-green bold))))
+ `(avy-background-face ((,class :background ,bg-dim :foreground ,fg-dim :extend t)))
+ `(avy-goto-char-timer-face ((,class :inherit (modus-themes-intense-yellow bold))))
+ `(avy-lead-face ((,class :inherit (modus-themes-intense-magenta bold modus-themes-reset-soft))))
+ `(avy-lead-face-0 ((,class :inherit (modus-themes-refine-cyan bold modus-themes-reset-soft))))
+ `(avy-lead-face-1 ((,class :inherit (modus-themes-intense-neutral bold modus-themes-reset-soft))))
+ `(avy-lead-face-2 ((,class :inherit (modus-themes-refine-red bold modus-themes-reset-soft))))
;;;;; aw (ace-window)
- `(aw-background-face ((,class :background ,bg-dim :foreground ,fg-dim)))
- `(aw-key-face ((,class :inherit bold :foreground ,blue-intense)))
- `(aw-leading-char-face ((,class :inherit bold :height 1.5 :slant normal :background ,bg-main :foreground ,red-intense)))
- `(aw-minibuffer-leading-char-face ((,class :foreground ,magenta-active)))
+ `(aw-background-face ((,class :foreground ,fg-unfocused)))
+ `(aw-key-face ((,class :inherit modus-themes-key-binding)))
+ `(aw-leading-char-face ((,class :inherit (bold modus-themes-reset-soft) :height 1.5
+ :foreground ,red-intense)))
+ `(aw-minibuffer-leading-char-face ((,class :inherit (modus-themes-intense-red bold))))
`(aw-mode-line-face ((,class :inherit bold)))
;;;;; awesome-tray
`(awesome-tray-module-awesome-tab-face ((,class :inherit bold :foreground ,red-alt-other)))
`(bbdb-organization ((,class :foreground ,red-alt-other)))
`(bbdb-field-name ((,class :foreground ,cyan-alt-other)))
;;;;; binder
- `(binder-sidebar-highlight ((,class :inherit modus-theme-subtle-cyan)))
- `(binder-sidebar-marked ((,class :inherit modus-theme-mark-sel)))
- `(binder-sidebar-missing ((,class :inherit modus-theme-subtle-red)))
+ `(binder-sidebar-highlight ((,class :inherit modus-themes-subtle-cyan)))
+ `(binder-sidebar-marked ((,class :inherit modus-themes-mark-sel)))
+ `(binder-sidebar-missing ((,class :inherit modus-themes-subtle-red)))
`(binder-sidebar-tags ((,class :foreground ,cyan)))
;;;;; bm
- `(bm-face ((,class :inherit modus-theme-subtle-yellow :extend t)))
- `(bm-fringe-face ((,class :inherit modus-theme-fringe-yellow)))
- `(bm-fringe-persistent-face ((,class :inherit modus-theme-fringe-blue)))
- `(bm-persistent-face ((,class :inherit modus-theme-intense-blue :extend t)))
+ `(bm-face ((,class :inherit modus-themes-subtle-yellow :extend t)))
+ `(bm-fringe-face ((,class :inherit modus-themes-fringe-yellow)))
+ `(bm-fringe-persistent-face ((,class :inherit modus-themes-fringe-blue)))
+ `(bm-persistent-face ((,class :inherit modus-themes-intense-blue :extend t)))
;;;;; bongo
- `(bongo-album-title ((,class :foreground ,yellow-active)))
+ `(bongo-album-title ((,class :foreground ,fg-active)))
`(bongo-artist ((,class :foreground ,magenta-active)))
`(bongo-currently-playing-track ((,class :inherit bold)))
- `(bongo-elapsed-track-part ((,class :inherit modus-theme-subtle-magenta :underline t)))
+ `(bongo-elapsed-track-part ((,class :inherit modus-themes-subtle-magenta :underline t)))
`(bongo-filled-seek-bar ((,class :background ,blue-intense-bg :foreground ,fg-main)))
`(bongo-marked-track ((,class :foreground ,fg-mark-alt)))
`(bongo-marked-track-line ((,class :background ,bg-mark-alt)))
`(bongo-played-track ((,class :foreground ,fg-unfocused :strike-through t)))
- `(bongo-track-length ((,class :foreground ,fg-active)))
- `(bongo-track-title ((,class :foreground ,cyan-active)))
+ `(bongo-track-length ((,class :foreground ,fg-alt)))
+ `(bongo-track-title ((,class :foreground ,blue-active)))
`(bongo-unfilled-seek-bar ((,class :background ,bg-special-cold :foreground ,fg-main)))
;;;;; boon
- `(boon-modeline-cmd ((,class :inherit modus-theme-active-blue)))
- `(boon-modeline-ins ((,class :inherit modus-theme-active-red)))
- `(boon-modeline-off ((,class :inherit modus-theme-active-yellow)))
- `(boon-modeline-spc ((,class :inherit modus-theme-active-green)))
+ `(boon-modeline-cmd ((,class :inherit modus-themes-active-blue)))
+ `(boon-modeline-ins ((,class :inherit modus-themes-active-red)))
+ `(boon-modeline-off ((,class :inherit modus-themes-active-yellow)))
+ `(boon-modeline-spc ((,class :inherit modus-themes-active-green)))
;;;;; breakpoint (built-in gdb-mi.el)
`(breakpoint-disabled ((,class :inherit shadow)))
`(breakpoint-enabled ((,class :inherit bold :foreground ,red)))
;;;;; buffer-expose
`(buffer-expose-ace-char-face ((,class :inherit bold :foreground ,red-active)))
`(buffer-expose-mode-line-face ((,class :foreground ,cyan-active)))
- `(buffer-expose-selected-face ((,class :inherit modus-theme-special-mild)))
+ `(buffer-expose-selected-face ((,class :inherit modus-themes-special-mild)))
;;;;; calendar and diary
- `(calendar-month-header ((,class :inherit modus-theme-pseudo-header)))
+ `(calendar-month-header ((,class :inherit modus-themes-pseudo-header)))
`(calendar-today ((,class :inherit bold :underline t)))
- `(calendar-weekday-header ((,class :inherit shadow)))
- `(calendar-weekend-header ((,class :inherit shadow)))
- `(diary ((,class :background ,green-nuanced-bg :foreground ,green-alt-other)))
+ `(calendar-weekday-header ((,class :foreground ,fg-unfocused)))
+ `(calendar-weekend-header ((,class :foreground ,fg-unfocused)))
+ `(diary ((,class :background ,blue-nuanced-bg :foreground ,blue-alt-other)))
`(diary-anniversary ((,class :foreground ,red-alt-other)))
- `(diary-time ((,class :foreground ,blue-alt)))
+ `(diary-time ((,class :foreground ,cyan)))
`(holiday ((,class :background ,magenta-nuanced-bg :foreground ,magenta-alt)))
;;;;; calfw
`(cfw:face-annotation ((,class :foreground ,fg-special-warm)))
`(cfw:face-holiday ((,class :foreground ,magenta-alt-other)))
`(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
`(cfw:face-saturday ((,class :inherit bold :foreground ,cyan-alt-other)))
- `(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
+ `(cfw:face-select ((,class :inherit modus-themes-intense-blue)))
`(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other)))
- `(cfw:face-title ((,class :inherit modus-theme-variable-pitch
+ `(cfw:face-title ((,class :inherit modus-themes-variable-pitch
:foreground ,fg-special-cold
,@(modus-themes--scale modus-themes-scale-5))))
`(cfw:face-today ((,class :background ,bg-inactive)))
`(cfw:face-toolbar-button-on ((,class :inherit bold :background ,blue-nuanced-bg
:foreground ,blue-alt)))
;;;;; centaur-tabs
- `(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
+ `(centaur-tabs-active-bar-face ((,class :background ,fg-tab-accent)))
`(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground ,red-active :underline t)))
`(centaur-tabs-close-selected ((,class :inherit centaur-tabs-selected)))
`(centaur-tabs-close-unselected ((,class :inherit centaur-tabs-unselected)))
;;;;; cider
`(cider-debug-code-overlay-face ((,class :background ,bg-alt)))
`(cider-debug-prompt-face ((,class :foreground ,magenta-alt :underline t)))
- `(cider-deprecated-face ((,class :inherit modus-theme-refine-yellow)))
+ `(cider-deprecated-face ((,class :inherit modus-themes-refine-yellow)))
`(cider-docview-emphasis-face ((,class :inherit italic :foreground ,fg-special-cold)))
`(cider-docview-literal-face ((,class :foreground ,blue-alt)))
`(cider-docview-strong-face ((,class :inherit bold :foreground ,fg-special-cold)))
`(cider-instrumented-face ((,class :box (:line-width -1 :color ,red :style nil) :background ,bg-dim)))
`(cider-reader-conditional-face ((,class :inherit italic :foreground ,fg-special-warm)))
`(cider-repl-input-face ((,class :inherit bold)))
- `(cider-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
+ `(cider-repl-prompt-face ((,class :inherit comint-highlight-prompt)))
`(cider-repl-stderr-face ((,class :inherit bold :foreground ,red)))
`(cider-repl-stdout-face ((,class :foreground ,blue)))
`(cider-result-overlay-face ((,class :box (:line-width -1 :color ,blue :style nil) :background ,bg-dim)))
`(cider-stacktrace-promoted-button-face ((,class :box (:line-width 3 :color ,fg-alt :style released-button) :foreground ,red)))
`(cider-stacktrace-suppressed-button-face ((,class :box (:line-width 3 :color ,fg-alt :style pressed-button)
:background ,bg-alt :foreground ,fg-alt)))
- `(cider-test-error-face ((,class :inherit modus-theme-subtle-red)))
- `(cider-test-failure-face ((,class :inherit (modus-theme-intense-red bold))))
- `(cider-test-success-face ((,class :inherit modus-theme-intense-green)))
+ `(cider-test-error-face ((,class :inherit modus-themes-subtle-red)))
+ `(cider-test-failure-face ((,class :inherit (modus-themes-intense-red bold))))
+ `(cider-test-success-face ((,class :inherit modus-themes-intense-green)))
`(cider-traced-face ((,class :box (:line-width -1 :color ,cyan :style nil) :background ,bg-dim)))
`(cider-warning-highlight-face ((,class :foreground ,yellow :underline t)))
;;;;; circe (and lui)
`(circe-fool-face ((,class :inherit shadow)))
`(circe-highlight-nick-face ((,class :inherit bold :foreground ,blue)))
- `(circe-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
+ `(circe-prompt-face ((,class :inherit comint-highlight-prompt)))
`(circe-server-face ((,class :foreground ,fg-unfocused)))
`(lui-button-face ((,class :inherit button)))
`(lui-highlight-face ((,class :foreground ,magenta-alt)))
`(color-rg-font-lock-column-number ((,class :foreground ,magenta-alt-other)))
`(color-rg-font-lock-command ((,class :inherit bold :foreground ,fg-main)))
`(color-rg-font-lock-file ((,class :inherit bold :foreground ,fg-special-cold)))
- `(color-rg-font-lock-flash ((,class :inherit modus-theme-intense-blue)))
- `(color-rg-font-lock-function-location ((,class :inherit modus-theme-special-calm)))
+ `(color-rg-font-lock-flash ((,class :inherit modus-themes-intense-blue)))
+ `(color-rg-font-lock-function-location ((,class :inherit modus-themes-special-calm)))
`(color-rg-font-lock-header-line-directory ((,class :foreground ,blue-active)))
`(color-rg-font-lock-header-line-edit-mode ((,class :foreground ,magenta-active)))
`(color-rg-font-lock-header-line-keyword ((,class :foreground ,green-active)))
`(color-rg-font-lock-line-number ((,class :foreground ,fg-special-warm)))
`(color-rg-font-lock-mark-changed ((,class :inherit bold :foreground ,blue)))
`(color-rg-font-lock-mark-deleted ((,class :inherit bold :foreground ,red)))
- `(color-rg-font-lock-match ((,class :inherit modus-theme-special-calm)))
+ `(color-rg-font-lock-match ((,class :inherit modus-themes-special-calm)))
`(color-rg-font-lock-position-splitter ((,class :inherit shadow)))
;;;;; column-enforce-mode
- `(column-enforce-face ((,class :inherit modus-theme-refine-yellow)))
+ `(column-enforce-face ((,class :inherit modus-themes-refine-yellow)))
;;;;; company-mode
`(company-echo-common ((,class :foreground ,magenta-alt-other)))
`(company-preview ((,class :background ,bg-dim :foreground ,fg-dim)))
`(company-preview-common ((,class :foreground ,blue-alt)))
- `(company-preview-search ((,class :inherit modus-theme-special-calm)))
+ `(company-preview-search ((,class :inherit modus-themes-special-calm)))
`(company-scrollbar-bg ((,class :background ,bg-active)))
`(company-scrollbar-fg ((,class :background ,fg-active)))
- `(company-template-field ((,class :inherit modus-theme-intense-magenta)))
+ `(company-template-field ((,class :inherit modus-themes-intense-magenta)))
`(company-tooltip ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(company-tooltip-annotation ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
+ `(company-tooltip-annotation ((,class :inherit modus-themes-slant :foreground ,fg-special-cold)))
`(company-tooltip-annotation-selection ((,class :inherit bold :foreground ,fg-main)))
`(company-tooltip-common ((,class :inherit bold :foreground ,blue-alt)))
`(company-tooltip-common-selection ((,class :foreground ,fg-main)))
- `(company-tooltip-mouse ((,class :inherit modus-theme-intense-blue)))
- `(company-tooltip-search ((,class :inherit (modus-theme-refine-cyan bold))))
- `(company-tooltip-search-selection ((,class :inherit (modus-theme-intense-green bold) :underline t)))
- `(company-tooltip-selection ((,class :inherit (modus-theme-subtle-cyan bold))))
+ `(company-tooltip-mouse ((,class :inherit modus-themes-intense-blue)))
+ `(company-tooltip-search ((,class :inherit (modus-themes-refine-cyan bold))))
+ `(company-tooltip-search-selection ((,class :inherit (modus-themes-intense-green bold) :underline t)))
+ `(company-tooltip-selection ((,class :inherit (modus-themes-subtle-cyan bold))))
;;;;; company-posframe
`(company-posframe-active-backend-name ((,class :inherit bold :background ,bg-active :foreground ,blue-active)))
`(company-posframe-inactive-backend-name ((,class :background ,bg-active :foreground ,fg-active)))
`(company-posframe-metadata ((,class :background ,bg-inactive :foreground ,fg-inactive)))
;;;;; compilation feedback
`(compilation-column-number ((,class :foreground ,magenta-alt-other)))
- `(compilation-error ((,class :inherit modus-theme-bold :foreground ,red)))
- `(compilation-info ((,class :inherit modus-theme-bold :foreground ,fg-special-cold)))
+ `(compilation-error ((,class :inherit modus-themes-bold :foreground ,red)))
+ `(compilation-info ((,class :inherit modus-themes-bold :foreground ,fg-special-cold)))
`(compilation-line-number ((,class :foreground ,fg-special-warm)))
- `(compilation-mode-line-exit ((,class :inherit modus-theme-bold :foreground ,blue-active)))
- `(compilation-mode-line-fail ((,class :inherit modus-theme-bold :foreground ,red-active)))
- `(compilation-mode-line-run ((,class :inherit modus-theme-bold :foreground ,magenta-active)))
- `(compilation-warning ((,class :inherit modus-theme-bold :foreground ,yellow)))
+ `(compilation-mode-line-exit ((,class :inherit modus-themes-bold :foreground ,blue-active)))
+ `(compilation-mode-line-fail ((,class :inherit modus-themes-bold :foreground ,red-active)))
+ `(compilation-mode-line-run ((,class :inherit modus-themes-bold :foreground ,magenta-active)))
+ `(compilation-warning ((,class :inherit modus-themes-bold :foreground ,yellow)))
;;;;; completions
- `(completions-annotations ((,class :inherit modus-theme-slant :foreground ,cyan-faint)))
+ `(completions-annotations ((,class :inherit modus-themes-slant :foreground ,cyan-faint)))
`(completions-common-part ((,class ,@(modus-themes--standard-completions
blue-alt blue-nuanced-bg
cyan-refine-bg cyan-refine-fg))))
`(consult-bookmark ((,class :foreground ,blue)))
`(consult-file ((,class :foreground ,fg-special-cold)))
`(consult-imenu-prefix ((,class :inherit shadow)))
- `(consult-key ((,class :inherit modus-themes-bold :foreground ,magenta-alt-other)))
+ `(consult-key ((,class :inherit modus-themes-key-binding)))
`(consult-line-number ((,class :foreground ,fg-special-warm)))
`(consult-line-number-prefix ((,class :foreground ,fg-unfocused)))
`(consult-narrow-indicator ((,class :foreground ,magenta-alt)))
- `(consult-preview-cursor ((,class :inherit modus-theme-intense-blue)))
- `(consult-preview-error ((,class :inherit modus-theme-intense-red)))
+ `(consult-preview-cursor ((,class :inherit modus-themes-intense-blue)))
+ `(consult-preview-error ((,class :inherit modus-themes-intense-red)))
`(consult-preview-line ((,class :background ,bg-hl-alt-intense)))
+;;;;; corfu
+ `(corfu-background ((,class :background ,bg-alt :foreground ,fg-alt)))
+ `(corfu-current ((,class :inherit bold :background ,cyan-subtle-bg)))
+ `(corfu-bar ((,class :background ,fg-alt :foreground ,fg-alt)))
+ `(corfu-border ((,class :background ,bg-active :foreground ,bg-region)))
;;;;; counsel
`(counsel-active-mode ((,class :foreground ,magenta-alt-other)))
`(counsel-application-name ((,class :foreground ,red-alt-other)))
- `(counsel-key-binding ((,class :inherit bold :foreground ,blue-alt-other)))
+ `(counsel-key-binding ((,class :inherit modus-themes-key-binding)))
`(counsel-outline-1 ((,class :inherit org-level-1)))
`(counsel-outline-2 ((,class :inherit org-level-2)))
`(counsel-outline-3 ((,class :inherit org-level-3)))
`(counsel-outline-7 ((,class :inherit org-level-7)))
`(counsel-outline-8 ((,class :inherit org-level-8)))
`(counsel-outline-default ((,class :foreground ,fg-main)))
- `(counsel-variable-documentation ((,class :inherit modus-theme-slant :foreground ,yellow-alt-other)))
+ `(counsel-variable-documentation ((,class :inherit modus-themes-slant :foreground ,yellow-alt-other)))
;;;;; counsel-css
`(counsel-css-selector-depth-face-1 ((,class :foreground ,blue)))
`(counsel-css-selector-depth-face-2 ((,class :foreground ,cyan)))
;;;;; csv-mode
`(csv-separator-face ((,class :background ,bg-special-cold :foreground ,fg-main)))
;;;;; ctrlf
- `(ctrlf-highlight-active ((,class :inherit (modus-theme-intense-green bold))))
- `(ctrlf-highlight-line ((,class :inherit modus-theme-hl-line)))
- `(ctrlf-highlight-passive ((,class :inherit modus-theme-refine-cyan)))
+ `(ctrlf-highlight-active ((,class :inherit (modus-themes-intense-green bold))))
+ `(ctrlf-highlight-line ((,class :inherit modus-themes-hl-line)))
+ `(ctrlf-highlight-passive ((,class :inherit modus-themes-refine-cyan)))
;;;;; custom (M-x customize)
`(custom-button ((,class :box (:line-width 2 :color nil :style released-button)
:background ,bg-active :foreground ,fg-main)))
:background ,bg-active :foreground ,fg-active)))
`(custom-button-pressed ((,class :box (:line-width 2 :color nil :style pressed-button)
:background ,bg-active :foreground ,fg-main)))
- `(custom-changed ((,class :inherit modus-theme-subtle-cyan)))
+ `(custom-changed ((,class :inherit modus-themes-subtle-cyan)))
`(custom-comment ((,class :inherit shadow)))
`(custom-comment-tag ((,class :background ,bg-alt :foreground ,yellow-alt-other)))
`(custom-face-tag ((,class :inherit bold :foreground ,blue-intense)))
`(custom-group-tag ((,class :inherit bold :foreground ,green-intense)))
- `(custom-group-tag-1 ((,class :inherit modus-theme-special-warm)))
- `(custom-invalid ((,class :inherit (modus-theme-intense-red bold))))
- `(custom-modified ((,class :inherit modus-theme-subtle-cyan)))
- `(custom-rogue ((,class :inherit modus-theme-refine-magenta)))
+ `(custom-group-tag-1 ((,class :inherit modus-themes-special-warm)))
+ `(custom-invalid ((,class :inherit (modus-themes-intense-red bold))))
+ `(custom-modified ((,class :inherit modus-themes-subtle-cyan)))
+ `(custom-rogue ((,class :inherit modus-themes-refine-magenta)))
`(custom-set ((,class :foreground ,blue-alt)))
`(custom-state ((,class :foreground ,cyan-alt-other)))
- `(custom-themed ((,class :inherit modus-theme-subtle-blue)))
+ `(custom-themed ((,class :inherit modus-themes-subtle-blue)))
`(custom-variable-tag ((,class :inherit bold :foreground ,cyan)))
;;;;; dap-mode
`(dap-mouse-eval-thing-face ((,class :box (:line-width -1 :color ,blue-active :style nil)
`(dap-ui-locals-scope-face ((,class :inherit bold :foreground ,magenta :underline t)))
`(dap-ui-locals-variable-face ((,class :inherit bold :foreground ,cyan)))
`(dap-ui-locals-variable-leaf-face ((,class :inherit italic :foreground ,cyan-alt-other)))
- `(dap-ui-marker-face ((,class :inherit modus-theme-subtle-blue)))
+ `(dap-ui-marker-face ((,class :inherit modus-themes-subtle-blue)))
`(dap-ui-sessions-stack-frame-face ((,class :inherit bold :foreground ,magenta-alt)))
`(dap-ui-sessions-terminated-active-face ((,class :inherit bold :foreground ,fg-alt)))
`(dap-ui-sessions-terminated-face ((,class :inherit shadow)))
`(dashboard-text-banner ((,class :foreground ,fg-dim)))
;;;;; deadgrep
`(deadgrep-filename-face ((,class :inherit bold :foreground ,fg-special-cold)))
- `(deadgrep-match-face ((,class :inherit modus-theme-special-calm)))
+ `(deadgrep-match-face ((,class :inherit modus-themes-special-calm)))
`(deadgrep-meta-face ((,class :inherit shadow)))
`(deadgrep-regexp-metachar-face ((,class :inherit bold :foreground ,yellow-intense)))
`(deadgrep-search-term-face ((,class :inherit bold :foreground ,green-intense)))
`(define-word-face-1 ((,class :foreground ,yellow)))
`(define-word-face-2 ((,class :foreground ,fg-main)))
;;;;; deft
- `(deft-filter-string-error-face ((,class :inherit modus-theme-refine-red)))
+ `(deft-filter-string-error-face ((,class :inherit modus-themes-refine-red)))
`(deft-filter-string-face ((,class :foreground ,green-intense)))
`(deft-header-face ((,class :inherit bold :foreground ,fg-special-warm)))
`(deft-separator-face ((,class :inherit shadow)))
- `(deft-summary-face ((,class :inherit modus-theme-slant :foreground ,fg-alt)))
+ `(deft-summary-face ((,class :inherit modus-themes-slant :foreground ,fg-alt)))
`(deft-time-face ((,class :foreground ,fg-special-cold)))
`(deft-title-face ((,class :inherit bold :foreground ,fg-main)))
;;;;; dictionary
`(dictionary-word-definition-face (()))
`(dictionary-word-entry-face ((,class :inherit font-lock-comment-face)))
;;;;; diff-hl
- `(diff-hl-change ((,class :inherit modus-theme-fringe-yellow)))
- `(diff-hl-delete ((,class :inherit modus-theme-fringe-red)))
+ `(diff-hl-change ((,class :inherit modus-themes-fringe-yellow)))
+ `(diff-hl-delete ((,class :inherit modus-themes-fringe-red)))
`(diff-hl-dired-change ((,class :inherit diff-hl-change)))
`(diff-hl-dired-delete ((,class :inherit diff-hl-delete)))
`(diff-hl-dired-ignored ((,class :inherit dired-ignored)))
`(diff-hl-dired-insert ((,class :inherit diff-hl-insert)))
`(diff-hl-dired-unknown ((,class :inherit dired-ignored)))
- `(diff-hl-insert ((,class :inherit modus-theme-fringe-green)))
- `(diff-hl-reverted-hunk-highlight ((,class :inherit (modus-theme-active-magenta bold))))
+ `(diff-hl-insert ((,class :inherit modus-themes-fringe-green)))
+ `(diff-hl-reverted-hunk-highlight ((,class :inherit (modus-themes-active-magenta bold))))
;;;;; diff-mode
- `(diff-added ((,class :inherit modus-theme-diff-added)))
- `(diff-changed ((,class :inherit modus-theme-diff-changed :extend t)))
+ `(diff-added ((,class :inherit modus-themes-diff-added)))
+ `(diff-changed ((,class :inherit modus-themes-diff-changed :extend t)))
`(diff-context ((,class ,@(modus-themes--diff-text fg-main fg-unfocused))))
- `(diff-error ((,class :inherit modus-theme-intense-red)))
+ `(diff-error ((,class :inherit modus-themes-intense-red)))
`(diff-file-header ((,class :inherit (bold diff-header))))
- `(diff-function ((,class :inherit modus-theme-diff-heading)))
+ `(diff-function ((,class :inherit modus-themes-diff-heading)))
`(diff-header ((,class ,@(modus-themes--diff-text cyan-faint fg-main))))
- `(diff-hunk-header ((,class :inherit (bold modus-theme-diff-heading))))
+ `(diff-hunk-header ((,class :inherit (bold modus-themes-diff-heading))))
`(diff-index ((,class :inherit bold :foreground ,blue-alt)))
`(diff-indicator-added ((,class :inherit (diff-added bold)
:foreground ,@(modus-themes--diff-deuteran blue green))))
`(diff-indicator-changed ((,class :inherit (diff-changed bold) :foreground ,yellow)))
`(diff-indicator-removed ((,class :inherit (diff-removed bold) :foreground ,red)))
- `(diff-nonexistent ((,class :inherit (modus-theme-neutral bold))))
- `(diff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
- `(diff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
- `(diff-refine-removed ((,class :inherit modus-theme-diff-refine-removed)))
- `(diff-removed ((,class :inherit modus-theme-diff-removed)))
+ `(diff-nonexistent ((,class :inherit (modus-themes-neutral bold))))
+ `(diff-refine-added ((,class :inherit modus-themes-diff-refine-added)))
+ `(diff-refine-changed ((,class :inherit modus-themes-diff-refine-changed)))
+ `(diff-refine-removed ((,class :inherit modus-themes-diff-refine-removed)))
+ `(diff-removed ((,class :inherit modus-themes-diff-removed)))
;;;;; dim-autoload
`(dim-autoload-cookie-line ((,class :inherit font-lock-comment-face)))
;;;;; dir-treeview
`(dir-treeview-image-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,green-alt)))
`(dir-treeview-indent-face ((,class :inherit shadow)))
`(dir-treeview-label-mouse-face ((,class :inherit highlight)))
- `(dir-treeview-start-dir-face ((,class :inherit modus-theme-pseudo-header)))
+ `(dir-treeview-start-dir-face ((,class :inherit modus-themes-pseudo-header)))
`(dir-treeview-symlink-face ((,class :inherit button
,@(modus-themes--link-color
cyan cyan-faint))))
;;;;; dired
`(dired-broken-symlink ((,class :inherit button :foreground ,red)))
`(dired-directory ((,class :foreground ,blue)))
- `(dired-flagged ((,class :inherit modus-theme-mark-del)))
- `(dired-header ((,class :inherit modus-theme-pseudo-header)))
+ `(dired-flagged ((,class :inherit modus-themes-mark-del)))
+ `(dired-header ((,class :inherit modus-themes-pseudo-header)))
`(dired-ignored ((,class :inherit shadow)))
- `(dired-mark ((,class :inherit modus-theme-mark-symbol)))
- `(dired-marked ((,class :inherit modus-theme-mark-sel)))
+ `(dired-mark ((,class :inherit modus-themes-mark-symbol)))
+ `(dired-marked ((,class :inherit modus-themes-mark-sel)))
`(dired-perm-write ((,class :foreground ,fg-special-warm)))
`(dired-symlink ((,class :inherit button
,@(modus-themes--link-color
cyan-alt cyan-alt-faint))))
`(dired-warning ((,class :inherit bold :foreground ,yellow)))
;;;;; dired-async
- `(dired-async-failures ((,class :inherit modus-theme-bold :foreground ,red-active)))
- `(dired-async-message ((,class :inherit modus-theme-bold :foreground ,green-active)))
- `(dired-async-mode-message ((,class :inherit modus-theme-bold :foreground ,cyan-active)))
+ `(dired-async-failures ((,class :inherit bold :foreground ,red-active)))
+ `(dired-async-message ((,class :inherit bold :foreground ,blue-active)))
+ `(dired-async-mode-message ((,class :inherit bold :foreground ,cyan-active)))
;;;;; dired-git
`(dired-git-branch-else ((,class :inherit bold :foreground ,magenta-alt)))
`(dired-git-branch-master ((,class :inherit bold :foreground ,magenta-alt-other)))
;;;;; dired-git-info
`(dgi-commit-message-face ((,class :foreground ,fg-special-mild)))
;;;;; dired-narrow
- `(dired-narrow-blink ((,class :inherit (modus-theme-subtle-cyan bold))))
+ `(dired-narrow-blink ((,class :inherit (modus-themes-subtle-cyan bold))))
;;;;; dired-subtree
;; remove backgrounds from dired-subtree faces, else they break
;; dired-{flagged,marked} and any other face that sets a background
`(diredc-face-chmod-font-lock-read ((,class :foreground ,fg-main)))
`(diredc-face-chmod-font-lock-write ((,class :foreground ,cyan)))
;;;;; diredfl
- `(diredfl-autofile-name ((,class :inherit modus-theme-special-cold)))
+ `(diredfl-autofile-name ((,class :inherit modus-themes-special-cold)))
`(diredfl-compressed-file-name ((,class :foreground ,fg-special-warm)))
`(diredfl-compressed-file-suffix ((,class :foreground ,red-alt)))
`(diredfl-date-time ((,class :foreground ,cyan-alt-other)))
- `(diredfl-deletion ((,class :inherit modus-theme-mark-del)))
- `(diredfl-deletion-file-name ((,class :inherit modus-theme-mark-del)))
- `(diredfl-dir-heading ((,class :inherit modus-theme-pseudo-header)))
+ `(diredfl-deletion ((,class :inherit modus-themes-mark-del)))
+ `(diredfl-deletion-file-name ((,class :inherit modus-themes-mark-del)))
+ `(diredfl-dir-heading ((,class :inherit modus-themes-pseudo-header)))
`(diredfl-dir-name ((,class :inherit dired-directory)))
`(diredfl-dir-priv ((,class :foreground ,blue-alt)))
`(diredfl-exec-priv ((,class :foreground ,magenta)))
`(diredfl-executable-tag ((,class :foreground ,magenta-alt)))
`(diredfl-file-name ((,class :foreground ,fg-main)))
`(diredfl-file-suffix ((,class :foreground ,cyan)))
- `(diredfl-flag-mark ((,class :inherit modus-theme-mark-sel)))
- `(diredfl-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
+ `(diredfl-flag-mark ((,class :inherit modus-themes-mark-sel)))
+ `(diredfl-flag-mark-line ((,class :inherit modus-themes-mark-sel)))
`(diredfl-ignored-file-name ((,class :inherit shadow)))
`(diredfl-link-priv ((,class :foreground ,blue-alt-other)))
`(diredfl-no-priv ((,class :inherit shadow)))
`(diredfl-rare-priv ((,class :foreground ,red-alt)))
`(diredfl-read-priv ((,class :foreground ,fg-main)))
`(diredfl-symlink ((,class :inherit dired-symlink)))
- `(diredfl-tagged-autofile-name ((,class :inherit modus-theme-refine-magenta)))
+ `(diredfl-tagged-autofile-name ((,class :inherit modus-themes-refine-magenta)))
`(diredfl-write-priv ((,class :foreground ,cyan)))
;;;;; dired+
- `(diredp-autofile-name ((,class :inherit modus-theme-special-cold)))
+ `(diredp-autofile-name ((,class :inherit modus-themes-special-cold)))
`(diredp-compressed-file-name ((,class :foreground ,fg-special-warm)))
`(diredp-compressed-file-suffix ((,class :foreground ,red-alt)))
`(diredp-date-time ((,class :foreground ,cyan-alt-other)))
- `(diredp-deletion ((,class :inherit modus-theme-mark-del)))
- `(diredp-deletion-file-name ((,class :inherit modus-theme-mark-del)))
- `(diredp-dir-heading ((,class :inherit modus-theme-pseudo-header)))
+ `(diredp-deletion ((,class :inherit modus-themes-mark-del)))
+ `(diredp-deletion-file-name ((,class :inherit modus-themes-mark-del)))
+ `(diredp-dir-heading ((,class :inherit modus-themes-pseudo-header)))
`(diredp-dir-name ((,class :inherit dired-directory)))
`(diredp-dir-priv ((,class :foreground ,blue-alt)))
`(diredp-exec-priv ((,class :foreground ,magenta)))
`(diredp-executable-tag ((,class :foreground ,magenta-alt)))
`(diredp-file-name ((,class :foreground ,fg-main)))
`(diredp-file-suffix ((,class :foreground ,cyan)))
- `(diredp-flag-mark ((,class :inherit modus-theme-mark-sel)))
- `(diredp-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
+ `(diredp-flag-mark ((,class :inherit modus-themes-mark-sel)))
+ `(diredp-flag-mark-line ((,class :inherit modus-themes-mark-sel)))
`(diredp-ignored-file-name ((,class :inherit shadow)))
`(diredp-link-priv ((,class :foreground ,blue-alt-other)))
`(diredp-mode-line-flagged ((,class :foreground ,red-active)))
`(diredp-rare-priv ((,class :foreground ,red-alt)))
`(diredp-read-priv ((,class :foreground ,fg-main)))
`(diredp-symlink ((,class :inherit dired-symlink)))
- `(diredp-tagged-autofile-name ((,class :inherit modus-theme-refine-magenta)))
+ `(diredp-tagged-autofile-name ((,class :inherit modus-themes-refine-magenta)))
`(diredp-write-priv ((,class :foreground ,cyan)))
;;;;; disk-usage
`(disk-usage-children ((,class :foreground ,yellow)))
;;;;; display-fill-column-indicator-mode
`(fill-column-indicator ((,class :foreground ,bg-active)))
;;;;; doom-modeline
- `(doom-modeline-bar ((,class :inherit modus-theme-active-blue)))
+ `(doom-modeline-bar ((,class :inherit modus-themes-active-blue)))
`(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground ,bg-main)))
`(doom-modeline-battery-charging ((,class :foreground ,green-active)))
`(doom-modeline-battery-critical ((,class :inherit bold :foreground ,red-active)))
`(doom-modeline-lsp-error ((,class :inherit bold :foreground ,red-active)))
`(doom-modeline-lsp-success ((,class :inherit bold :foreground ,green-active)))
`(doom-modeline-lsp-warning ((,class :inherit bold :foreground ,yellow-active)))
- `(doom-modeline-panel ((,class :inherit modus-theme-active-blue)))
+ `(doom-modeline-panel ((,class :inherit modus-themes-active-blue)))
`(doom-modeline-persp-buffer-not-in-persp ((,class :inherit italic :foreground ,yellow-active)))
`(doom-modeline-persp-name ((,class :foreground ,fg-active)))
`(doom-modeline-project-dir ((,class :inherit bold :foreground ,blue-active)))
`(doom-modeline-urgent ((,class :inherit bold :foreground ,red-active)))
`(doom-modeline-warning ((,class :inherit bold :foreground ,yellow-active)))
;;;;; dynamic-ruler
- `(dynamic-ruler-negative-face ((,class :inherit modus-theme-intense-neutral)))
- `(dynamic-ruler-positive-face ((,class :inherit modus-theme-intense-yellow)))
+ `(dynamic-ruler-negative-face ((,class :inherit modus-themes-intense-neutral)))
+ `(dynamic-ruler-positive-face ((,class :inherit modus-themes-intense-yellow)))
;;;;; easy-jekyll
`(easy-jekyll-help-face ((,class :background ,bg-dim :foreground ,cyan-alt-other)))
;;;;; easy-kill
- `(easy-kill-origin ((,class :inherit modus-theme-subtle-red)))
- `(easy-kill-selection ((,class :inherit modus-theme-subtle-yellow)))
+ `(easy-kill-origin ((,class :inherit modus-themes-subtle-red)))
+ `(easy-kill-selection ((,class :inherit modus-themes-subtle-yellow)))
;;;;; ebdb
`(ebdb-address-default ((,class :foreground ,fg-special-calm)))
`(ebdb-defunct ((,class :inherit shadow)))
`(ebdb-phone-default ((,class :foreground ,cyan)))
`(eieio-custom-slot-tag-face ((,class :foreground ,red-alt)))
;;;;; ediff
- ;; NOTE: here we break from the pattern of inheriting from the
- ;; modus-theme-diff-* faces.
- `(ediff-current-diff-A ((,class ,@(modus-themes--diff
- bg-dim red
- bg-diff-removed fg-diff-removed
- red-nuanced-bg red-faint))))
+ `(ediff-current-diff-A ((,class :inherit modus-themes-diff-removed)))
`(ediff-current-diff-Ancestor ((,class ,@(modus-themes--diff
- bg-dim fg-special-cold
+ bg-alt fg-special-cold
bg-special-cold fg-special-cold
blue-nuanced-bg blue))))
- `(ediff-current-diff-B ((,class ,@(modus-themes--diff
- bg-dim green
- bg-diff-added fg-diff-added
- green-nuanced-bg green-faint
- bg-diff-added-deuteran fg-diff-added-deuteran))))
- `(ediff-current-diff-C ((,class ,@(modus-themes--diff
- bg-dim yellow
- bg-diff-changed fg-diff-changed
- yellow-nuanced-bg yellow-faint))))
- `(ediff-even-diff-A ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
- `(ediff-even-diff-Ancestor ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-1)))
- `(ediff-even-diff-B ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
- `(ediff-even-diff-C ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2)))
- `(ediff-fine-diff-A ((,class :background ,bg-diff-focus-removed :foreground ,fg-diff-focus-removed)))
- `(ediff-fine-diff-Ancestor ((,class :inherit modus-theme-refine-cyan)))
- `(ediff-fine-diff-B
- ((,class :background ,@(modus-themes--diff-deuteran bg-diff-focus-added-deuteran bg-diff-focus-added)
- :foreground ,@(modus-themes--diff-deuteran fg-diff-focus-added-deuteran fg-diff-focus-added))))
- `(ediff-fine-diff-C ((,class :background ,bg-diff-focus-changed :foreground ,fg-diff-focus-changed)))
- `(ediff-odd-diff-A ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2)))
- `(ediff-odd-diff-Ancestor ((,class :background ,bg-diff-neutral-0 :foreground ,fg-diff-neutral-0)))
- `(ediff-odd-diff-B ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2)))
- `(ediff-odd-diff-C ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
+ `(ediff-current-diff-B ((,class :inherit modus-themes-diff-added)))
+ `(ediff-current-diff-C ((,class :inherit modus-themes-diff-changed)))
+ `(ediff-even-diff-A ((,class :background ,bg-alt)))
+ `(ediff-even-diff-Ancestor ((,class :background ,bg-alt)))
+ `(ediff-even-diff-B ((,class :background ,bg-alt)))
+ `(ediff-even-diff-C ((,class :background ,bg-alt)))
+ `(ediff-fine-diff-A ((,class :inherit modus-themes-diff-refine-removed)))
+ `(ediff-fine-diff-Ancestor ((,class :inherit modus-themes-refine-cyan)))
+ `(ediff-fine-diff-B ((,class :inherit modus-themes-diff-refine-added)))
+ `(ediff-fine-diff-C ((,class :inherit modus-themes-diff-refine-changed)))
+ `(ediff-odd-diff-A ((,class :inherit ediff-even-diff-A)))
+ `(ediff-odd-diff-Ancestor ((,class :inherit ediff-even-diff-Ancestor)))
+ `(ediff-odd-diff-B ((,class :inherit ediff-even-diff-B)))
+ `(ediff-odd-diff-C ((,class :inherit ediff-even-diff-C)))
;;;;; eglot
- `(eglot-mode-line ((,class :inherit modus-theme-bold :foreground ,magenta-active)))
+ `(eglot-mode-line ((,class :inherit modus-themes-bold :foreground ,magenta-active)))
;;;;; el-search
`(el-search-highlight-in-prompt-face ((,class :inherit bold :foreground ,magenta-alt)))
- `(el-search-match ((,class :inherit modus-theme-intense-green)))
- `(el-search-other-match ((,class :inherit modus-theme-special-mild)))
- `(el-search-occur-match ((,class :inherit modus-theme-special-calm)))
+ `(el-search-match ((,class :inherit modus-themes-intense-green)))
+ `(el-search-other-match ((,class :inherit modus-themes-special-mild)))
+ `(el-search-occur-match ((,class :inherit modus-themes-special-calm)))
;;;;; eldoc
;; NOTE: see https://github.com/purcell/package-lint/issues/187
(list 'eldoc-highlight-function-argument `((,class :inherit bold :foreground ,blue-alt-other)))
`(elfeed-score-error-level-face ((,class :foreground ,red)))
`(elfeed-score-info-level-face ((,class :foreground ,cyan)))
`(elfeed-score-warn-level-face ((,class :foreground ,yellow)))
+;;;;; embark
+ `(embark-keybinding ((,class :inherit modus-themes-key-binding)))
;;;;; emms
`(emms-playlist-track-face ((,class :foreground ,blue)))
`(emms-playlist-selected-face ((,class :inherit bold :foreground ,magenta)))
-;;;;; enhanced-ruby-mode
- `(enh-ruby-heredoc-delimiter-face ((,class :foreground ,blue-alt-other)))
+;;;;; enh-ruby-mode (enhanced-ruby-mode)
+ `(enh-ruby-heredoc-delimiter-face ((,class :inherit font-lock-constant-face)))
`(enh-ruby-op-face ((,class :foreground ,fg-main)))
- `(enh-ruby-regexp-delimiter-face ((,class :foreground ,green)))
- `(enh-ruby-regexp-face ((,class :foreground ,magenta)))
- `(enh-ruby-string-delimiter-face ((,class :foreground ,blue-alt)))
- `(erm-syn-errline ((,class :foreground ,red :underline t)))
- `(erm-syn-warnline ((,class :foreground ,yellow :underline t)))
+ `(enh-ruby-regexp-delimiter-face ((,class :inherit font-lock-regexp-grouping-construct)))
+ `(enh-ruby-regexp-face ((,class :inherit font-lock-string-face)))
+ `(enh-ruby-string-delimiter-face ((,class :inherit font-lock-string-face)))
+ `(erm-syn-errline ((,class :inherit modus-themes-lang-error)))
+ `(erm-syn-warnline ((,class :inherit modus-themes-lang-warning)))
;;;;; epa
`(epa-field-body ((,class :foreground ,fg-main)))
`(epa-field-name ((,class :inherit bold :foreground ,fg-dim)))
`(erc-button ((,class :inherit button)))
`(erc-command-indicator-face ((,class :inherit bold :foreground ,cyan-alt)))
`(erc-current-nick-face ((,class :foreground ,magenta-alt-other)))
- `(erc-dangerous-host-face ((,class :inherit modus-theme-intense-red)))
+ `(erc-dangerous-host-face ((,class :inherit modus-themes-intense-red)))
`(erc-direct-msg-face ((,class :foreground ,magenta)))
`(erc-error-face ((,class :inherit bold :foreground ,red)))
`(erc-fool-face ((,class :foreground ,fg-inactive)))
`(erc-nick-prefix-face ((,class :inherit erc-nick-default-face)))
`(erc-notice-face ((,class :foreground ,fg-unfocused)))
`(erc-pal-face ((,class :inherit bold :foreground ,red-alt)))
- `(erc-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
+ `(erc-prompt-face ((,class :inherit comint-highlight-prompt)))
`(erc-timestamp-face ((,class :foreground ,blue-nuanced-fg)))
`(erc-underline-face ((,class :underline t)))
`(bg:erc-color-face0 ((,class :background "white")))
`(eros-result-overlay-face ((,class :box (:line-width -1 :color ,blue)
:background ,bg-dim :foreground ,fg-dim)))
;;;;; ert
- `(ert-test-result-expected ((,class :inherit modus-theme-intense-green)))
- `(ert-test-result-unexpected ((,class :inherit modus-theme-intense-red)))
+ `(ert-test-result-expected ((,class :inherit modus-themes-intense-green)))
+ `(ert-test-result-unexpected ((,class :inherit modus-themes-intense-red)))
;;;;; eshell
`(eshell-ls-archive ((,class :inherit bold :foreground ,cyan-alt)))
`(eshell-ls-backup ((,class :foreground ,yellow-alt)))
`(eshell-ls-clutter ((,class :foreground ,red-alt)))
`(eshell-ls-directory ((,class :inherit bold :foreground ,blue-alt)))
`(eshell-ls-executable ((,class :foreground ,magenta-alt)))
- `(eshell-ls-missing ((,class :inherit modus-theme-intense-red)))
+ `(eshell-ls-missing ((,class :inherit modus-themes-intense-red)))
`(eshell-ls-product ((,class :foreground ,fg-special-warm)))
`(eshell-ls-readonly ((,class :foreground ,fg-special-cold)))
`(eshell-ls-special ((,class :inherit bold :foreground ,magenta)))
,@(modus-themes--link-color
cyan cyan-faint))))
`(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground ,fg-inactive)))
- `(eshell-prompt ((,class :inherit modus-theme-bold
+ `(eshell-prompt ((,class :inherit modus-themes-bold
,@(modus-themes--prompt
green-alt-other
green-nuanced-bg green-alt
`(eshell-git-prompt-robyrussell-git-dirty-face ((,class :foreground ,yellow)))
`(eshell-git-prompt-robyrussell-git-face ((,class :foreground ,blue)))
;;;;; eshell-prompt-extras (epe)
- `(epe-dir-face ((,class :inherit modus-theme-bold :foreground ,blue)))
+ `(epe-dir-face ((,class :inherit modus-themes-bold :foreground ,blue)))
`(epe-git-dir-face ((,class :foreground ,red-alt-other)))
`(epe-git-face ((,class :foreground ,cyan-alt)))
`(epe-pipeline-delimiter-face ((,class :foreground ,green-alt)))
`(epe-pipeline-host-face ((,class :foreground ,blue)))
`(epe-pipeline-time-face ((,class :foreground ,fg-special-warm)))
`(epe-pipeline-user-face ((,class :foreground ,magenta)))
- `(epe-remote-face ((,class :inherit modus-theme-slant :foreground ,fg-alt)))
+ `(epe-remote-face ((,class :inherit modus-themes-slant :foreground ,fg-alt)))
`(epe-status-face ((,class :foreground ,magenta-alt-other)))
- `(epe-venv-face ((,class :inherit modus-theme-slant :foreground ,fg-alt)))
+ `(epe-venv-face ((,class :inherit modus-themes-slant :foreground ,fg-alt)))
;;;;; eshell-syntax-highlighting
`(eshell-syntax-highlighting-alias-face ((,class :foreground ,cyan)))
`(eshell-syntax-highlighting-comment-face ((,class :inherit shadow)))
;;;;; evil-mode
`(evil-ex-commands ((,class :foreground ,magenta-alt-other)))
`(evil-ex-info ((,class :foreground ,cyan-alt-other)))
- `(evil-ex-lazy-highlight ((,class :inherit modus-theme-refine-cyan)))
- `(evil-ex-search ((,class :inherit modus-theme-intense-green)))
- `(evil-ex-substitute-matches ((,class :inherit modus-theme-refine-yellow :underline t)))
- `(evil-ex-substitute-replacement ((,class :inherit (modus-theme-intense-green bold))))
+ `(evil-ex-lazy-highlight ((,class :inherit modus-themes-refine-cyan)))
+ `(evil-ex-search ((,class :inherit modus-themes-intense-green)))
+ `(evil-ex-substitute-matches ((,class :inherit modus-themes-refine-yellow :underline t)))
+ `(evil-ex-substitute-replacement ((,class :inherit (modus-themes-intense-green bold))))
;;;;; evil-goggles
- `(evil-goggles-change-face ((,class :inherit modus-theme-refine-yellow)))
- `(evil-goggles-commentary-face ((,class :inherit (modus-theme-subtle-neutral modus-theme-slant))))
- `(evil-goggles-default-face ((,class :inherit modus-theme-subtle-neutral)))
- `(evil-goggles-delete-face ((,class :inherit modus-theme-refine-red)))
+ `(evil-goggles-change-face ((,class :inherit modus-themes-refine-yellow)))
+ `(evil-goggles-commentary-face ((,class :inherit (modus-themes-subtle-neutral modus-themes-slant))))
+ `(evil-goggles-default-face ((,class :inherit modus-themes-subtle-neutral)))
+ `(evil-goggles-delete-face ((,class :inherit modus-themes-refine-red)))
`(evil-goggles-fill-and-move-face ((,class :inherit evil-goggles-default-face)))
`(evil-goggles-indent-face ((,class :inherit evil-goggles-default-face)))
- `(evil-goggles-join-face ((,class :inherit modus-theme-subtle-green)))
+ `(evil-goggles-join-face ((,class :inherit modus-themes-subtle-green)))
`(evil-goggles-nerd-commenter-face ((,class :inherit evil-goggles-commentary-face)))
- `(evil-goggles-paste-face ((,class :inherit modus-theme-subtle-cyan)))
- `(evil-goggles-record-macro-face ((,class :inherit modus-theme-special-cold)))
- `(evil-goggles-replace-with-register-face ((,class :inherit modus-theme-refine-magenta)))
- `(evil-goggles-set-marker-face ((,class :inherit modus-theme-intense-magenta)))
+ `(evil-goggles-paste-face ((,class :inherit modus-themes-subtle-cyan)))
+ `(evil-goggles-record-macro-face ((,class :inherit modus-themes-special-cold)))
+ `(evil-goggles-replace-with-register-face ((,class :inherit modus-themes-refine-magenta)))
+ `(evil-goggles-set-marker-face ((,class :inherit modus-themes-intense-magenta)))
`(evil-goggles-shift-face ((,class :inherit evil-goggles-default-face)))
`(evil-goggles-surround-face ((,class :inherit evil-goggles-default-face)))
- `(evil-goggles-yank-face ((,class :inherit modus-theme-subtle-blue)))
+ `(evil-goggles-yank-face ((,class :inherit modus-themes-subtle-blue)))
;;;;; evil-snipe
- `(evil-snipe-first-match-face ((,class :inherit (bold modus-theme-intense-blue))))
- `(evil-snipe-matches-face ((,class :inherit modus-theme-refine-magenta)))
+ `(evil-snipe-first-match-face ((,class :inherit (bold modus-themes-intense-blue))))
+ `(evil-snipe-matches-face ((,class :inherit modus-themes-refine-magenta)))
;;;;; evil-visual-mark-mode
- `(evil-visual-mark-face ((,class :inherit modus-theme-intense-magenta)))
+ `(evil-visual-mark-face ((,class :inherit modus-themes-intense-magenta)))
;;;;; eww
- `(eww-invalid-certificate ((,class :foreground ,red-active)))
- `(eww-valid-certificate ((,class :foreground ,green-active)))
- `(eww-form-checkbox ((,class :box (:line-width 1 :color ,fg-inactive :style released-button) :background ,bg-inactive :foreground ,fg-main)))
- `(eww-form-file ((,class :box (:line-width 1 :color ,fg-inactive :style released-button) :background ,bg-active :foreground ,fg-main)))
- `(eww-form-select ((,class :inherit eww-form-checkbox)))
- `(eww-form-submit ((,class :inherit eww-form-file)))
- `(eww-form-text ((,class :box (:line-width 1 :color ,fg-inactive :style none) :background ,bg-active :foreground ,fg-active)))
- `(eww-form-textarea ((,class :background ,bg-alt :foreground ,fg-main)))
+ `(eww-invalid-certificate ((,class :foreground ,red-faint)))
+ `(eww-valid-certificate ((,class :foreground ,blue-faint)))
+ `(eww-form-checkbox ((,class :inherit eww-form-text)))
+ `(eww-form-file ((,class :inherit eww-form-submit)))
+ `(eww-form-select ((,class :inherit eww-form-submit)))
+ `(eww-form-submit ((,class :box (:line-width 2 :style released-button)
+ :background ,bg-active)))
+ `(eww-form-text ((,class :box ,bg-active :background ,bg-alt)))
+ `(eww-form-textarea ((,class :background ,bg-alt)))
;;;;; eyebrowse
`(eyebrowse-mode-line-active ((,class :inherit bold :foreground ,blue-active)))
;;;;; fancy-dabbrev
`(fancy-dabbrev-menu-face ((,class :background ,bg-alt :foreground ,fg-alt)))
`(fancy-dabbrev-preview-face ((,class :inherit shadow :underline t)))
- `(fancy-dabbrev-selection-face ((,class :inherit (modus-theme-intense-cyan bold))))
+ `(fancy-dabbrev-selection-face ((,class :inherit (modus-themes-intense-cyan bold))))
;;;;; flycheck
- `(flycheck-error ((,class :inherit modus-theme-lang-error)))
+ `(flycheck-error ((,class :inherit modus-themes-lang-error)))
`(flycheck-error-list-checker-name ((,class :foreground ,magenta-active)))
`(flycheck-error-list-column-number ((,class :foreground ,fg-special-cold)))
- `(flycheck-error-list-error ((,class :inherit modus-theme-bold :foreground ,red)))
+ `(flycheck-error-list-error ((,class :inherit modus-themes-bold :foreground ,red)))
`(flycheck-error-list-filename ((,class :foreground ,blue)))
- `(flycheck-error-list-highlight ((,class :inherit modus-theme-hl-line)))
+ `(flycheck-error-list-highlight ((,class :inherit modus-themes-hl-line)))
`(flycheck-error-list-id ((,class :foreground ,magenta-alt-other)))
`(flycheck-error-list-id-with-explainer ((,class :inherit flycheck-error-list-id :box t)))
`(flycheck-error-list-info ((,class :foreground ,cyan)))
`(flycheck-error-list-line-number ((,class :foreground ,fg-special-warm)))
`(flycheck-error-list-warning ((,class :foreground ,yellow)))
- `(flycheck-fringe-error ((,class :inherit modus-theme-fringe-red)))
- `(flycheck-fringe-info ((,class :inherit modus-theme-fringe-cyan)))
- `(flycheck-fringe-warning ((,class :inherit modus-theme-fringe-yellow)))
- `(flycheck-info ((,class :inherit modus-theme-lang-note)))
+ `(flycheck-fringe-error ((,class :inherit modus-themes-fringe-red)))
+ `(flycheck-fringe-info ((,class :inherit modus-themes-fringe-cyan)))
+ `(flycheck-fringe-warning ((,class :inherit modus-themes-fringe-yellow)))
+ `(flycheck-info ((,class :inherit modus-themes-lang-note)))
`(flycheck-verify-select-checker ((,class :box (:line-width 1 :color nil :style released-button))))
- `(flycheck-warning ((,class :inherit modus-theme-lang-warning)))
+ `(flycheck-warning ((,class :inherit modus-themes-lang-warning)))
;;;;; flycheck-color-mode-line
`(flycheck-color-mode-line-error-face ((,class :inherit flycheck-fringe-error)))
`(flycheck-color-mode-line-info-face ((,class :inherit flycheck-fringe-info)))
`(flycheck-color-mode-line-running-face ((,class :inherit italic :foreground ,fg-inactive)))
`(flycheck-color-mode-line-info-face ((,class :inherit flycheck-fringe-warning)))
;;;;; flycheck-indicator
- `(flycheck-indicator-disabled ((,class :inherit modus-theme-slant :foreground ,fg-inactive)))
- `(flycheck-indicator-error ((,class :inherit modus-theme-bold :foreground ,red-active)))
- `(flycheck-indicator-info ((,class :inherit modus-theme-bold :foreground ,blue-active)))
- `(flycheck-indicator-running ((,class :inherit modus-theme-bold :foreground ,magenta-active)))
- `(flycheck-indicator-success ((,class :inherit modus-theme-bold :foreground ,green-active)))
- `(flycheck-indicator-warning ((,class :inherit modus-theme-bold :foreground ,yellow-active)))
+ `(flycheck-indicator-disabled ((,class :inherit modus-themes-slant :foreground ,fg-inactive)))
+ `(flycheck-indicator-error ((,class :inherit modus-themes-bold :foreground ,red-active)))
+ `(flycheck-indicator-info ((,class :inherit modus-themes-bold :foreground ,blue-active)))
+ `(flycheck-indicator-running ((,class :inherit modus-themes-bold :foreground ,magenta-active)))
+ `(flycheck-indicator-success ((,class :inherit modus-themes-bold :foreground ,green-active)))
+ `(flycheck-indicator-warning ((,class :inherit modus-themes-bold :foreground ,yellow-active)))
;;;;; flycheck-posframe
`(flycheck-posframe-background-face ((,class :background ,bg-alt)))
`(flycheck-posframe-border-face ((,class :inherit shadow)))
`(flycheck-posframe-error-face ((,class :inherit bold :foreground ,red)))
- `(flycheck-posframe-face ((,class :inherit modus-theme-slant :foreground ,fg-main)))
+ `(flycheck-posframe-face ((,class :inherit modus-themes-slant :foreground ,fg-main)))
`(flycheck-posframe-info-face ((,class :inherit bold :foreground ,cyan)))
`(flycheck-posframe-warning-face ((,class :inherit bold :foreground ,yellow)))
;;;;; flymake
- `(flymake-error ((,class :inherit modus-theme-lang-error)))
- `(flymake-note ((,class :inherit modus-theme-lang-note)))
- `(flymake-warning ((,class :inherit modus-theme-lang-warning)))
+ `(flymake-error ((,class :inherit modus-themes-lang-error)))
+ `(flymake-note ((,class :inherit modus-themes-lang-note)))
+ `(flymake-warning ((,class :inherit modus-themes-lang-warning)))
;;;;; flyspell
- `(flyspell-duplicate ((,class :inherit modus-theme-lang-warning)))
- `(flyspell-incorrect ((,class :inherit modus-theme-lang-error)))
+ `(flyspell-duplicate ((,class :inherit modus-themes-lang-warning)))
+ `(flyspell-incorrect ((,class :inherit modus-themes-lang-error)))
;;;;; flyspell-correct
- `(flyspell-correct-highlight-face ((,class :inherit modus-theme-refine-green)))
+ `(flyspell-correct-highlight-face ((,class :inherit modus-themes-refine-green)))
;;;;; flx
`(flx-highlight-face ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-magenta
- 'modus-theme-intense-magenta
- 'modus-theme-nuanced-magenta
+ 'modus-themes-subtle-magenta
+ 'modus-themes-intense-magenta
+ 'modus-themes-nuanced-magenta
magenta-alt
'bold))))
;;;;; freeze-it
`(freeze-it-show ((,class :background ,bg-dim :foreground ,fg-special-warm)))
;;;;; frog-menu
- `(frog-menu-action-keybinding-face ((,class :foreground ,blue-alt-other)))
+ `(frog-menu-action-keybinding-face ((,class :inherit modus-themes-key-binding)))
`(frog-menu-actions-face ((,class :foreground ,magenta)))
`(frog-menu-border ((,class :background ,bg-active)))
`(frog-menu-candidates-face ((,class :foreground ,fg-main)))
;;;;; focus
`(focus-unfocused ((,class :foreground ,fg-unfocused)))
;;;;; fold-this
- `(fold-this-overlay ((,class :inherit modus-theme-special-mild)))
+ `(fold-this-overlay ((,class :inherit modus-themes-special-mild)))
;;;;; font-lock
- `(font-lock-builtin-face ((,class :inherit modus-theme-bold
+ `(font-lock-builtin-face ((,class :inherit modus-themes-bold
,@(modus-themes--syntax-extra
magenta-alt magenta-alt-faint blue-alt))))
`(font-lock-comment-delimiter-face ((,class :inherit font-lock-comment-face)))
- `(font-lock-comment-face ((,class :inherit modus-theme-slant
+ `(font-lock-comment-face ((,class :inherit modus-themes-slant
,@(modus-themes--syntax-comment
fg-alt fg-comment-yellow))))
`(font-lock-constant-face ((,class ,@(modus-themes--syntax-extra
blue-alt-other blue-alt-other-faint magenta-alt-other))))
- `(font-lock-doc-face ((,class :inherit modus-theme-slant
+ `(font-lock-doc-face ((,class :inherit modus-themes-slant
,@(modus-themes--syntax-docstring
fg-docstring green-alt-other-faint
green-alt-other-faint magenta-nuanced-fg))))
`(font-lock-function-name-face ((,class ,@(modus-themes--syntax-extra
magenta magenta-faint magenta-alt))))
- `(font-lock-keyword-face ((,class :inherit modus-theme-bold
+ `(font-lock-keyword-face ((,class :inherit modus-themes-bold
,@(modus-themes--syntax-extra
magenta-alt-other magenta-alt-other-faint cyan-alt-other))))
- `(font-lock-negation-char-face ((,class :inherit modus-theme-bold
+ `(font-lock-negation-char-face ((,class :inherit modus-themes-bold
,@(modus-themes--syntax-foreground
yellow yellow-faint))))
`(font-lock-preprocessor-face ((,class ,@(modus-themes--syntax-foreground
red magenta-alt))))
`(font-lock-string-face ((,class ,@(modus-themes--syntax-string
blue-alt blue-alt-faint green green-alt))))
- `(font-lock-type-face ((,class :inherit modus-theme-bold
+ `(font-lock-type-face ((,class :inherit modus-themes-bold
,@(modus-themes--syntax-extra
cyan-alt-other cyan-alt-faint cyan-alt))))
`(font-lock-variable-name-face ((,class ,@(modus-themes--syntax-extra
cyan cyan-faint blue-alt-faint))))
- `(font-lock-warning-face ((,class :inherit modus-theme-bold
+ `(font-lock-warning-face ((,class :inherit modus-themes-bold
,@(modus-themes--syntax-foreground
yellow-active yellow-alt-faint))))
;;;;; forge
`(forge-topic-closed ((,class :inherit shadow)))
`(forge-topic-merged ((,class :inherit shadow)))
`(forge-topic-open ((,class :foreground ,fg-special-mild)))
- `(forge-topic-unmerged ((,class :inherit modus-theme-slant :foreground ,magenta)))
+ `(forge-topic-unmerged ((,class :inherit modus-themes-slant :foreground ,magenta)))
`(forge-topic-unread ((,class :inherit bold :foreground ,fg-main)))
;;;;; fountain-mode
`(fountain-character ((,class :foreground ,blue-alt-other)))
- `(fountain-comment ((,class :inherit modus-theme-slant :foreground ,fg-alt)))
+ `(fountain-comment ((,class :inherit modus-themes-slant :foreground ,fg-alt)))
`(fountain-dialog ((,class :foreground ,blue-alt)))
`(fountain-metadata-key ((,class :foreground ,green-alt-other)))
`(fountain-metadata-value ((,class :foreground ,blue)))
`(fountain-non-printing ((,class :inherit shadow)))
- `(fountain-note ((,class :inherit modus-theme-slant :foreground ,yellow)))
+ `(fountain-note ((,class :inherit modus-themes-slant :foreground ,yellow)))
`(fountain-page-break ((,class :inherit bold :foreground ,red-alt)))
`(fountain-page-number ((,class :inherit bold :foreground ,red-alt-other)))
`(fountain-paren ((,class :foreground ,cyan)))
`(fountain-scene-heading ((,class :inherit bold :foreground ,blue-nuanced-fg)))
- `(fountain-section-heading ((,class :inherit modus-theme-heading-1)))
- `(fountain-section-heading-1 ((,class :inherit modus-theme-heading-1)))
- `(fountain-section-heading-2 ((,class :inherit modus-theme-heading-2)))
- `(fountain-section-heading-3 ((,class :inherit modus-theme-heading-3)))
- `(fountain-section-heading-4 ((,class :inherit modus-theme-heading-4)))
- `(fountain-section-heading-5 ((,class :inherit modus-theme-heading-5)))
+ `(fountain-section-heading ((,class :inherit modus-themes-heading-1)))
+ `(fountain-section-heading-1 ((,class :inherit modus-themes-heading-1)))
+ `(fountain-section-heading-2 ((,class :inherit modus-themes-heading-2)))
+ `(fountain-section-heading-3 ((,class :inherit modus-themes-heading-3)))
+ `(fountain-section-heading-4 ((,class :inherit modus-themes-heading-4)))
+ `(fountain-section-heading-5 ((,class :inherit modus-themes-heading-5)))
`(fountain-synopsis ((,class :foreground ,cyan-alt)))
`(fountain-trans ((,class :foreground ,yellow-alt-other)))
;;;;; geiser
`(geiser-font-lock-xref-link ((,class :inherit button)))
;;;;; git-commit
`(git-commit-comment-action ((,class :inherit font-lock-comment-face)))
- `(git-commit-comment-branch-local ((,class :inherit modus-theme-slant :foreground ,blue-alt)))
- `(git-commit-comment-branch-remote ((,class :inherit modus-theme-slant :foreground ,magenta-alt)))
- `(git-commit-comment-detached ((,class :inherit modus-theme-slant :foreground ,cyan-alt)))
- `(git-commit-comment-file ((,class :inherit modus-theme-slant
+ `(git-commit-comment-branch-local ((,class :inherit modus-themes-slant :foreground ,blue-alt)))
+ `(git-commit-comment-branch-remote ((,class :inherit modus-themes-slant :foreground ,magenta-alt)))
+ `(git-commit-comment-detached ((,class :inherit modus-themes-slant :foreground ,cyan-alt)))
+ `(git-commit-comment-file ((,class :inherit modus-themes-slant
,@(modus-themes--syntax-comment
fg-special-cold red-nuanced-fg))))
- `(git-commit-comment-heading ((,class :inherit (bold modus-theme-slant)
+ `(git-commit-comment-heading ((,class :inherit (bold modus-themes-slant)
,@(modus-themes--syntax-comment
fg-dim fg-special-warm))))
`(git-commit-keyword ((,class :foreground ,magenta)))
`(git-commit-known-pseudo-header ((,class :foreground ,cyan-alt-other)))
- `(git-commit-nonempty-second-line ((,class :inherit modus-theme-refine-yellow)))
- `(git-commit-overlong-summary ((,class :inherit modus-theme-refine-yellow)))
+ `(git-commit-nonempty-second-line ((,class :inherit modus-themes-refine-yellow)))
+ `(git-commit-overlong-summary ((,class :inherit modus-themes-refine-yellow)))
`(git-commit-pseudo-header ((,class :foreground ,blue)))
`(git-commit-summary ((,class :inherit bold :foreground ,cyan)))
;;;;; git-gutter
- `(git-gutter:added ((,class :inherit modus-theme-fringe-green)))
- `(git-gutter:deleted ((,class :inherit modus-theme-fringe-red)))
- `(git-gutter:modified ((,class :inherit modus-theme-fringe-yellow)))
- `(git-gutter:separator ((,class :inherit modus-theme-fringe-cyan)))
- `(git-gutter:unchanged ((,class :inherit modus-theme-fringe-magenta)))
+ `(git-gutter:added ((,class :inherit modus-themes-fringe-green)))
+ `(git-gutter:deleted ((,class :inherit modus-themes-fringe-red)))
+ `(git-gutter:modified ((,class :inherit modus-themes-fringe-yellow)))
+ `(git-gutter:separator ((,class :inherit modus-themes-fringe-cyan)))
+ `(git-gutter:unchanged ((,class :inherit modus-themes-fringe-magenta)))
;;;;; git-gutter-fr
- `(git-gutter-fr:added ((,class :inherit modus-theme-fringe-green)))
- `(git-gutter-fr:deleted ((,class :inherit modus-theme-fringe-red)))
- `(git-gutter-fr:modified ((,class :inherit modus-theme-fringe-yellow)))
+ `(git-gutter-fr:added ((,class :inherit modus-themes-fringe-green)))
+ `(git-gutter-fr:deleted ((,class :inherit modus-themes-fringe-red)))
+ `(git-gutter-fr:modified ((,class :inherit modus-themes-fringe-yellow)))
;;;;; git-{gutter,fringe}+
- `(git-gutter+-added ((,class :inherit modus-theme-fringe-green)))
- `(git-gutter+-deleted ((,class :inherit modus-theme-fringe-red)))
- `(git-gutter+-modified ((,class :inherit modus-theme-fringe-yellow)))
- `(git-gutter+-separator ((,class :inherit modus-theme-fringe-cyan)))
- `(git-gutter+-unchanged ((,class :inherit modus-theme-fringe-magenta)))
- `(git-gutter-fr+-added ((,class :inherit modus-theme-fringe-green)))
- `(git-gutter-fr+-deleted ((,class :inherit modus-theme-fringe-red)))
- `(git-gutter-fr+-modified ((,class :inherit modus-theme-fringe-yellow)))
+ `(git-gutter+-added ((,class :inherit modus-themes-fringe-green)))
+ `(git-gutter+-deleted ((,class :inherit modus-themes-fringe-red)))
+ `(git-gutter+-modified ((,class :inherit modus-themes-fringe-yellow)))
+ `(git-gutter+-separator ((,class :inherit modus-themes-fringe-cyan)))
+ `(git-gutter+-unchanged ((,class :inherit modus-themes-fringe-magenta)))
+ `(git-gutter-fr+-added ((,class :inherit modus-themes-fringe-green)))
+ `(git-gutter-fr+-deleted ((,class :inherit modus-themes-fringe-red)))
+ `(git-gutter-fr+-modified ((,class :inherit modus-themes-fringe-yellow)))
;;;;; git-lens
`(git-lens-added ((,class :inherit bold :foreground ,green)))
`(git-lens-deleted ((,class :inherit bold :foreground ,red)))
`(git-lens-modified ((,class :inherit bold :foreground ,yellow)))
`(git-lens-renamed ((,class :inherit bold :foreground ,magenta)))
;;;;; git-rebase
- `(git-rebase-comment-hash ((,class :inherit modus-theme-slant
+ `(git-rebase-comment-hash ((,class :inherit modus-themes-slant
,@(modus-themes--syntax-comment
fg-special-cold red-nuanced-fg))))
- `(git-rebase-comment-heading ((,class :inherit (bold modus-theme-slant)
+ `(git-rebase-comment-heading ((,class :inherit (bold modus-themes-slant)
,@(modus-themes--syntax-comment
fg-dim fg-special-warm))))
`(git-rebase-description ((,class :foreground ,fg-main)))
`(gnus-cite-attribution ((,class :inherit italic :foreground ,fg-main)))
`(gnus-emphasis-bold ((,class :inherit bold)))
`(gnus-emphasis-bold-italic ((,class :inherit bold-italic)))
- `(gnus-emphasis-highlight-words ((,class :inherit modus-theme-refine-yellow)))
+ `(gnus-emphasis-highlight-words ((,class :inherit modus-themes-refine-yellow)))
`(gnus-emphasis-italic ((,class :inherit italic)))
`(gnus-emphasis-underline-bold ((,class :inherit gnus-emphasis-bold :underline t)))
`(gnus-emphasis-underline-bold-italic ((,class :inherit gnus-emphasis-bold-italic :underline t)))
`(gnus-server-agent ((,class :inherit bold :foreground ,cyan)))
`(gnus-server-closed ((,class :inherit bold :foreground ,magenta)))
`(gnus-server-cloud ((,class :inherit bold :foreground ,cyan-alt)))
- `(gnus-server-cloud-host ((,class :inherit modus-theme-refine-cyan)))
+ `(gnus-server-cloud-host ((,class :inherit modus-themes-refine-cyan)))
`(gnus-server-denied ((,class :inherit bold :foreground ,red)))
`(gnus-server-offline ((,class :inherit bold :foreground ,yellow)))
`(gnus-server-opened ((,class :inherit bold :foreground ,green)))
`(gnus-signature ((,class :inherit italic :foreground ,fg-special-cold)))
`(gnus-splash ((,class :inherit shadow)))
- `(gnus-summary-cancelled ((,class :inherit modus-theme-mark-alt)))
+ `(gnus-summary-cancelled ((,class :inherit modus-themes-mark-alt :extend t)))
`(gnus-summary-high-ancient ((,class :inherit bold :foreground ,fg-alt)))
`(gnus-summary-high-read ((,class :inherit bold :foreground ,fg-special-cold)))
`(gnus-summary-high-ticked ((,class :inherit bold :foreground ,red-alt-other)))
`(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other)))
`(gnus-summary-normal-undownloaded ((,class :foreground ,yellow)))
`(gnus-summary-normal-unread ((,class :foreground ,fg-main)))
- `(gnus-summary-selected ((,class :inherit modus-theme-subtle-blue)))
+ `(gnus-summary-selected ((,class :inherit modus-themes-subtle-blue :extend t)))
;;;;; golden-ratio-scroll-screen
`(golden-ratio-scroll-highlight-line-face ((,class :background ,cyan-subtle-bg :foreground ,fg-main)))
;;;;; helm
- `(helm-M-x-key ((,class :inherit bold :foreground ,magenta-alt-other)))
+ `(helm-M-x-key ((,class :inherit modus-themes-key-binding)))
`(helm-action ((,class :underline t)))
`(helm-bookmark-addressbook ((,class :foreground ,green-alt)))
`(helm-bookmark-directory ((,class :inherit bold :foreground ,blue)))
`(helm-etags-file ((,class :foreground ,fg-dim :underline t)))
`(helm-ff-backup-file ((,class :inherit shadow)))
`(helm-ff-denied ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-red
- 'modus-theme-intense-red
- 'modus-theme-nuanced-red
+ 'modus-themes-subtle-red
+ 'modus-themes-intense-red
+ 'modus-themes-nuanced-red
red))))
`(helm-ff-directory ((,class :inherit helm-buffer-directory)))
`(helm-ff-dirs ((,class :inherit bold :foreground ,blue-alt-other)))
,@(modus-themes--link-color
red red-faint))))
`(helm-ff-pipe ((,class ,@(modus-themes--extra-completions
- 'modus-theme-refine-magenta
- 'modus-theme-subtle-magenta
- 'modus-theme-nuanced-magenta
+ 'modus-themes-refine-magenta
+ 'modus-themes-subtle-magenta
+ 'modus-themes-nuanced-magenta
magenta))))
`(helm-ff-prefix ((,class ,@(modus-themes--extra-completions
- 'modus-theme-refine-yellow
- 'modus-theme-subtle-yellow
- 'modus-theme-nuanced-yellow
+ 'modus-themes-refine-yellow
+ 'modus-themes-subtle-yellow
+ 'modus-themes-nuanced-yellow
yellow-alt-other))))
`(helm-ff-socket ((,class :foreground ,red-alt-other)))
`(helm-ff-suid ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-red
- 'modus-theme-refine-red
- 'modus-theme-nuanced-yellow
+ 'modus-themes-subtle-red
+ 'modus-themes-refine-red
+ 'modus-themes-nuanced-yellow
red-alt))))
`(helm-ff-symlink ((,class :inherit button
,@(modus-themes--link-color
`(helm-grep-file ((,class :inherit bold :foreground ,fg-special-cold)))
`(helm-grep-finish ((,class :foreground ,green-active)))
`(helm-grep-lineno ((,class :foreground ,fg-special-warm)))
- `(helm-grep-match ((,class :inherit modus-theme-special-calm)))
+ `(helm-grep-match ((,class :inherit modus-themes-special-calm)))
`(helm-header ((,class :inherit bold :foreground ,fg-special-cold)))
`(helm-header-line-left-margin ((,class :inherit bold :foreground ,yellow-intense)))
`(helm-history-deleted ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-red
- 'modus-theme-intense-red
- 'modus-theme-nuanced-red
+ 'modus-themes-subtle-red
+ 'modus-themes-intense-red
+ 'modus-themes-nuanced-red
red
'bold))))
`(helm-history-remote ((,class :foreground ,red-alt-other)))
`(helm-lisp-completion-info ((,class :foreground ,fg-special-warm)))
`(helm-lisp-show-completion ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-yellow
- 'modus-theme-refine-yellow
- 'modus-theme-nuanced-yellow
+ 'modus-themes-subtle-yellow
+ 'modus-themes-refine-yellow
+ 'modus-themes-nuanced-yellow
yellow
'bold))))
`(helm-locate-finish ((,class :foreground ,green-active)))
`(helm-match ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-cyan
- 'modus-theme-refine-cyan
- 'modus-theme-nuanced-cyan
+ 'modus-themes-subtle-cyan
+ 'modus-themes-refine-cyan
+ 'modus-themes-nuanced-cyan
cyan
'bold))))
`(helm-match-item ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-neutral
- 'modus-theme-subtle-cyan
- 'modus-theme-nuanced-cyan
+ 'modus-themes-subtle-neutral
+ 'modus-themes-subtle-cyan
+ 'modus-themes-nuanced-cyan
cyan-alt-other))))
`(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt)))
`(helm-moccur-buffer ((,class :inherit button
,@(modus-themes--link-color
cyan-alt-other cyan-alt-other-faint))))
`(helm-mode-prefix ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-magenta
- 'modus-theme-intense-magenta
- 'modus-theme-nuanced-magenta
+ 'modus-themes-subtle-magenta
+ 'modus-themes-intense-magenta
+ 'modus-themes-nuanced-magenta
magenta-alt
'bold))))
`(helm-non-file-buffer ((,class :inherit shadow)))
`(helm-prefarg ((,class :foreground ,red-active)))
`(helm-resume-need-update ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-magenta
- 'modus-theme-refine-magenta
- 'modus-theme-nuanced-magenta
+ 'modus-themes-subtle-magenta
+ 'modus-themes-refine-magenta
+ 'modus-themes-nuanced-magenta
magenta-alt-other))))
`(helm-selection ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-blue
- 'modus-theme-refine-blue
- 'modus-theme-special-cold
+ 'modus-themes-subtle-blue
+ 'modus-themes-refine-blue
+ 'modus-themes-special-cold
nil
'bold))))
- `(helm-selection-line ((,class :inherit modus-theme-special-cold)))
+ `(helm-selection-line ((,class :inherit modus-themes-special-cold)))
`(helm-separator ((,class :foreground ,fg-special-mild)))
`(helm-time-zone-current ((,class :foreground ,green)))
`(helm-time-zone-home ((,class :foreground ,magenta)))
,@(modus-themes--scale modus-themes-scale-4))))
`(helm-top-columns ((,class :inherit helm-header)))
`(helm-ucs-char ((,class :foreground ,yellow-alt-other)))
- `(helm-visible-mark ((,class :inherit modus-theme-subtle-cyan)))
+ `(helm-visible-mark ((,class :inherit modus-themes-subtle-cyan)))
;;;;; helm-ls-git
`(helm-ls-git-added-copied-face ((,class :foreground ,green-intense)))
`(helm-ls-git-added-modified-face ((,class :foreground ,yellow-intense)))
`(helm-ls-git-untracked-face ((,class :foreground ,fg-special-cold)))
;;;;; helm-switch-shell
`(helm-switch-shell-new-shell-face ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-magenta
- 'modus-theme-refine-magenta
- 'modus-theme-nuanced-magenta
+ 'modus-themes-subtle-magenta
+ 'modus-themes-refine-magenta
+ 'modus-themes-nuanced-magenta
magenta-alt-other
'bold))))
;;;;; helm-xref
`(helm-xref-file-name ((,class :inherit bold :foreground ,fg-special-cold)))
`(helm-xref-file-name ((,class :foreground ,fg-special-warm)))
;;;;; helpful
- `(helpful-heading ((,class :inherit modus-theme-heading-1)))
+ `(helpful-heading ((,class :inherit modus-themes-heading-1)))
;;;;; highlight region or ad-hoc regexp
`(hi-aquamarine ((,class :background ,cyan-subtle-bg :foreground ,fg-main)))
`(hi-black-b ((,class :inherit bold :background ,fg-main :foreground ,bg-main)))
`(hi-red-b ((,class :inherit bold :background ,red-intense-bg :foreground ,fg-main)))
`(hi-salmon ((,class :background ,red-subtle-bg :foreground ,fg-main)))
`(hi-yellow ((,class :background ,yellow-subtle-bg :foreground ,fg-main)))
- `(highlight ((,class :inherit modus-theme-subtle-blue)))
- `(highlight-changes ((,class :foreground ,yellow-alt-other)))
- `(highlight-changes-delete ((,class :foreground ,red-alt-other :underline t)))
- `(hl-line ((,class :inherit modus-theme-hl-line)))
+ `(highlight ((,class :inherit modus-themes-subtle-blue)))
+ `(highlight-changes ((,class :foreground ,red-alt :underline nil)))
+ `(highlight-changes-delete ((,class :background ,red-nuanced-bg
+ :foreground ,red :underline t)))
+ `(hl-line ((,class :inherit modus-themes-hl-line)))
;;;;; highlight-blocks
`(highlight-blocks-depth-1-face ((,class :background ,bg-dim :foreground ,fg-main)))
`(highlight-blocks-depth-2-face ((,class :background ,bg-alt :foreground ,fg-main)))
`(hes-escape-backslash-face ((,class :inherit bold :foreground ,fg-escape-char-construct)))
`(hes-escape-sequence-face ((,class :inherit bold :foreground ,fg-escape-char-backslash)))
;;;;; highlight-indentation
- `(highlight-indentation-face ((,class :inherit modus-theme-hl-line)))
+ `(highlight-indentation-face ((,class :inherit modus-themes-hl-line)))
`(highlight-indentation-current-column-face ((,class :background ,bg-active)))
;;;;; highlight-numbers
`(highlight-numbers-number ((,class :foreground ,blue-alt-other)))
;;;;; highlight-symbol
- `(highlight-symbol-face ((,class :inherit modus-theme-special-mild)))
+ `(highlight-symbol-face ((,class :inherit modus-themes-special-mild)))
;;;;; highlight-thing
`(highlight-thing ((,class :background ,bg-alt :foreground ,cyan)))
;;;;; hl-defined
;;;;; hl-fill-column
`(hl-fill-column-face ((,class :background ,bg-active :foreground ,fg-active)))
;;;;; hl-todo
- `(hl-todo ((,class :inherit (bold modus-theme-slant) :foreground ,red-alt-other)))
+ `(hl-todo ((,class :inherit (bold modus-themes-slant) :foreground ,red-alt-other)))
;;;;; hydra
`(hydra-face-amaranth ((,class :inherit bold :foreground ,yellow)))
`(hydra-face-blue ((,class :inherit bold :foreground ,blue-alt)))
magenta bg-alt
bg-active fg-main))))
`(ido-incomplete-regexp ((,class :inherit error)))
- `(ido-indicator ((,class :inherit modus-theme-subtle-yellow)))
+ `(ido-indicator ((,class :inherit modus-themes-subtle-yellow)))
`(ido-only-match ((,class :inherit bold
,@(modus-themes--standard-completions
green green-nuanced-bg
`(ido-subdir ((,class :foreground ,blue)))
`(ido-virtual ((,class :foreground ,fg-special-warm)))
;;;;; iedit
- `(iedit-occurrence ((,class :inherit modus-theme-refine-blue)))
- `(iedit-read-only-occurrence ((,class :inherit modus-theme-intense-yellow)))
+ `(iedit-occurrence ((,class :inherit modus-themes-refine-blue)))
+ `(iedit-read-only-occurrence ((,class :inherit modus-themes-intense-yellow)))
;;;;; iflipb
`(iflipb-current-buffer-face ((,class :inherit bold :foreground ,cyan-alt)))
`(iflipb-other-buffer-face ((,class :inherit shadow)))
;;;;; indium
`(indium-breakpoint-face ((,class :foreground ,red-active)))
`(indium-frame-url-face ((,class :inherit button :foreground ,fg-alt)))
- `(indium-keyword-face ((,class :foreground ,magenta-alt-other)))
- `(indium-litable-face ((,class :inherit modus-theme-slant :foreground ,fg-special-warm)))
- `(indium-repl-error-face ((,class :inherit bold :foreground ,red)))
- `(indium-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
+ `(indium-keyword-face ((,class :inherit font-lock-keyword-face)))
+ `(indium-litable-face ((,class :inherit modus-themes-slant :foreground ,fg-special-warm)))
+ `(indium-repl-error-face ((,class :inherit error)))
+ `(indium-repl-prompt-face ((,class :inherit comint-highlight-prompt)))
`(indium-repl-stdout-face ((,class :foreground ,fg-main)))
;;;;; info
`(Info-quoted ((,class ,@(modus-themes--mixed-fonts) ; the capitalization is canonical
`(info-header-node ((,class :inherit bold :foreground ,fg-alt)))
`(info-header-xref ((,class :foreground ,blue-active)))
`(info-index-match ((,class :inherit match)))
- `(info-menu-header ((,class :inherit modus-theme-heading-3)))
+ `(info-menu-header ((,class :inherit modus-themes-heading-3)))
`(info-menu-star ((,class :foreground ,red)))
`(info-node ((,class :inherit bold)))
- `(info-title-1 ((,class :inherit modus-theme-heading-1)))
- `(info-title-2 ((,class :inherit modus-theme-heading-2)))
- `(info-title-3 ((,class :inherit modus-theme-heading-3)))
- `(info-title-4 ((,class :inherit modus-theme-heading-4)))
+ `(info-title-1 ((,class :inherit modus-themes-heading-1)))
+ `(info-title-2 ((,class :inherit modus-themes-heading-2)))
+ `(info-title-3 ((,class :inherit modus-themes-heading-3)))
+ `(info-title-4 ((,class :inherit modus-themes-heading-4)))
;;;;; info-colors
`(info-colors-lisp-code-block ((,class :inherit fixed-pitch)))
- `(info-colors-ref-item-command ((,class :foreground ,magenta)))
+ `(info-colors-ref-item-command ((,class :inherit font-lock-function-name-face)))
`(info-colors-ref-item-constant ((,class :inherit font-lock-constant-face)))
`(info-colors-ref-item-function ((,class :inherit font-lock-function-name-face)))
`(info-colors-ref-item-macro ((,class :inherit font-lock-keyword-face)))
;;;;; ioccur
`(ioccur-cursor ((,class :foreground ,fg-main)))
`(ioccur-invalid-regexp ((,class :foreground ,red)))
- `(ioccur-match-face ((,class :inherit modus-theme-special-calm)))
- `(ioccur-match-overlay-face ((,class :inherit modus-theme-special-cold :extend t)))
+ `(ioccur-match-face ((,class :inherit modus-themes-special-calm)))
+ `(ioccur-match-overlay-face ((,class :inherit modus-themes-special-cold :extend t)))
`(ioccur-num-line-face ((,class :foreground ,fg-special-warm)))
- `(ioccur-overlay-face ((,class :inherit modus-theme-refine-blue :extend t)))
- `(ioccur-regexp-face ((,class :inherit (modus-theme-intense-magenta bold))))
+ `(ioccur-overlay-face ((,class :inherit modus-themes-refine-blue :extend t)))
+ `(ioccur-regexp-face ((,class :inherit (modus-themes-intense-magenta bold))))
`(ioccur-title-face ((,class :inherit bold :foreground ,red-alt
,@(modus-themes--scale modus-themes-scale-4))))
;;;;; isearch, occur, and the like
- `(isearch ((,class :inherit (modus-theme-intense-green bold))))
- `(isearch-fail ((,class :inherit modus-theme-refine-red)))
- `(isearch-group-1 ((,class :inherit modus-theme-intense-blue)))
- `(isearch-group-2 ((,class :inherit modus-theme-intense-magenta)))
- `(lazy-highlight ((,class :inherit modus-theme-refine-cyan)))
- `(match ((,class :inherit modus-theme-special-calm)))
- `(query-replace ((,class :inherit (modus-theme-intense-yellow bold))))
+ `(isearch ((,class :inherit (modus-themes-intense-green bold))))
+ `(isearch-fail ((,class :inherit modus-themes-refine-red)))
+ `(isearch-group-1 ((,class :inherit modus-themes-intense-blue)))
+ `(isearch-group-2 ((,class :inherit modus-themes-intense-magenta)))
+ `(lazy-highlight ((,class :inherit modus-themes-refine-cyan)))
+ `(match ((,class :inherit modus-themes-special-calm)))
+ `(query-replace ((,class :inherit (modus-themes-intense-yellow bold))))
;;;;; isl (isearch-light)
- `(isl-line ((,class :inherit modus-theme-subtle-green)))
- `(isl-match ((,class :inherit modus-theme-refine-cyan)))
- `(isl-number ((,class :inherit modus-theme-bold :foreground ,green-active)))
- `(isl-on ((,class :inherit (bold modus-theme-intense-green))))
- `(isl-string ((,class :inherit modus-theme-bold :foreground ,cyan-active)))
+ `(isl-line ((,class :inherit modus-themes-subtle-green)))
+ `(isl-match ((,class :inherit modus-themes-refine-cyan)))
+ `(isl-number ((,class :inherit modus-themes-bold :foreground ,green-active)))
+ `(isl-on ((,class :inherit (bold modus-themes-intense-green))))
+ `(isl-string ((,class :inherit modus-themes-bold :foreground ,cyan-active)))
;;;;; ivy
`(ivy-action ((,class :inherit bold :foreground ,red-alt)))
`(ivy-completions-annotations ((,class :inherit completions-annotations)))
`(ivy-confirm-face ((,class :foreground ,cyan)))
`(ivy-current-match ((,class ,@(modus-themes--extra-completions
- 'modus-theme-refine-cyan
- 'modus-theme-intense-cyan
- 'modus-theme-special-cold
+ 'modus-themes-refine-cyan
+ 'modus-themes-intense-cyan
+ 'modus-themes-special-cold
nil
'bold))))
`(ivy-cursor ((,class :background ,fg-main :foreground ,bg-main)))
`(ivy-highlight-face ((,class :foreground ,magenta)))
`(ivy-match-required-face ((,class :inherit error)))
`(ivy-minibuffer-match-face-1 ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-neutral
- 'modus-theme-intense-neutral
- 'modus-theme-nuanced-cyan
+ 'modus-themes-subtle-neutral
+ 'modus-themes-intense-neutral
+ 'modus-themes-nuanced-cyan
fg-alt))))
`(ivy-minibuffer-match-face-2 ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-green
- 'modus-theme-refine-green
- 'modus-theme-nuanced-green
+ 'modus-themes-subtle-green
+ 'modus-themes-refine-green
+ 'modus-themes-nuanced-green
green-alt-other
'bold))))
`(ivy-minibuffer-match-face-3 ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-blue
- 'modus-theme-refine-blue
- 'modus-theme-nuanced-blue
+ 'modus-themes-subtle-blue
+ 'modus-themes-refine-blue
+ 'modus-themes-nuanced-blue
blue-alt-other
'bold))))
`(ivy-minibuffer-match-face-4 ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-magenta
- 'modus-theme-refine-magenta
- 'modus-theme-nuanced-magenta
+ 'modus-themes-subtle-magenta
+ 'modus-themes-refine-magenta
+ 'modus-themes-nuanced-magenta
magenta-alt-other
'bold))))
`(ivy-minibuffer-match-highlight ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-cyan
- 'modus-theme-intense-cyan
- 'modus-theme-nuanced-cyan
+ 'modus-themes-subtle-cyan
+ 'modus-themes-intense-cyan
+ 'modus-themes-nuanced-cyan
cyan-alt-other
'bold))))
- `(ivy-modified-buffer ((,class :inherit modus-theme-slant :foreground ,yellow)))
- `(ivy-modified-outside-buffer ((,class :inherit modus-theme-slant :foreground ,yellow-alt)))
+ `(ivy-modified-buffer ((,class :inherit modus-themes-slant :foreground ,yellow)))
+ `(ivy-modified-outside-buffer ((,class :inherit modus-themes-slant :foreground ,yellow-alt)))
`(ivy-org ((,class :foreground ,cyan-alt-other)))
`(ivy-prompt-match ((,class :inherit ivy-current-match)))
`(ivy-remote ((,class :foreground ,magenta)))
`(ivy-subdir ((,class :foreground ,blue-alt-other)))
`(ivy-virtual ((,class :foreground ,magenta-alt-other)))
`(ivy-yanked-word ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-blue
- 'modus-theme-refine-blue
- 'modus-theme-nuanced-blue
+ 'modus-themes-subtle-blue
+ 'modus-themes-refine-blue
+ 'modus-themes-nuanced-blue
blue-alt))))
;;;;; ivy-posframe
`(ivy-posframe ((,class :background ,bg-dim :foreground ,fg-main)))
;;;;; jira (org-jira)
`(jiralib-comment-face ((,class :background ,bg-alt)))
`(jiralib-comment-header-face ((,class :inherit bold)))
- `(jiralib-issue-info-face ((,class :inherit modus-theme-special-warm)))
- `(jiralib-issue-info-header-face ((,class :inherit (modus-theme-special-warm bold))))
+ `(jiralib-issue-info-face ((,class :inherit modus-themes-special-warm)))
+ `(jiralib-issue-info-header-face ((,class :inherit (modus-themes-special-warm bold))))
`(jiralib-issue-summary-face ((,class :inherit bold)))
`(jiralib-link-filter-face ((,class :underline t)))
`(jiralib-link-issue-face ((,class :underline t)))
`(jiralib-link-project-face ((,class :underline t)))
;;;;; journalctl-mode
- `(journalctl-error-face ((,class :inherit bold :foreground ,red)))
- `(journalctl-finished-face ((,class :inherit bold :foreground ,green)))
+ `(journalctl-error-face ((,class :inherit error)))
+ `(journalctl-finished-face ((,class :inherit success)))
`(journalctl-host-face ((,class :foreground ,blue)))
`(journalctl-process-face ((,class :foreground ,cyan-alt-other)))
`(journalctl-starting-face ((,class :foreground ,green)))
`(journalctl-timestamp-face ((,class :foreground ,fg-special-cold)))
- `(journalctl-warning-face ((,class :inherit bold :foreground ,yellow)))
+ `(journalctl-warning-face ((,class :inherit warning)))
;;;;; js2-mode
- `(js2-error ((,class :foreground ,red)))
- `(js2-external-variable ((,class :foreground ,cyan-alt-other)))
- `(js2-function-call ((,class :foreground ,magenta)))
- `(js2-function-param ((,class :foreground ,blue)))
- `(js2-instance-member ((,class :foreground ,magenta-alt-other)))
+ `(js2-error ((,class :inherit modus-themes-lang-error)))
+ `(js2-external-variable ((,class :inherit font-lock-variable-name-face)))
+ `(js2-function-call ((,class :inherit font-lock-function-name-face)))
+ `(js2-function-param ((,class :inherit font-lock-constant-face)))
+ `(js2-instance-member ((,class :inherit font-lock-keyword-face)))
`(js2-jsdoc-html-tag-delimiter ((,class :foreground ,fg-main)))
- `(js2-jsdoc-html-tag-name ((,class :foreground ,cyan)))
- `(js2-jsdoc-tag ((,class :foreground ,fg-special-calm)))
- `(js2-jsdoc-type ((,class :foreground ,fg-special-cold)))
- `(js2-jsdoc-value ((,class :foreground ,fg-special-warm)))
+ `(js2-jsdoc-html-tag-name ((,class :inherit font-lock-function-name-face)))
+ `(js2-jsdoc-tag ((,class :inherit (font-lock-builtin-face font-lock-comment-face) :weight normal)))
+ `(js2-jsdoc-type ((,class :inherit (font-lock-type-face font-lock-comment-face) :weight normal)))
+ `(js2-jsdoc-value ((,class :inherit (font-lock-constant-face font-lock-comment-face) :weight normal)))
`(js2-object-property ((,class :foreground ,fg-main)))
`(js2-object-property-access ((,class :foreground ,fg-main)))
- `(js2-private-function-call ((,class :foreground ,green-alt-other)))
- `(js2-private-member ((,class :foreground ,fg-special-mild)))
- `(js2-warning ((,class :foreground ,yellow-alt :underline t)))
+ `(js2-private-function-call ((,class :inherit font-lock-preprocessor-face)))
+ `(js2-private-member ((,class :inherit font-lock-warning-face)))
+ `(js2-warning ((,class :inherit modus-themes-lang-warning)))
;;;;; julia
- `(julia-macro-face ((,class :inherit modus-theme-bold :foreground ,magenta)))
- `(julia-quoted-symbol-face ((,class :foreground ,blue-alt-other)))
+ `(julia-macro-face ((,class :inherit font-lock-builtin-face)))
+ `(julia-quoted-symbol-face ((,class :inherit font-lock-constant-face)))
;;;;; jupyter
`(jupyter-eval-overlay ((,class :inherit bold :foreground ,blue)))
`(jupyter-repl-input-prompt ((,class :foreground ,cyan-alt-other)))
`(jupyter-repl-output-prompt ((,class :foreground ,magenta-alt-other)))
- `(jupyter-repl-traceback ((,class :inherit modus-theme-intense-red)))
+ `(jupyter-repl-traceback ((,class :inherit modus-themes-intense-red)))
;;;;; kaocha-runner
`(kaocha-runner-error-face ((,class :foreground ,red)))
`(kaocha-runner-success-face ((,class :foreground ,green)))
`(kaocha-runner-warning-face ((,class :foreground ,yellow)))
;;;;; keycast
`(keycast-command ((,class :inherit bold :foreground ,blue-active)))
- `(keycast-key ((,class ,@(modus-themes--mode-line-attrs
- bg-main blue-active
- bg-main blue-active
- blue-active blue-intense
- 'alt-style -3))))
+ `(keycast-key ((,class :background ,blue-active :foreground ,bg-main)))
;;;;; line numbers (display-line-numbers-mode and global variant)
`(line-number
((,class :inherit default
fg-alt bg-inactive
fg-inactive))))
;;;;; lsp-mode
- `(lsp-face-highlight-read ((,class :inherit modus-theme-subtle-blue :underline t)))
- `(lsp-face-highlight-textual ((,class :inherit modus-theme-subtle-blue)))
- `(lsp-face-highlight-write ((,class :inherit (modus-theme-refine-blue bold))))
+ `(lsp-face-highlight-read ((,class :inherit modus-themes-subtle-blue :underline t)))
+ `(lsp-face-highlight-textual ((,class :inherit modus-themes-subtle-blue)))
+ `(lsp-face-highlight-write ((,class :inherit (modus-themes-refine-blue bold))))
`(lsp-face-semhl-constant ((,class :foreground ,blue-alt-other)))
- `(lsp-face-semhl-deprecated
- ((,(append '((supports :underline (:style wave))) class)
- :foreground ,yellow :underline (:style wave))
- (,class :foreground ,yellow :underline t)))
+ `(lsp-face-semhl-deprecated ((,class :inherit modus-themes-lang-warning)))
`(lsp-face-semhl-enummember ((,class :foreground ,blue-alt-other)))
`(lsp-face-semhl-field ((,class :foreground ,cyan-alt)))
- `(lsp-face-semhl-field-static ((,class :inherit modus-theme-slant :foreground ,cyan-alt)))
+ `(lsp-face-semhl-field-static ((,class :inherit modus-themes-slant :foreground ,cyan-alt)))
`(lsp-face-semhl-function ((,class :foreground ,magenta)))
`(lsp-face-semhl-method ((,class :foreground ,magenta)))
- `(lsp-face-semhl-namespace ((,class :inherit modus-theme-bold :foreground ,magenta-alt)))
+ `(lsp-face-semhl-namespace ((,class :inherit modus-themes-bold :foreground ,magenta-alt)))
`(lsp-face-semhl-preprocessor ((,class :foreground ,red-alt-other)))
- `(lsp-face-semhl-static-method ((,class :inherit modus-theme-slant :foreground ,magenta)))
+ `(lsp-face-semhl-static-method ((,class :inherit modus-themes-slant :foreground ,magenta)))
`(lsp-face-semhl-type-class ((,class :foreground ,magenta-alt)))
`(lsp-face-semhl-type-enum ((,class :foreground ,magenta-alt)))
- `(lsp-face-semhl-type-primitive ((,class :inherit modus-theme-slant :foreground ,magenta-alt)))
- `(lsp-face-semhl-type-template ((,class :inherit modus-theme-slant :foreground ,magenta-alt)))
- `(lsp-face-semhl-type-typedef ((,class :inherit modus-theme-slant :foreground ,magenta-alt)))
+ `(lsp-face-semhl-type-primitive ((,class :inherit modus-themes-slant :foreground ,magenta-alt)))
+ `(lsp-face-semhl-type-template ((,class :inherit modus-themes-slant :foreground ,magenta-alt)))
+ `(lsp-face-semhl-type-typedef ((,class :inherit modus-themes-slant :foreground ,magenta-alt)))
`(lsp-face-semhl-variable ((,class :foreground ,cyan)))
`(lsp-face-semhl-variable-local ((,class :foreground ,cyan)))
`(lsp-face-semhl-variable-parameter ((,class :foreground ,cyan-alt-other)))
`(lsp-ui-peek-filename ((,class :foreground ,fg-special-warm)))
`(lsp-ui-peek-footer ((,class :background ,bg-header :foreground ,fg-header)))
`(lsp-ui-peek-header ((,class :background ,bg-header :foreground ,fg-header)))
- `(lsp-ui-peek-highlight ((,class :inherit modus-theme-subtle-blue)))
+ `(lsp-ui-peek-highlight ((,class :inherit modus-themes-subtle-blue)))
`(lsp-ui-peek-line-number ((,class :inherit shadow)))
`(lsp-ui-peek-list ((,class :background ,bg-dim)))
`(lsp-ui-peek-peek ((,class :background ,bg-alt)))
- `(lsp-ui-peek-selection ((,class :inherit modus-theme-subtle-cyan)))
+ `(lsp-ui-peek-selection ((,class :inherit modus-themes-subtle-cyan)))
`(lsp-ui-sideline-code-action ((,class :foreground ,yellow)))
`(lsp-ui-sideline-current-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-main)))
`(lsp-ui-sideline-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-alt)))
`(magit-bisect-good ((,class :foreground ,green-alt-other)))
`(magit-bisect-skip ((,class :foreground ,yellow-alt-other)))
`(magit-blame-date ((,class :foreground ,blue)))
- `(magit-blame-dimmed ((,class :inherit shadow)))
+ `(magit-blame-dimmed ((,class :inherit (shadow modus-themes-reset-hard))))
`(magit-blame-hash ((,class :foreground ,fg-special-warm)))
- `(magit-blame-heading ((,class :background ,bg-alt)))
- `(magit-blame-highlight ((,class :inherit modus-theme-nuanced-cyan)))
- `(magit-blame-margin ((,class :inherit magit-blame-highlight)))
+ `(magit-blame-heading ((,class :inherit modus-themes-reset-hard :background ,bg-alt :extend t)))
+ `(magit-blame-highlight ((,class :inherit modus-themes-nuanced-cyan)))
+ `(magit-blame-margin ((,class :inherit (magit-blame-highlight modus-themes-reset-hard))))
`(magit-blame-name ((,class :foreground ,magenta-alt-other)))
`(magit-blame-summary ((,class :foreground ,cyan-alt-other)))
`(magit-branch-current ((,class :foreground ,blue-alt-other :box t)))
`(magit-cherry-equivalent ((,class :background ,bg-main :foreground ,magenta-intense)))
`(magit-cherry-unmatched ((,class :background ,bg-main :foreground ,cyan-intense)))
;; NOTE: here we break from the pattern of inheriting from the
- ;; modus-theme-diff-* faces, though only for the standard actions,
+ ;; modus-themes-diff-* faces, though only for the standard actions,
;; not the highlighted ones. This is because Magit's interaction
;; model relies on highlighting the current diff hunk.
`(magit-diff-added ((,class ,@(modus-themes--diff
bg-diff-added fg-diff-added
green-nuanced-bg fg-diff-added
bg-diff-added-deuteran fg-diff-added-deuteran))))
- `(magit-diff-added-highlight ((,class :inherit modus-theme-diff-focus-added)))
+ `(magit-diff-added-highlight ((,class :inherit modus-themes-diff-focus-added)))
`(magit-diff-base ((,class ,@(modus-themes--diff
bg-main yellow
bg-diff-changed fg-diff-changed
yellow-nuanced-bg fg-diff-changed))))
- `(magit-diff-base-highlight ((,class :inherit modus-theme-diff-focus-changed)))
+ `(magit-diff-base-highlight ((,class :inherit modus-themes-diff-focus-changed)))
`(magit-diff-context ((,class :foreground ,fg-unfocused)))
`(magit-diff-context-highlight ((,class ,@(modus-themes--diff
bg-dim fg-dim
bg-inactive fg-inactive
bg-dim fg-alt))))
`(magit-diff-file-heading ((,class :inherit bold :foreground ,fg-special-cold)))
- `(magit-diff-file-heading-highlight ((,class :inherit (modus-theme-special-cold bold))))
- `(magit-diff-file-heading-selection ((,class :inherit modus-theme-refine-cyan)))
+ `(magit-diff-file-heading-highlight ((,class :inherit (modus-themes-special-cold bold))))
+ `(magit-diff-file-heading-selection ((,class :inherit modus-themes-refine-cyan)))
;; NOTE: here we break from the pattern of inheriting from the
- ;; modus-theme-diff-* faces.
+ ;; modus-themes-diff-* faces.
`(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active
:foreground ,fg-inactive)))
`(magit-diff-hunk-heading-highlight
((,class :inherit bold
:background ,@(modus-themes--diff-deuteran bg-region bg-diff-heading)
:foreground ,@(modus-themes--diff-deuteran fg-main fg-diff-heading))))
- `(magit-diff-hunk-heading-selection ((,class :inherit modus-theme-refine-blue)))
+ `(magit-diff-hunk-heading-selection ((,class :inherit modus-themes-refine-blue)))
`(magit-diff-hunk-region ((,class :inherit bold)))
`(magit-diff-lines-boundary ((,class :background ,fg-main)))
- `(magit-diff-lines-heading ((,class :inherit modus-theme-refine-magenta)))
+ `(magit-diff-lines-heading ((,class :inherit modus-themes-refine-magenta)))
`(magit-diff-removed ((,class ,@(modus-themes--diff
bg-main red
bg-diff-removed fg-diff-removed
red-nuanced-bg fg-diff-removed))))
- `(magit-diff-removed-highlight ((,class :inherit modus-theme-diff-focus-removed)))
+ `(magit-diff-removed-highlight ((,class :inherit modus-themes-diff-focus-removed)))
`(magit-diffstat-added ((,class :foreground ,@(modus-themes--diff-deuteran blue green))))
`(magit-diffstat-removed ((,class :foreground ,red)))
`(magit-dimmed ((,class :foreground ,fg-unfocused)))
`(magit-hash ((,class :inherit shadow)))
`(magit-head ((,class :inherit magit-branch-local)))
`(magit-header-line ((,class :inherit bold :foreground ,magenta-active)))
- `(magit-header-line-key ((,class :inherit bold :foreground ,blue-active)))
+ `(magit-header-line-key ((,class :inherit modus-themes-key-binding)))
`(magit-header-line-log-select ((,class :inherit bold :foreground ,fg-main)))
`(magit-keyword ((,class :foreground ,magenta)))
`(magit-keyword-squash ((,class :inherit bold :foreground ,yellow-alt-other)))
`(magit-refname-wip ((,class :inherit shadow)))
`(magit-section ((,class :background ,bg-dim :foreground ,fg-main)))
`(magit-section-heading ((,class :inherit bold :foreground ,cyan)))
- `(magit-section-heading-selection ((,class :inherit (modus-theme-refine-cyan bold))))
+ `(magit-section-heading-selection ((,class :inherit (modus-themes-refine-cyan bold))))
`(magit-section-highlight ((,class :background ,bg-alt)))
`(magit-sequence-done ((,class :foreground ,green-alt)))
`(magit-sequence-drop ((,class :foreground ,red-alt)))
`(makefile-space ((,class :background ,magenta-nuanced-bg)))
;;;;; man
`(Man-overstrike ((,class :inherit bold :foreground ,magenta)))
- `(Man-reverse ((,class :inherit modus-theme-subtle-magenta)))
+ `(Man-reverse ((,class :inherit modus-themes-subtle-magenta)))
`(Man-underline ((,class :foreground ,cyan :underline t)))
;;;;; marginalia
`(marginalia-archive ((,class :foreground ,green-nuanced-fg)))
`(marginalia-date ((,class :foreground ,blue-nuanced-fg)))
`(marginalia-char ((,class :foreground ,red-active)))
- `(marginalia-documentation ((,class :foreground ,fg-special-cold :inherit modus-theme-slant)))
+ `(marginalia-documentation ((,class :foreground ,fg-special-cold :inherit modus-themes-slant)))
`(marginalia-file-modes ((,class :inherit shadow)))
`(marginalia-file-name ((,class :foreground ,fg-special-mild)))
`(marginalia-file-owner ((,class :foreground ,red-nuanced-fg)))
+ ;; Here we make an exception of not applying the bespoke
+ ;; `modus-themes-key-binding' for two reasons: (1) completion
+ ;; highlights can be fairly intense, so we do not want more
+ ;; components to compete with them for attention, (2) the
+ ;; `marginalia-key' may not be used for key bindings specifically,
+ ;; so we might end up applying styles in places we should not.
`(marginalia-key ((,class :foreground ,magenta-active)))
`(marginalia-mode ((,class :foreground ,cyan-active)))
`(marginalia-modified ((,class :foreground ,yellow-active)))
`(marginalia-variable ((,class :foreground ,yellow-nuanced-fg)))
`(marginalia-version ((,class :foreground ,cyan-active)))
;;;;; markdown-mode
- `(markdown-blockquote-face ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
+ `(markdown-blockquote-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold)))
`(markdown-bold-face ((,class :inherit bold)))
`(markdown-code-face ((,class ,@(modus-themes--mixed-fonts) :background ,bg-dim :extend t)))
`(markdown-comment-face ((,class :inherit font-lock-comment-face)))
`(markdown-footnote-marker-face ((,class :inherit bold :foreground ,cyan-alt)))
- `(markdown-footnote-text-face ((,class :inherit modus-theme-slant :foreground ,fg-main)))
+ `(markdown-footnote-text-face ((,class :inherit modus-themes-slant :foreground ,fg-main)))
`(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other)))
- `(markdown-header-delimiter-face ((,class :inherit modus-theme-bold :foreground ,fg-dim)))
+ `(markdown-header-delimiter-face ((,class :inherit modus-themes-bold :foreground ,fg-dim)))
`(markdown-header-face ((t nil)))
- `(markdown-header-face-1 ((,class :inherit modus-theme-heading-1)))
- `(markdown-header-face-2 ((,class :inherit modus-theme-heading-2)))
- `(markdown-header-face-3 ((,class :inherit modus-theme-heading-3)))
- `(markdown-header-face-4 ((,class :inherit modus-theme-heading-4)))
- `(markdown-header-face-5 ((,class :inherit modus-theme-heading-5)))
- `(markdown-header-face-6 ((,class :inherit modus-theme-heading-6)))
+ `(markdown-header-face-1 ((,class :inherit modus-themes-heading-1)))
+ `(markdown-header-face-2 ((,class :inherit modus-themes-heading-2)))
+ `(markdown-header-face-3 ((,class :inherit modus-themes-heading-3)))
+ `(markdown-header-face-4 ((,class :inherit modus-themes-heading-4)))
+ `(markdown-header-face-5 ((,class :inherit modus-themes-heading-5)))
+ `(markdown-header-face-6 ((,class :inherit modus-themes-heading-6)))
`(markdown-header-rule-face ((,class :inherit bold :foreground ,fg-special-warm)))
`(markdown-hr-face ((,class :inherit bold :foreground ,fg-special-warm)))
`(markdown-html-attr-name-face ((,class ,@(modus-themes--mixed-fonts)
`(markdown-language-keyword-face ((,class ,@(modus-themes--mixed-fonts)
:background ,bg-alt
:foreground ,fg-alt)))
- `(markdown-line-break-face ((,class :inherit modus-theme-refine-cyan :underline t)))
+ `(markdown-line-break-face ((,class :inherit modus-themes-refine-cyan :underline t)))
`(markdown-link-face ((,class :inherit button)))
- `(markdown-link-title-face ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
+ `(markdown-link-title-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold)))
`(markdown-list-face ((,class :foreground ,fg-dim)))
`(markdown-markup-face ((,class :inherit shadow)))
`(markdown-math-face ((,class :foreground ,magenta-alt-other)))
`(markup-command-face ((,class :foreground ,fg-inactive)))
`(markup-comment-face ((,class :inherit font-lock-comment-face)))
`(markup-complex-replacement-face ((,class :box (:line-width 2 :color nil :style released-button)
- :inherit modus-theme-refine-magenta)))
+ :inherit modus-themes-refine-magenta)))
`(markup-emphasis-face ((,class :inherit italic :foreground ,fg-special-cold)))
`(markup-error-face ((,class :inherit bold :foreground ,red)))
`(markup-gen-face ((,class :foreground ,magenta-alt)))
`(markup-internal-reference-face ((,class :inherit button :foreground ,fg-alt)))
`(markup-italic-face ((,class :inherit italic :foreground ,fg-special-cold)))
- `(markup-list-face ((,class :inherit modus-theme-special-calm)))
+ `(markup-list-face ((,class :inherit modus-themes-special-calm)))
`(markup-meta-face ((,class :foreground ,fg-inactive)))
`(markup-meta-hide-face ((,class :inherit shadow)))
`(markup-passthrough-face ((,class :inherit fixed-pitch :foreground ,cyan)))
`(markup-strong-face ((,class :inherit bold :foreground ,red-nuanced-fg)))
`(markup-subscript-face ((,class :height 0.8 :foreground ,fg-special-cold)))
`(markup-superscript-face ((,class :height 0.8 :foreground ,fg-special-cold)))
- `(markup-table-cell-face ((,class :inherit modus-theme-special-cold)))
- `(markup-table-face ((,class :inherit modus-theme-subtle-cyan)))
- `(markup-table-row-face ((,class :inherit modus-theme-subtle-cyan)))
+ `(markup-table-cell-face ((,class :inherit modus-themes-special-cold)))
+ `(markup-table-face ((,class :inherit modus-themes-subtle-cyan)))
+ `(markup-table-row-face ((,class :inherit modus-themes-subtle-cyan)))
`(markup-title-0-face ((,class :height 3.0 :foreground ,blue-nuanced-fg)))
`(markup-title-1-face ((,class :height 2.4 :foreground ,blue-nuanced-fg)))
`(markup-title-2-face ((,class :height 1.8 :foreground ,blue-nuanced-fg)))
`(markup-title-4-face ((,class :height 1.2 :foreground ,blue-nuanced-fg)))
`(markup-title-5-face ((,class :height 1.2 :foreground ,blue-nuanced-fg :underline t)))
`(markup-value-face ((,class :foreground ,fg-inactive)))
- `(markup-verbatim-face ((,class :inherit modus-theme-special-mild)))
+ `(markup-verbatim-face ((,class :inherit modus-themes-special-mild)))
;;;;; mentor
`(mentor-download-message ((,class :foreground ,fg-special-warm)))
`(mentor-download-name ((,class :foreground ,fg-special-cold)))
`(mentor-download-speed-down ((,class :foreground ,cyan-alt)))
`(mentor-download-speed-up ((,class :foreground ,red-alt)))
`(mentor-download-state ((,class :foreground ,yellow-alt)))
- `(mentor-highlight-face ((,class :inherit modus-theme-subtle-blue)))
+ `(mentor-highlight-face ((,class :inherit modus-themes-subtle-blue)))
`(mentor-tracker-name ((,class :foreground ,magenta-alt)))
;;;;; messages
`(message-cited-text-1 ((,class :foreground ,blue-faint)))
`(message-header-to ((,class :inherit bold :foreground ,magenta-alt-other)))
`(message-header-xheader ((,class :foreground ,blue-alt)))
`(message-mml ((,class :foreground ,yellow)))
- `(message-separator ((,class :inherit modus-theme-intense-neutral)))
+ `(message-separator ((,class :inherit modus-themes-intense-neutral)))
;;;;; minibuffer-line
`(minibuffer-line ((,class :foreground ,fg-main)))
;;;;; minimap
;;;;; modeline
`(mode-line ((,class ,@(modus-themes--variable-pitch-ui)
,@(modus-themes--mode-line-attrs
- fg-active bg-active fg-dim bg-active
- fg-alt bg-active 'alt-style nil bg-main))))
+ fg-active bg-active
+ fg-dim bg-active
+ fg-main bg-active-accent
+ fg-alt bg-active
+ 'alt-style nil bg-main))))
`(mode-line-buffer-id ((,class :inherit bold)))
`(mode-line-emphasis ((,class :inherit bold :foreground ,blue-active)))
- `(mode-line-highlight ((,class :inherit modus-theme-active-blue :box (:line-width -1 :style pressed-button))))
+ `(mode-line-highlight ((,class :inherit modus-themes-active-blue :box (:line-width -1 :style pressed-button))))
`(mode-line-inactive ((,class ,@(modus-themes--variable-pitch-ui)
,@(modus-themes--mode-line-attrs
- fg-inactive bg-inactive fg-alt bg-dim
+ fg-inactive bg-inactive
+ fg-alt bg-dim
+ fg-inactive bg-inactive
bg-region bg-active))))
;;;;; mood-line
`(mood-line-modified ((,class :foreground ,magenta-active)))
`(mu4e-cited-6-face ((,class :foreground ,magenta)))
`(mu4e-cited-7-face ((,class :foreground ,green-alt)))
`(mu4e-compose-header-face ((,class :inherit mu4e-compose-separator-face)))
- `(mu4e-compose-separator-face ((,class :inherit modus-theme-intense-neutral)))
+ `(mu4e-compose-separator-face ((,class :inherit modus-themes-intense-neutral)))
`(mu4e-contact-face ((,class :inherit message-header-to)))
`(mu4e-context-face ((,class :foreground ,blue-active)))
`(mu4e-draft-face ((,class :foreground ,magenta-alt)))
`(mu4e-flagged-face ((,class :foreground ,red-alt)))
- `(mu4e-footer-face ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
+ `(mu4e-footer-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold)))
`(mu4e-forwarded-face ((,class :foreground ,magenta-alt-other)))
`(mu4e-header-face ((,class :inherit shadow)))
- `(mu4e-header-highlight-face ((,class :inherit modus-theme-hl-line)))
+ `(mu4e-header-highlight-face ((,class :inherit modus-themes-hl-line)))
`(mu4e-header-key-face ((,class :inherit message-header-name)))
`(mu4e-header-marks-face ((,class :inherit mu4e-special-header-value-face)))
`(mu4e-header-title-face ((,class :foreground ,fg-special-mild)))
`(mu4e-header-value-face ((,class :inherit message-header-other)))
- `(mu4e-highlight-face ((,class :inherit bold :foreground ,blue-alt-other)))
+ `(mu4e-highlight-face ((,class :inherit modus-themes-key-binding)))
`(mu4e-link-face ((,class :inherit button)))
`(mu4e-modeline-face ((,class :foreground ,magenta-active)))
- `(mu4e-moved-face ((,class :inherit modus-theme-slant :foreground ,yellow)))
+ `(mu4e-moved-face ((,class :inherit modus-themes-slant :foreground ,yellow)))
`(mu4e-ok-face ((,class :inherit bold :foreground ,green)))
- `(mu4e-region-code ((,class :inherit modus-theme-special-calm)))
+ `(mu4e-region-code ((,class :inherit modus-themes-special-calm)))
`(mu4e-replied-face ((,class :foreground ,blue)))
`(mu4e-special-header-value-face ((,class :inherit message-header-subject)))
- `(mu4e-system-face ((,class :inherit modus-theme-slant :foreground ,fg-mark-del)))
+ `(mu4e-system-face ((,class :inherit modus-themes-slant :foreground ,fg-mark-del)))
`(mu4e-title-face ((,class :foreground ,fg-main)))
`(mu4e-trashed-face ((,class :foreground ,red)))
`(mu4e-unread-face ((,class :inherit bold)))
`(mu4e-view-body-face ((,class :foreground ,fg-main)))
`(mu4e-warning-face ((,class :inherit warning)))
;;;;; mu4e-conversation
- `(mu4e-conversation-header ((,class :inherit modus-theme-special-cold)))
+ `(mu4e-conversation-header ((,class :inherit modus-themes-special-cold)))
`(mu4e-conversation-sender-1 ((,class :foreground ,fg-special-warm)))
`(mu4e-conversation-sender-2 ((,class :foreground ,fg-special-cold)))
`(mu4e-conversation-sender-3 ((,class :foreground ,fg-special-mild)))
`(neo-vc-needs-merge-face ((,class :foreground ,magenta-alt)))
`(neo-vc-needs-update-face ((,class :underline t)))
`(neo-vc-removed-face ((,class :strike-through t)))
- `(neo-vc-unlocked-changes-face ((,class :inherit modus-theme-refine-blue)))
+ `(neo-vc-unlocked-changes-face ((,class :inherit modus-themes-refine-blue)))
`(neo-vc-up-to-date-face ((,class :inherit shadow)))
`(neo-vc-user-face ((,class :foreground ,magenta)))
;;;;; no-emoji
`(no-emoji ((,class :foreground ,cyan)))
;;;;; notmuch
- `(notmuch-crypto-decryption ((,class :inherit modus-theme-refine-magenta)))
+ `(notmuch-crypto-decryption ((,class :inherit modus-themes-special-mild)))
`(notmuch-crypto-part-header ((,class :foreground ,magenta-alt-other)))
- `(notmuch-crypto-signature-bad ((,class :inherit modus-theme-intense-red)))
- `(notmuch-crypto-signature-good ((,class :inherit modus-theme-refine-green)))
- `(notmuch-crypto-signature-good-key ((,class :inherit modus-theme-refine-yellow)))
- `(notmuch-crypto-signature-unknown ((,class :inherit modus-theme-refine-red)))
+ `(notmuch-crypto-signature-bad ((,class :inherit modus-themes-intense-red)))
+ `(notmuch-crypto-signature-good ((,class :inherit modus-themes-refine-blue)))
+ `(notmuch-crypto-signature-good-key ((,class :inherit modus-themes-refine-cyan)))
+ `(notmuch-crypto-signature-unknown ((,class :inherit modus-themes-refine-red)))
`(notmuch-hello-logo-background ((,class :background "gray50")))
- `(notmuch-message-summary-face ((,class :inherit modus-theme-nuanced-cyan)))
+ `(notmuch-message-summary-face ((,class :inherit modus-themes-nuanced-cyan)))
`(notmuch-search-count ((,class :inherit shadow)))
`(notmuch-search-date ((,class :foreground ,cyan)))
`(notmuch-search-flagged-face ((,class :foreground ,red-alt)))
`(notmuch-search-non-matching-authors ((,class :inherit shadow)))
`(notmuch-search-subject ((,class :foreground ,fg-dim)))
`(notmuch-search-unread-face ((,class :inherit bold)))
- `(notmuch-tag-added
- ((,(append '((supports :underline (:style wave))) class)
- :underline (:color ,green :style wave))
- (,class :foreground ,green :underline t)))
- `(notmuch-tag-deleted
- ((,(append '((supports :underline (:style wave))) class)
- :underline (:color ,red :style wave))
- (,class :foreground ,red :underline t)))
+ `(notmuch-tag-added ((,class :inherit modus-themes-lang-note)))
+ `(notmuch-tag-deleted ((,class :inherit modus-themes-lang-error)))
`(notmuch-tag-face ((,class :inherit bold :foreground ,blue-alt)))
`(notmuch-tag-flagged ((,class :foreground ,red-alt)))
`(notmuch-tag-unread ((,class :foreground ,magenta-alt)))
`(nxml-cdata-section-CDATA ((,class :inherit error)))
`(nxml-cdata-section-delimiter ((,class :inherit error)))
`(nxml-char-ref-delimiter ((,class :foreground ,fg-special-mild)))
- `(nxml-char-ref-number ((,class :inherit modus-theme-bold :foreground ,fg-special-mild)))
- `(nxml-delimited-data ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
+ `(nxml-char-ref-number ((,class :inherit modus-themes-bold :foreground ,fg-special-mild)))
+ `(nxml-delimited-data ((,class :inherit modus-themes-slant :foreground ,fg-special-cold)))
`(nxml-delimiter ((,class :foreground ,fg-dim)))
`(nxml-element-colon ((,class :foreground ,fg-main)))
`(nxml-element-local-name ((,class :inherit font-lock-function-name-face)))
`(nxml-element-prefix ((,class :inherit font-lock-builtin-face)))
`(nxml-entity-ref-delimiter ((,class :foreground ,fg-special-mild)))
- `(nxml-entity-ref-name ((,class :inherit modus-theme-bold :foreground ,fg-special-mild)))
- `(nxml-glyph ((,class :inherit modus-theme-intense-neutral)))
+ `(nxml-entity-ref-name ((,class :inherit modus-themes-bold :foreground ,fg-special-mild)))
+ `(nxml-glyph ((,class :inherit modus-themes-intense-neutral)))
`(nxml-hash ((,class :inherit (bold font-lock-string-face))))
`(nxml-heading ((,class :inherit bold)))
`(nxml-name ((,class :inherit font-lock-builtin-face)))
`(nxml-namespace-attribute-prefix ((,class :inherit font-lock-variable-name-face)))
`(nxml-processing-instruction-target ((,class :inherit font-lock-keyword-face)))
`(nxml-prolog-keyword ((,class :inherit font-lock-keyword-face)))
- `(nxml-ref ((,class :inherit modus-theme-bold :foreground ,fg-special-mild)))
+ `(nxml-ref ((,class :inherit modus-themes-bold :foreground ,fg-special-mild)))
`(rng-error ((,class :inherit error)))
;;;;; objed
- `(objed-hl ((,class :background ,(if modus-themes-intense-hl-line
- bg-hl-alt-intense bg-hl-alt))))
+ `(objed-hl ((,class :background ,(if modus-themes-hl-line bg-hl-alt-intense bg-hl-alt))))
`(objed-mark ((,class :background ,bg-active)))
`(objed-mode-line ((,class :foreground ,cyan-active)))
;;;;; orderless
;;;;; org
`(org-agenda-calendar-event ((,class :foreground ,fg-main)))
`(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
- `(org-agenda-clocking ((,class :inherit modus-theme-special-cold :extend t)))
+ `(org-agenda-clocking ((,class :inherit modus-themes-special-cold :extend t)))
`(org-agenda-column-dateline ((,class :background ,bg-alt)))
`(org-agenda-current-time ((,class :inherit bold :foreground ,blue-alt-other)))
`(org-agenda-date ((,class :foreground ,cyan)))
:background ,bg-inactive :foreground ,fg-active)))
`(org-checkbox-statistics-done ((,class :inherit org-done)))
`(org-checkbox-statistics-todo ((,class :inherit org-todo)))
- `(org-clock-overlay ((,class :inherit modus-theme-special-cold)))
+ `(org-clock-overlay ((,class :inherit modus-themes-special-cold)))
`(org-code ((,class ,@(modus-themes--mixed-fonts)
- :background ,red-nuanced-bg :foreground ,magenta)))
+ :background ,magenta-nuanced-bg :foreground ,magenta-nuanced-fg)))
`(org-column ((,class :background ,bg-alt)))
`(org-column-title ((,class :inherit bold :underline t :background ,bg-alt)))
`(org-date ((,class :inherit ,(if modus-themes-no-mixed-fonts
,@(modus-themes--link-color
cyan cyan-faint))))
`(org-date-selected ((,class :inherit bold :foreground ,blue-alt :inverse-video t)))
- `(org-dispatcher-highlight ((,class :inherit (bold modus-theme-mark-alt))))
+ `(org-dispatcher-highlight ((,class :inherit (bold modus-themes-mark-alt))))
`(org-document-info ((,class :foreground ,fg-special-cold)))
`(org-document-info-keyword ((,class ,@(modus-themes--mixed-fonts)
:foreground ,fg-alt)))
- `(org-document-title ((,class :inherit (bold modus-theme-variable-pitch) :foreground ,fg-special-cold
+ `(org-document-title ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,fg-special-cold
,@(modus-themes--scale modus-themes-scale-5))))
`(org-done ((,class :foreground ,green)))
`(org-drawer ((,class ,@(modus-themes--mixed-fonts)
green-graph-1-bg
green-graph-0-bg
green-graph-1-bg))))
- `(org-headline-done ((,class :inherit modus-theme-variable-pitch :foreground ,green-nuanced-fg)))
- `(org-headline-todo ((,class :inherit modus-theme-variable-pitch :foreground ,red-nuanced-fg)))
+ `(org-headline-done ((,class :inherit modus-themes-variable-pitch :foreground ,green-nuanced-fg)))
+ `(org-headline-todo ((,class :inherit modus-themes-variable-pitch :foreground ,red-nuanced-fg)))
`(org-hide ((,class :foreground ,bg-main)))
`(org-indent ((,class :inherit (fixed-pitch org-hide))))
`(org-latex-and-related ((,class :foreground ,magenta-refine-fg)))
- `(org-level-1 ((,class :inherit modus-theme-heading-1)))
- `(org-level-2 ((,class :inherit modus-theme-heading-2)))
- `(org-level-3 ((,class :inherit modus-theme-heading-3)))
- `(org-level-4 ((,class :inherit modus-theme-heading-4)))
- `(org-level-5 ((,class :inherit modus-theme-heading-5)))
- `(org-level-6 ((,class :inherit modus-theme-heading-6)))
- `(org-level-7 ((,class :inherit modus-theme-heading-7)))
- `(org-level-8 ((,class :inherit modus-theme-heading-8)))
+ `(org-level-1 ((,class :inherit modus-themes-heading-1)))
+ `(org-level-2 ((,class :inherit modus-themes-heading-2)))
+ `(org-level-3 ((,class :inherit modus-themes-heading-3)))
+ `(org-level-4 ((,class :inherit modus-themes-heading-4)))
+ `(org-level-5 ((,class :inherit modus-themes-heading-5)))
+ `(org-level-6 ((,class :inherit modus-themes-heading-6)))
+ `(org-level-7 ((,class :inherit modus-themes-heading-7)))
+ `(org-level-8 ((,class :inherit modus-themes-heading-8)))
`(org-link ((,class :inherit button)))
`(org-list-dt ((,class :inherit bold)))
`(org-macro ((,class ,@(modus-themes--mixed-fonts)
- :background ,blue-nuanced-bg :foreground ,magenta-alt-other)))
+ :background ,cyan-nuanced-bg :foreground ,cyan-nuanced-fg)))
`(org-meta-line ((,class ,@(modus-themes--mixed-fonts) :foreground ,fg-alt)))
`(org-mode-line-clock ((,class :foreground ,fg-main)))
- `(org-mode-line-clock-overrun ((,class :inherit modus-theme-active-red)))
+ `(org-mode-line-clock-overrun ((,class :inherit modus-themes-active-red)))
`(org-priority ((,class :foreground ,magenta)))
`(org-property-value ((,class ,@(modus-themes--mixed-fonts)
:foreground ,fg-special-cold)))
- `(org-quote ((,class :inherit modus-theme-slant
- ,@(modus-themes--org-block bg-dim)
- :foreground ,fg-special-cold)))
+ `(org-quote ((,class ,@(modus-themes--org-block bg-dim))))
`(org-scheduled ((,class :foreground ,magenta-alt)))
`(org-scheduled-previously ((,class :foreground ,yellow-alt-other)))
`(org-scheduled-today ((,class :foreground ,magenta-alt-other)))
:foreground ,fg-alt)))
`(org-table ((,class ,@(modus-themes--mixed-fonts)
:foreground ,fg-special-cold)))
- `(org-table-header ((,class :inherit (fixed-pitch modus-theme-intense-neutral))))
+ `(org-table-header ((,class :inherit (fixed-pitch modus-themes-intense-neutral))))
`(org-tag ((,class :foreground ,magenta-nuanced-fg)))
`(org-tag-group ((,class :inherit bold :foreground ,cyan-nuanced-fg)))
`(org-target ((,class :underline t)))
`(org-verse ((,class :inherit org-quote)))
`(org-warning ((,class :inherit bold :foreground ,red-alt-other)))
;;;;; org-journal
- `(org-journal-calendar-entry-face ((,class :inherit modus-theme-slant :foreground ,yellow-alt-other)))
- `(org-journal-calendar-scheduled-face ((,class :inherit modus-theme-slant :foreground ,red-alt-other)))
+ `(org-journal-calendar-entry-face ((,class :inherit modus-themes-slant :foreground ,yellow-alt-other)))
+ `(org-journal-calendar-scheduled-face ((,class :inherit modus-themes-slant :foreground ,red-alt-other)))
`(org-journal-highlight ((,class :foreground ,magenta-alt)))
;;;;; org-noter
`(org-noter-no-notes-exist-face ((,class :inherit bold :foreground ,red-active)))
`(org-superstar-item ((,class :foreground ,fg-main)))
`(org-superstar-leading ((,class :foreground ,fg-whitespace)))
;;;;; org-table-sticky-header
- `(org-table-sticky-header-face ((,class :inherit modus-theme-intense-neutral)))
+ `(org-table-sticky-header-face ((,class :inherit modus-themes-intense-neutral)))
;;;;; org-tree-slide
`(org-tree-slide-header-overlay-face
- ((,class :inherit (bold modus-theme-variable-pitch) :background ,bg-main
+ ((,class :inherit (bold modus-themes-variable-pitch) :background ,bg-main
:foreground ,fg-special-cold :overline nil
,@(modus-themes--scale modus-themes-scale-5))))
;;;;; org-treescope
- `(org-treescope-faces--markerinternal-midday ((,class :inherit modus-theme-intense-blue)))
- `(org-treescope-faces--markerinternal-range ((,class :inherit modus-theme-special-mild)))
+ `(org-treescope-faces--markerinternal-midday ((,class :inherit modus-themes-intense-blue)))
+ `(org-treescope-faces--markerinternal-range ((,class :inherit modus-themes-special-mild)))
;;;;; origami
`(origami-fold-header-face ((,class :background ,bg-dim :foreground ,fg-dim :box t)))
`(origami-fold-replacement-face ((,class :background ,bg-alt :foreground ,fg-alt)))
;;;;; outline-mode
- `(outline-1 ((,class :inherit modus-theme-heading-1)))
- `(outline-2 ((,class :inherit modus-theme-heading-2)))
- `(outline-3 ((,class :inherit modus-theme-heading-3)))
- `(outline-4 ((,class :inherit modus-theme-heading-4)))
- `(outline-5 ((,class :inherit modus-theme-heading-5)))
- `(outline-6 ((,class :inherit modus-theme-heading-6)))
- `(outline-7 ((,class :inherit modus-theme-heading-7)))
- `(outline-8 ((,class :inherit modus-theme-heading-8)))
+ `(outline-1 ((,class :inherit modus-themes-heading-1)))
+ `(outline-2 ((,class :inherit modus-themes-heading-2)))
+ `(outline-3 ((,class :inherit modus-themes-heading-3)))
+ `(outline-4 ((,class :inherit modus-themes-heading-4)))
+ `(outline-5 ((,class :inherit modus-themes-heading-5)))
+ `(outline-6 ((,class :inherit modus-themes-heading-6)))
+ `(outline-7 ((,class :inherit modus-themes-heading-7)))
+ `(outline-8 ((,class :inherit modus-themes-heading-8)))
;;;;; outline-minor-faces
`(outline-minor-0 ((,class :background ,bg-alt)))
;;;;; package (M-x list-packages)
`(package-status-available ((,class :foreground ,fg-special-mild)))
`(package-status-built-in ((,class :foreground ,magenta)))
`(package-status-dependency ((,class :foreground ,magenta-alt-other)))
- `(package-status-disabled ((,class :inherit modus-theme-subtle-red)))
+ `(package-status-disabled ((,class :inherit modus-themes-subtle-red)))
`(package-status-external ((,class :foreground ,cyan-alt-other)))
`(package-status-held ((,class :foreground ,yellow-alt)))
`(package-status-incompat ((,class :inherit bold :foreground ,yellow)))
`(package-status-unsigned ((,class :inherit bold :foreground ,red-alt)))
;;;;; page-break-lines
`(page-break-lines ((,class :inherit default :foreground ,fg-window-divider-outer)))
+;;;;; pandoc-mode
+ `(pandoc-citation-key-face ((,class :background ,bg-dim :foreground ,magenta-alt)))
+ `(pandoc-directive-@@-face ((,class :background ,bg-dim :foreground ,blue-alt-other)))
+ `(pandoc-directive-braces-face ((,class :foreground ,blue-alt-other)))
+ `(pandoc-directive-contents-face ((,class :foreground ,cyan-alt-other)))
+ `(pandoc-directive-type-face ((,class :foreground ,magenta)))
;;;;; paradox
`(paradox-archive-face ((,class :foreground ,fg-special-mild)))
`(paradox-comment-face ((,class :inherit font-lock-comment-face)))
- `(paradox-commit-tag-face ((,class :inherit modus-theme-refine-magenta :box t)))
+ `(paradox-commit-tag-face ((,class :inherit modus-themes-refine-magenta :box t)))
`(paradox-description-face ((,class :foreground ,fg-special-cold)))
`(paradox-description-face-multiline ((,class :foreground ,fg-special-cold)))
- `(paradox-download-face ((,class :inherit modus-theme-bold :foreground ,blue-alt-other)))
- `(paradox-highlight-face ((,class :inherit modus-theme-bold :foreground ,cyan-alt-other)))
+ `(paradox-download-face ((,class :inherit modus-themes-bold :foreground ,blue-alt-other)))
+ `(paradox-highlight-face ((,class :inherit modus-themes-bold :foreground ,cyan-alt-other)))
`(paradox-homepage-button-face ((,class :foreground ,magenta-alt-other :underline t)))
`(paradox-mode-line-face ((,class :inherit bold :foreground ,cyan-active)))
`(paradox-name-face ((,class :foreground ,blue :underline t)))
;;;;; paren-face
`(parenthesis ((,class :foreground ,fg-unfocused)))
;;;;; parrot
- `(parrot-rotate-rotation-highlight-face ((,class :inherit modus-theme-refine-magenta)))
+ `(parrot-rotate-rotation-highlight-face ((,class :inherit modus-themes-refine-magenta)))
;;;;; pass
`(pass-mode-directory-face ((,class :inherit bold :foreground ,fg-special-cold)))
`(pass-mode-entry-face ((,class :background ,bg-main :foreground ,fg-main)))
`(pdf-occur-document-face ((,class :inherit shadow)))
`(pdf-occur-page-face ((,class :inherit shadow)))
;;;;; persp-mode
- `(persp-face-lighter-buffer-not-in-persp ((,class :inherit modus-theme-intense-red)))
+ `(persp-face-lighter-buffer-not-in-persp ((,class :inherit modus-themes-intense-red)))
`(persp-face-lighter-default ((,class :inherit bold :foreground ,blue-active)))
`(persp-face-lighter-nil-persp ((,class :inherit bold :foreground ,fg-active)))
;;;;; perspective
`(phi-grep-heading-face ((,class :inherit bold :foreground ,red-alt
,@(modus-themes--scale modus-themes-scale-4))))
`(phi-grep-line-number-face ((,class :foreground ,fg-special-warm)))
- `(phi-grep-match-face ((,class :inherit modus-theme-special-calm)))
- `(phi-grep-modified-face ((,class :inherit modus-theme-refine-yellow)))
- `(phi-grep-overlay-face ((,class :inherit modus-theme-refine-blue)))
+ `(phi-grep-match-face ((,class :inherit modus-themes-special-calm)))
+ `(phi-grep-modified-face ((,class :inherit modus-themes-refine-yellow)))
+ `(phi-grep-overlay-face ((,class :inherit modus-themes-refine-blue)))
;;;;; phi-search
- `(phi-replace-preview-face ((,class :inherit modus-theme-intense-magenta)))
- `(phi-search-failpart-face ((,class :inherit modus-theme-refine-red)))
- `(phi-search-match-face ((,class :inherit modus-theme-refine-cyan)))
- `(phi-search-selection-face ((,class :inherit (modus-theme-intense-green bold))))
+ `(phi-replace-preview-face ((,class :inherit modus-themes-intense-magenta)))
+ `(phi-search-failpart-face ((,class :inherit modus-themes-refine-red)))
+ `(phi-search-match-face ((,class :inherit modus-themes-refine-cyan)))
+ `(phi-search-selection-face ((,class :inherit (modus-themes-intense-green bold))))
;;;;; pkgbuild-mode
- `(pkgbuild-error-face ((,class :inherit modus-theme-lang-error)))
+ `(pkgbuild-error-face ((,class :inherit modus-themes-lang-error)))
;;;;; pomidor
`(pomidor-break-face ((,class :foreground ,blue-alt-other)))
`(pomidor-overwork-face ((,class :foreground ,red-alt-other)))
- `(pomidor-skip-face ((,class :inherit modus-theme-slant :foreground ,fg-alt)))
+ `(pomidor-skip-face ((,class :inherit modus-themes-slant :foreground ,fg-alt)))
`(pomidor-work-face ((,class :foreground ,green-alt-other)))
;;;;; popup
`(popup-face ((,class :background ,bg-alt :foreground ,fg-main)))
- `(popup-isearch-match ((,class :inherit (modus-theme-refine-cyan bold))))
- `(popup-menu-mouse-face ((,class :inherit modus-theme-intense-blue)))
- `(popup-menu-selection-face ((,class :inherit (modus-theme-subtle-cyan bold))))
+ `(popup-isearch-match ((,class :inherit (modus-themes-refine-cyan bold))))
+ `(popup-menu-mouse-face ((,class :inherit modus-themes-intense-blue)))
+ `(popup-menu-selection-face ((,class :inherit (modus-themes-subtle-cyan bold))))
`(popup-scroll-bar-background-face ((,class :background ,bg-active)))
`(popup-scroll-bar-foreground-face ((,class :foreground ,fg-active)))
`(popup-summary-face ((,class :background ,bg-active :foreground ,fg-inactive)))
- `(popup-tip-face ((,class :inherit modus-theme-refine-yellow)))
+ `(popup-tip-face ((,class :inherit modus-themes-refine-yellow)))
;;;;; powerline
`(powerline-active0 ((,class :background ,bg-main :foreground ,blue-faint :inverse-video t)))
`(powerline-active1 ((,class :background ,blue-nuanced-bg :foreground ,blue-nuanced-fg)))
`(powerline-inactive2 ((,class :background ,bg-inactive :foreground ,fg-inactive)))
;;;;; powerline-evil
`(powerline-evil-base-face ((,class :background ,fg-main :foreground ,bg-main)))
- `(powerline-evil-emacs-face ((,class :inherit modus-theme-active-magenta)))
- `(powerline-evil-insert-face ((,class :inherit modus-theme-active-green)))
- `(powerline-evil-motion-face ((,class :inherit modus-theme-active-blue)))
+ `(powerline-evil-emacs-face ((,class :inherit modus-themes-active-magenta)))
+ `(powerline-evil-insert-face ((,class :inherit modus-themes-active-green)))
+ `(powerline-evil-motion-face ((,class :inherit modus-themes-active-blue)))
`(powerline-evil-normal-face ((,class :background ,fg-alt :foreground ,bg-main)))
- `(powerline-evil-operator-face ((,class :inherit modus-theme-active-yellow)))
- `(powerline-evil-replace-face ((,class :inherit modus-theme-active-red)))
- `(powerline-evil-visual-face ((,class :inherit modus-theme-active-cyan)))
+ `(powerline-evil-operator-face ((,class :inherit modus-themes-active-yellow)))
+ `(powerline-evil-replace-face ((,class :inherit modus-themes-active-red)))
+ `(powerline-evil-visual-face ((,class :inherit modus-themes-active-cyan)))
;;;;; proced
- `(proced-mark ((,class :inherit modus-theme-mark-symbol)))
- `(proced-marked ((,class :inherit modus-theme-mark-alt)))
+ `(proced-mark ((,class :inherit modus-themes-mark-symbol)))
+ `(proced-marked ((,class :inherit modus-themes-mark-alt)))
`(proced-sort-header ((,class :inherit bold :foreground ,fg-special-calm :underline t)))
;;;;; prodigy
`(prodigy-green-face ((,class :foreground ,green)))
`(quick-peek-border-face ((,class :background ,fg-window-divider-inner :height 1)))
`(quick-peek-padding-face ((,class :background ,bg-alt :height 0.15)))
;;;;; racket-mode
- `(racket-debug-break-face ((,class :inherit modus-theme-intense-red)))
+ `(racket-debug-break-face ((,class :inherit modus-themes-intense-red)))
`(racket-debug-locals-face ((,class :box (:line-width -1 :color nil)
:foreground ,green-alt-other)))
`(racket-debug-result-face ((,class :inherit bold :box (:line-width -1 :color nil)
:foreground ,green)))
`(racket-here-string-face ((,class :foreground ,blue-alt)))
`(racket-keyword-argument-face ((,class :foreground ,red-alt)))
- `(racket-logger-config-face ((,class :inherit modus-theme-slant :foreground ,fg-alt)))
+ `(racket-logger-config-face ((,class :inherit modus-themes-slant :foreground ,fg-alt)))
`(racket-logger-debug-face ((,class :foreground ,blue-alt-other)))
`(racket-logger-info-face ((,class :foreground ,fg-lang-note)))
- `(racket-logger-topic-face ((,class :inherit modus-theme-slant :foreground ,magenta)))
+ `(racket-logger-topic-face ((,class :inherit modus-themes-slant :foreground ,magenta)))
`(racket-selfeval-face ((,class :foreground ,green-alt)))
- `(racket-xp-error-face ((,class :inherit modus-theme-lang-error)))
+ `(racket-xp-error-face ((,class :inherit modus-themes-lang-error)))
;;;;; rainbow-blocks
`(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other)))
`(rainbow-blocks-depth-2-face ((,class :foreground ,blue)))
`(rainbow-delimiters-depth-7-face ((,class :foreground ,red-intense)))
`(rainbow-delimiters-depth-8-face ((,class :foreground ,blue-intense)))
`(rainbow-delimiters-depth-9-face ((,class :foreground ,yellow-intense)))
- `(rainbow-delimiters-mismatched-face ((,class :inherit (bold modus-theme-refine-yellow))))
- `(rainbow-delimiters-unmatched-face ((,class :inherit (bold modus-theme-refine-red))))
+ `(rainbow-delimiters-mismatched-face ((,class :inherit (bold modus-themes-refine-yellow))))
+ `(rainbow-delimiters-unmatched-face ((,class :inherit (bold modus-themes-refine-red))))
;;;;; rcirc
`(rcirc-bright-nick ((,class :inherit bold :foreground ,magenta-alt)))
`(rcirc-dim-nick ((,class :inherit shadow)))
`(rcirc-nick-in-message ((,class :foreground ,magenta-alt-other)))
`(rcirc-nick-in-message-full-line ((,class :inherit bold :foreground ,fg-special-mild)))
`(rcirc-other-nick ((,class :inherit bold :foreground ,fg-special-cold)))
- `(rcirc-prompt ((,class :inherit bold :foreground ,cyan-alt-other)))
+ `(rcirc-prompt ((,class :inherit comint-highlight-prompt)))
`(rcirc-server ((,class :foreground ,fg-unfocused)))
`(rcirc-timestamp ((,class :foreground ,blue-nuanced-fg)))
`(rcirc-url ((,class :foreground ,blue :underline t)))
`(recursion-indicator-general ((,class :foreground ,blue-active)))
`(recursion-indicator-minibuffer ((,class :foreground ,red-active)))
;;;;; regexp-builder (re-builder)
- `(reb-match-0 ((,class :inherit modus-theme-refine-cyan)))
- `(reb-match-1 ((,class :inherit modus-theme-subtle-magenta)))
- `(reb-match-2 ((,class :inherit modus-theme-subtle-green)))
- `(reb-match-3 ((,class :inherit modus-theme-refine-yellow)))
+ `(reb-match-0 ((,class :inherit modus-themes-refine-cyan)))
+ `(reb-match-1 ((,class :inherit modus-themes-subtle-magenta)))
+ `(reb-match-2 ((,class :inherit modus-themes-subtle-green)))
+ `(reb-match-3 ((,class :inherit modus-themes-refine-yellow)))
`(reb-regexp-grouping-backslash ((,class :inherit font-lock-regexp-grouping-backslash)))
`(reb-regexp-grouping-construct ((,class :inherit font-lock-regexp-grouping-construct)))
;;;;; rg (rg.el)
`(rg-filename-face ((,class :inherit bold :foreground ,fg-special-cold)))
`(rg-line-number-face ((,class :foreground ,fg-special-warm)))
`(rg-literal-face ((,class :foreground ,blue-alt)))
- `(rg-match-face ((,class :inherit modus-theme-special-calm)))
+ `(rg-match-face ((,class :inherit modus-themes-special-calm)))
`(rg-regexp-face ((,class :foreground ,magenta-active)))
`(rg-toggle-off-face ((,class :inherit bold :foreground ,fg-inactive)))
`(rg-toggle-on-face ((,class :inherit bold :foreground ,cyan-active)))
`(ripgrep-context-face ((,class :foreground ,fg-unfocused)))
`(ripgrep-error-face ((,class :inherit bold :foreground ,red)))
`(ripgrep-hit-face ((,class :foreground ,cyan)))
- `(ripgrep-match-face ((,class :inherit modus-theme-special-calm)))
+ `(ripgrep-match-face ((,class :inherit modus-themes-special-calm)))
;;;;; rmail
`(rmail-header-name ((,class :foreground ,cyan-alt-other)))
`(rmail-highlight ((,class :inherit bold :foreground ,magenta-alt)))
`(sallet-buffer-size ((,class :foreground ,fg-special-calm)))
`(sallet-buffer-special ((,class :foreground ,magenta-alt-other)))
`(sallet-flx-match ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-cyan
- 'modus-theme-refine-cyan
- 'modus-theme-nuanced-cyan
+ 'modus-themes-subtle-cyan
+ 'modus-themes-refine-cyan
+ 'modus-themes-nuanced-cyan
cyan-alt-other))))
`(sallet-recentf-buffer-name ((,class :foreground ,blue-nuanced-fg)))
`(sallet-recentf-file-path ((,class :foreground ,fg-special-mild)))
`(sallet-regexp-match ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-magenta
- 'modus-theme-refine-magenta
- 'modus-theme-nuanced-magenta
+ 'modus-themes-subtle-magenta
+ 'modus-themes-refine-magenta
+ 'modus-themes-nuanced-magenta
magenta-alt-other))))
`(sallet-source-header ((,class :inherit bold :foreground ,red-alt
,@(modus-themes--scale modus-themes-scale-4))))
`(sallet-substring-match ((,class ,@(modus-themes--extra-completions
- 'modus-theme-subtle-blue
- 'modus-theme-refine-blue
- 'modus-theme-nuanced-blue
+ 'modus-themes-subtle-blue
+ 'modus-themes-refine-blue
+ 'modus-themes-nuanced-blue
blue-alt-other))))
;;;;; selectrum
-;; NOTE 2021-02-22: The `selectrum-primary-highlight' and
-;; `selectrum-secondary-highlight' are deprecated upstream in favour of
-;; their selectrum-prescient counterparts. We shall remove those faces
-;; from the themes once we are certain that they are no longer relevant.
+ ;; NOTE 2021-02-22: The `selectrum-primary-highlight' and
+ ;; `selectrum-secondary-highlight' are deprecated upstream in favour
+ ;; of their selectrum-prescient counterparts. We shall remove those
+ ;; faces from the themes once we are certain that they are no longer
+ ;; relevant.
`(selectrum-current-candidate
((,class :inherit bold :foreground ,fg-main
:background ,@(pcase modus-themes-completions
,@(modus-themes--standard-completions
cyan-alt-other cyan-nuanced-bg
cyan-refine-bg cyan-refine-fg))))
+ `(selectrum-quick-keys-highlight
+ ((,class :inherit modus-themes-refine-red)))
+ `(selectrum-quick-keys-match
+ ((,class :inherit (bold modus-themes-intense-green))))
;;;;; selectrum-prescient
`(selectrum-prescient-primary-highlight
((,class :inherit bold
cyan-refine-bg cyan-refine-fg))))
;;;;; semantic
`(semantic-complete-inline-face ((,class :foreground ,fg-special-warm :underline t)))
- `(semantic-decoration-on-fileless-includes ((,class :inherit modus-theme-refine-green)))
- `(semantic-decoration-on-private-members-face ((,class :inherit modus-theme-refine-cyan)))
+ `(semantic-decoration-on-fileless-includes ((,class :inherit modus-themes-refine-green)))
+ `(semantic-decoration-on-private-members-face ((,class :inherit modus-themes-refine-cyan)))
`(semantic-decoration-on-protected-members-face ((,class :background ,bg-dim)))
- `(semantic-decoration-on-unknown-includes ((,class :inherit modus-theme-refine-red)))
- `(semantic-decoration-on-unparsed-includes ((,class :inherit modus-theme-refine-yellow)))
+ `(semantic-decoration-on-unknown-includes ((,class :inherit modus-themes-refine-red)))
+ `(semantic-decoration-on-unparsed-includes ((,class :inherit modus-themes-refine-yellow)))
`(semantic-highlight-edits-face ((,class :background ,bg-alt)))
`(semantic-highlight-func-current-tag-face ((,class :background ,bg-alt)))
- `(semantic-idle-symbol-highlight ((,class :inherit modus-theme-special-mild)))
+ `(semantic-idle-symbol-highlight ((,class :inherit modus-themes-special-mild)))
`(semantic-tag-boundary-face ((,class :overline ,blue-intense)))
`(semantic-unmatched-syntax-face ((,class :underline ,fg-lang-error)))
;;;;; sesman
`(sesman-browser-button-face ((,class :foreground ,blue-alt-other :underline t)))
- `(sesman-browser-highligh-face ((,class :inherit modus-theme-subtle-blue)))
+ `(sesman-browser-highligh-face ((,class :inherit modus-themes-subtle-blue)))
`(sesman-buffer-face ((,class :foreground ,magenta)))
`(sesman-directory-face ((,class :inherit bold :foreground ,blue)))
`(sesman-project-face ((,class :inherit bold :foreground ,magenta-alt-other)))
;;;;; shell-script-mode
`(sh-heredoc ((,class :foreground ,blue-alt)))
- `(sh-quoted-exec ((,class :inherit modus-theme-bold :foreground ,magenta-alt)))
+ `(sh-quoted-exec ((,class :inherit modus-themes-bold :foreground ,magenta-alt)))
;;;;; shortdoc
- `(shortdoc-heading ((,class :inherit modus-theme-pseudo-header)))
+ `(shortdoc-heading ((,class :inherit modus-themes-pseudo-header)))
`(shortdoc-section (())) ; remove the default's variable-pitch style
;;;;; show-paren-mode
`(show-paren-match ((,class ,@(modus-themes--paren bg-paren-match
bg-paren-match-intense)
:foreground ,fg-main)))
- `(show-paren-match-expression ((,class :inherit modus-theme-special-calm)))
- `(show-paren-mismatch ((,class :inherit modus-theme-intense-red)))
+ `(show-paren-match-expression ((,class :inherit modus-themes-special-calm)))
+ `(show-paren-mismatch ((,class :inherit modus-themes-intense-red)))
;;;;; shr
- `(shr-abbreviation
- ((,(append '((supports :underline (:style wave))) class)
- :foreground ,fg-docstring :underline (:color ,fg-alt :style wave))
- (,class :foreground ,fg-docstring :underline t)))
- `(shr-selected-link ((,class :inherit modus-theme-subtle-cyan)))
+ `(shr-abbreviation ((,class :inherit modus-themes-lang-note)))
+ `(shr-selected-link ((,class :inherit modus-themes-subtle-red)))
;;;;; side-notes
`(side-notes ((,class :background ,bg-dim :foreground ,fg-dim)))
;;;;; sieve-mode
`(sml/name-filling ((,class :foreground ,yellow-active)))
`(sml/not-modified ((,class :inherit sml/global)))
`(sml/numbers-separator ((,class :inherit sml/global)))
- `(sml/outside-modified ((,class :inherit modus-theme-intense-red)))
+ `(sml/outside-modified ((,class :inherit modus-themes-intense-red)))
`(sml/position-percentage ((,class :inherit sml/global)))
`(sml/prefix ((,class :foreground ,green-active)))
`(sml/process ((,class :inherit sml/prefix)))
`(sml/projectile ((,class :inherit sml/git)))
`(sml/read-only ((,class :inherit bold :foreground ,cyan-active)))
`(sml/remote ((,class :inherit sml/global)))
- `(sml/sudo ((,class :inherit modus-theme-subtle-red)))
+ `(sml/sudo ((,class :inherit modus-themes-subtle-red)))
`(sml/time ((,class :inherit sml/global)))
`(sml/vc ((,class :inherit sml/git)))
`(sml/vc-edited ((,class :inherit bold :foreground ,yellow-active)))
;;;;; smartparens
- `(sp-pair-overlay-face ((,class :inherit modus-theme-special-warm)))
- `(sp-show-pair-enclosing ((,class :inherit modus-theme-special-mild)))
+ `(sp-pair-overlay-face ((,class :inherit modus-themes-special-warm)))
+ `(sp-show-pair-enclosing ((,class :inherit modus-themes-special-mild)))
`(sp-show-pair-match-face ((,class ,@(modus-themes--paren bg-paren-match
bg-paren-match-intense)
:foreground ,fg-main)))
- `(sp-show-pair-mismatch-face ((,class :inherit modus-theme-intense-red)))
+ `(sp-show-pair-mismatch-face ((,class :inherit modus-themes-intense-red)))
`(sp-wrap-overlay-closing-pair ((,class :inherit sp-pair-overlay-face)))
`(sp-wrap-overlay-face ((,class :inherit sp-pair-overlay-face)))
`(sp-wrap-overlay-opening-pair ((,class :inherit sp-pair-overlay-face)))
`(sp-wrap-tag-overlay-face ((,class :inherit sp-pair-overlay-face)))
;;;;; smerge
- `(smerge-base ((,class :inherit modus-theme-diff-changed)))
- `(smerge-lower ((,class :inherit modus-theme-diff-added)))
- `(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2)))
- `(smerge-refined-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(smerge-base ((,class :inherit modus-themes-diff-changed)))
+ `(smerge-lower ((,class :inherit modus-themes-diff-added)))
+ `(smerge-markers ((,class :inherit modus-themes-diff-heading)))
+ `(smerge-refined-added ((,class :inherit modus-themes-diff-refine-added)))
`(smerge-refined-changed (()))
- `(smerge-refined-removed ((,class :inherit modus-theme-diff-refine-removed)))
- `(smerge-upper ((,class :inherit modus-theme-diff-removed)))
+ `(smerge-refined-removed ((,class :inherit modus-themes-diff-refine-removed)))
+ `(smerge-upper ((,class :inherit modus-themes-diff-removed)))
;;;;; solaire
`(solaire-default-face ((,class :inherit default :background ,bg-alt :foreground ,fg-dim)))
`(solaire-line-number-face ((,class :inherit solaire-default-face :foreground ,fg-unfocused)))
`(solaire-hl-line-face ((,class :background ,bg-active)))
`(solaire-org-hide-face ((,class :background ,bg-alt :foreground ,bg-alt)))
;;;;; spaceline
- `(spaceline-evil-emacs ((,class :inherit modus-theme-active-magenta)))
- `(spaceline-evil-insert ((,class :inherit modus-theme-active-green)))
- `(spaceline-evil-motion ((,class :inherit modus-theme-active-blue)))
+ `(spaceline-evil-emacs ((,class :inherit modus-themes-active-magenta)))
+ `(spaceline-evil-insert ((,class :inherit modus-themes-active-green)))
+ `(spaceline-evil-motion ((,class :inherit modus-themes-active-blue)))
`(spaceline-evil-normal ((,class :background ,fg-alt :foreground ,bg-alt)))
- `(spaceline-evil-replace ((,class :inherit modus-theme-active-red)))
- `(spaceline-evil-visual ((,class :inherit modus-theme-active-cyan)))
+ `(spaceline-evil-replace ((,class :inherit modus-themes-active-red)))
+ `(spaceline-evil-visual ((,class :inherit modus-themes-active-cyan)))
`(spaceline-flycheck-error ((,class :foreground ,red-active)))
`(spaceline-flycheck-info ((,class :foreground ,cyan-active)))
`(spaceline-flycheck-warning ((,class :foreground ,yellow-active)))
- `(spaceline-highlight-face ((,class :inherit modus-theme-fringe-blue)))
- `(spaceline-modified ((,class :inherit modus-theme-fringe-magenta)))
+ `(spaceline-highlight-face ((,class :inherit modus-themes-fringe-blue)))
+ `(spaceline-modified ((,class :inherit modus-themes-fringe-magenta)))
`(spaceline-python-venv ((,class :foreground ,magenta-active)))
- `(spaceline-read-only ((,class :inherit modus-theme-fringe-red)))
- `(spaceline-unmodified ((,class :inherit modus-theme-fringe-cyan)))
+ `(spaceline-read-only ((,class :inherit modus-themes-fringe-red)))
+ `(spaceline-unmodified ((,class :inherit modus-themes-fringe-cyan)))
;;;;; speedbar
`(speedbar-button-face ((,class :inherit button)))
`(speedbar-directory-face ((,class :inherit bold :foreground ,blue)))
`(speedbar-file-face ((,class :foreground ,fg-main)))
- `(speedbar-highlight-face ((,class :inherit modus-theme-subtle-blue)))
+ `(speedbar-highlight-face ((,class :inherit modus-themes-subtle-blue)))
`(speedbar-selected-face ((,class :inherit bold :foreground ,cyan)))
- `(speedbar-separator-face ((,class :inherit modus-theme-intense-neutral)))
+ `(speedbar-separator-face ((,class :inherit modus-themes-intense-neutral)))
`(speedbar-tag-face ((,class :foreground ,yellow-alt-other)))
;;;;; spell-fu
- `(spell-fu-incorrect-face ((,class :inherit modus-theme-lang-error)))
+ `(spell-fu-incorrect-face ((,class :inherit modus-themes-lang-error)))
;;;;; spray
`(spray-accent-face ((,class :foreground ,red-intense)))
`(spray-base-face ((,class :inherit default :foreground ,fg-special-cold)))
;;;;; stripes
- `(stripes ((,class :inherit modus-theme-hl-line)))
+ `(stripes ((,class :inherit modus-themes-hl-line)))
;;;;; success
`(suggest-heading ((,class :inherit bold :foreground ,yellow-alt-other)))
;;;;; switch-window
`(switch-window-background ((,class :background ,bg-dim)))
`(switch-window-label ((,class :height 3.0 :foreground ,blue-intense)))
;;;;; swiper
- `(swiper-background-match-face-1 ((,class :inherit modus-theme-subtle-neutral)))
- `(swiper-background-match-face-2 ((,class :inherit modus-theme-refine-cyan)))
- `(swiper-background-match-face-3 ((,class :inherit modus-theme-refine-magenta)))
- `(swiper-background-match-face-4 ((,class :inherit modus-theme-refine-yellow)))
- `(swiper-line-face ((,class :inherit modus-theme-special-cold)))
- `(swiper-match-face-1 ((,class :inherit (bold modus-theme-intense-neutral))))
- `(swiper-match-face-2 ((,class :inherit (bold modus-theme-intense-green))))
- `(swiper-match-face-3 ((,class :inherit (bold modus-theme-intense-blue))))
- `(swiper-match-face-4 ((,class :inherit (bold modus-theme-intense-red))))
+ `(swiper-background-match-face-1 ((,class :inherit modus-themes-subtle-neutral)))
+ `(swiper-background-match-face-2 ((,class :inherit modus-themes-refine-cyan)))
+ `(swiper-background-match-face-3 ((,class :inherit modus-themes-refine-magenta)))
+ `(swiper-background-match-face-4 ((,class :inherit modus-themes-refine-yellow)))
+ `(swiper-line-face ((,class :inherit modus-themes-special-cold)))
+ `(swiper-match-face-1 ((,class :inherit (bold modus-themes-intense-neutral))))
+ `(swiper-match-face-2 ((,class :inherit (bold modus-themes-intense-green))))
+ `(swiper-match-face-3 ((,class :inherit (bold modus-themes-intense-blue))))
+ `(swiper-match-face-4 ((,class :inherit (bold modus-themes-intense-red))))
;;;;; swoop
`(swoop-face-header-format-line ((,class :inherit bold :foreground ,red-alt
,@(modus-themes--scale modus-themes-scale-3))))
`(swoop-face-line-buffer-name ((,class :inherit bold :foreground ,blue-alt
,@(modus-themes--scale modus-themes-scale-4))))
`(swoop-face-line-number ((,class :foreground ,fg-special-warm)))
- `(swoop-face-target-line ((,class :inherit modus-theme-intense-blue :extend t)))
- `(swoop-face-target-words ((,class :inherit modus-theme-refine-cyan)))
+ `(swoop-face-target-line ((,class :inherit modus-themes-intense-blue :extend t)))
+ `(swoop-face-target-words ((,class :inherit modus-themes-refine-cyan)))
;;;;; sx
`(sx-inbox-item-type ((,class :foreground ,magenta-alt-other)))
`(sx-inbox-item-type-unread ((,class :inherit (sx-inbox-item-type bold))))
`(sx-question-list-score-upvoted ((,class :inherit (sx-question-list-score bold))))
`(sx-question-list-unread-question ((,class :inherit bold :foreground ,fg-main)))
`(sx-question-mode-accepted ((,class :inherit bold :height 1.3 :foreground ,green)))
- `(sx-question-mode-closed ((,class :inherit modus-theme-active-yellow :box (:line-width 2 :color nil))))
+ `(sx-question-mode-closed ((,class :inherit modus-themes-active-yellow :box (:line-width 2 :color nil))))
`(sx-question-mode-closed-reason ((,class :box (:line-width 2 :color nil) :foreground ,fg-main)))
`(sx-question-mode-content-face ((,class :background ,bg-dim)))
`(sx-question-mode-date ((,class :foreground ,blue)))
`(sx-user-name ((,class :foreground ,blue-alt)))
`(sx-user-reputation ((,class :inherit shadow)))
;;;;; symbol-overlay
- `(symbol-overlay-default-face ((,class :inherit modus-theme-special-warm)))
- `(symbol-overlay-face-1 ((,class :inherit modus-theme-intense-blue)))
- `(symbol-overlay-face-2 ((,class :inherit modus-theme-refine-magenta)))
- `(symbol-overlay-face-3 ((,class :inherit modus-theme-intense-yellow)))
- `(symbol-overlay-face-4 ((,class :inherit modus-theme-intense-magenta)))
- `(symbol-overlay-face-5 ((,class :inherit modus-theme-intense-red)))
- `(symbol-overlay-face-6 ((,class :inherit modus-theme-refine-red)))
- `(symbol-overlay-face-7 ((,class :inherit modus-theme-intense-cyan)))
- `(symbol-overlay-face-8 ((,class :inherit modus-theme-refine-cyan)))
+ `(symbol-overlay-default-face ((,class :inherit modus-themes-special-warm)))
+ `(symbol-overlay-face-1 ((,class :inherit modus-themes-intense-blue)))
+ `(symbol-overlay-face-2 ((,class :inherit modus-themes-refine-magenta)))
+ `(symbol-overlay-face-3 ((,class :inherit modus-themes-intense-yellow)))
+ `(symbol-overlay-face-4 ((,class :inherit modus-themes-intense-magenta)))
+ `(symbol-overlay-face-5 ((,class :inherit modus-themes-intense-red)))
+ `(symbol-overlay-face-6 ((,class :inherit modus-themes-refine-red)))
+ `(symbol-overlay-face-7 ((,class :inherit modus-themes-intense-cyan)))
+ `(symbol-overlay-face-8 ((,class :inherit modus-themes-refine-cyan)))
;;;;; syslog-mode
`(syslog-debug ((,class :inherit bold :foreground ,cyan-alt-other)))
`(syslog-error ((,class :inherit bold :foreground ,red)))
`(syslog-ip ((,class :inherit bold :foreground ,fg-special-mild :underline t)))
`(syslog-su ((,class :inherit bold :foreground ,red-alt)))
`(syslog-warn ((,class :inherit bold :foreground ,yellow)))
+;;;;; tab-bar-groups
+ `(tab-bar-groups-1 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,blue-tab)))
+ `(tab-bar-groups-1-group-name ((,class :inherit tab-bar-groups-1 :inverse-video t)))
+ `(tab-bar-groups-2 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,red-tab)))
+ `(tab-bar-groups-2-group-name ((,class :inherit tab-bar-groups-2 :inverse-video t)))
+ `(tab-bar-groups-3 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,green-tab)))
+ `(tab-bar-groups-3-group-name ((,class :inherit tab-bar-groups-3 :inverse-video t)))
+ `(tab-bar-groups-4 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,orange-tab)))
+ `(tab-bar-groups-4-group-name ((,class :inherit tab-bar-groups-4 :inverse-video t)))
+ `(tab-bar-groups-5 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,purple-tab)))
+ `(tab-bar-groups-5-group-name ((,class :inherit tab-bar-groups-5 :inverse-video t)))
+ `(tab-bar-groups-6 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,cyan-tab)))
+ `(tab-bar-groups-6-group-name ((,class :inherit tab-bar-groups-6 :inverse-video t)))
+ `(tab-bar-groups-7 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,yellow-tab)))
+ `(tab-bar-groups-7-group-name ((,class :inherit tab-bar-groups-7 :inverse-video t)))
+ `(tab-bar-groups-8 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,magenta-tab)))
+ `(tab-bar-groups-8-group-name ((,class :inherit tab-bar-groups-8 :inverse-video t)))
;;;;; tab-bar-mode
`(tab-bar ((,class ,@(modus-themes--variable-pitch-ui)
:background ,bg-tab-bar :foreground ,fg-main)))
:background ,bg-tab-inactive-alt :foreground ,fg-main)))
;;;;; table (built-in table.el)
`(table-cell ((,class :background ,blue-nuanced-bg)))
+;;;;; telega
+ ;; FIXME 2021-03-28: Some aspects of `telega' are not fully
+ ;; supported or have not been tested thoroughly. Please understand
+ ;; that I do not use that service because it requires a smartphone
+ ;; and I have none. Help with testing is appreciated.
+ `(telega-button ((,class :box t :foreground ,blue)))
+ `(telega-button-active ((,class :box ,blue-intense-bg :background ,blue-intense-bg :foreground ,fg-main)))
+ `(telega-button-highlight ((,class :inherit modus-themes-subtle-magenta)))
+ `(telega-chat-prompt ((,class :inherit bold)))
+ `(telega-entity-type-code ((,class :inherit fixed-pitch)))
+ `(telega-entity-type-mention ((,class :foreground ,cyan)))
+ `(telega-entity-type-pre ((,class :inherit fixed-pitch)))
+ `(telega-msg-heading ((,class :background ,bg-alt)))
+ `(telega-msg-self-title ((,class :inherit bold)))
+ `(telega-root-heading ((,class :inherit modus-themes-subtle-neutral)))
+ `(telega-secret-title ((,class :foreground ,magenta-alt)))
+ `(telega-unmuted-count ((,class :foreground ,blue-alt-other)))
+ `(telega-user-online-status ((,class :foreground ,cyan-active)))
+ `(telega-username ((,class :foreground ,cyan-alt-other)))
+ `(telega-webpage-chat-link ((,class :background ,bg-alt)))
+ `(telega-webpage-fixed ((,class :inherit fixed-pitch :height 0.85)))
+ `(telega-webpage-header ((,class :inherit modus-themes-variable-pitch :height 1.3)))
+ `(telega-webpage-preformatted ((,class :inherit fixed-pitch :background ,bg-alt)))
+ `(telega-webpage-subheader ((,class :inherit modus-themes-variable-pitch :height 1.15)))
;;;;; telephone-line
`(telephone-line-accent-active ((,class :background ,fg-inactive :foreground ,bg-inactive)))
`(telephone-line-accent-inactive ((,class :background ,bg-active :foreground ,fg-active)))
`(tomatinho-pause-face ((,class :foreground ,yellow-intense)))
`(tomatinho-reset-face ((,class :inherit shadow)))
;;;;; transient
- `(transient-active-infix ((,class :inherit modus-theme-special-mild)))
+ `(transient-active-infix ((,class :inherit modus-themes-special-mild)))
`(transient-amaranth ((,class :inherit bold :foreground ,yellow)))
`(transient-argument ((,class :inherit bold :foreground ,red-alt)))
`(transient-blue ((,class :inherit bold :foreground ,blue)))
- `(transient-disabled-suffix ((,class :inherit modus-theme-intense-red)))
- `(transient-enabled-suffix ((,class :inherit modus-theme-intense-green)))
+ `(transient-disabled-suffix ((,class :inherit modus-themes-intense-red)))
+ `(transient-enabled-suffix ((,class :inherit modus-themes-intense-green)))
`(transient-heading ((,class :inherit bold :foreground ,fg-main)))
`(transient-inactive-argument ((,class :inherit shadow)))
`(transient-inactive-value ((,class :inherit shadow)))
- `(transient-key ((,class :inherit bold :foreground ,blue)))
+ `(transient-key ((,class :inherit modus-themes-key-binding)))
`(transient-mismatched-key ((,class :underline t)))
`(transient-nonstandard-key ((,class :underline t)))
`(transient-pink ((,class :inherit bold :foreground ,magenta)))
`(transient-unreachable-key ((,class :foreground ,fg-unfocused)))
`(transient-value ((,class :inherit bold :foreground ,magenta-alt-other)))
;;;;; trashed
- `(trashed-deleted ((,class :inherit modus-theme-mark-del)))
+ `(trashed-deleted ((,class :inherit modus-themes-mark-del)))
`(trashed-directory ((,class :foreground ,blue)))
- `(trashed-mark ((,class :inherit modus-theme-mark-symbol)))
- `(trashed-marked ((,class :inherit modus-theme-mark-alt)))
- `(trashed-restored ((,class :inherit modus-theme-mark-sel)))
+ `(trashed-mark ((,class :inherit modus-themes-mark-symbol)))
+ `(trashed-marked ((,class :inherit modus-themes-mark-alt)))
+ `(trashed-restored ((,class :inherit modus-themes-mark-sel)))
`(trashed-symlink ((,class :inherit button
,@(modus-themes--link-color
cyan-alt cyan-alt-faint))))
`(treemacs-file-face ((,class :foreground ,fg-main)))
`(treemacs-fringe-indicator-face ((,class :foreground ,fg-main)))
`(treemacs-git-added-face ((,class :foreground ,green-intense)))
- `(treemacs-git-conflict-face ((,class :inherit (modus-theme-intense-red bold))))
+ `(treemacs-git-conflict-face ((,class :inherit (modus-themes-intense-red bold))))
`(treemacs-git-ignored-face ((,class :inherit shadow)))
`(treemacs-git-modified-face ((,class :foreground ,yellow-alt-other)))
`(treemacs-git-renamed-face ((,class :foreground ,cyan-alt-other)))
`(treemacs-git-unmodified-face ((,class :foreground ,fg-main)))
`(treemacs-git-untracked-face ((,class :foreground ,red-alt-other)))
- `(treemacs-help-column-face ((,class :inherit modus-theme-bold :foreground ,magenta-alt-other :underline t)))
+ `(treemacs-help-column-face ((,class :inherit modus-themes-bold :foreground ,magenta-alt-other :underline t)))
`(treemacs-help-title-face ((,class :foreground ,blue-alt-other)))
- `(treemacs-on-failure-pulse-face ((,class :inherit modus-theme-intense-red)))
- `(treemacs-on-success-pulse-face ((,class :inherit modus-theme-intense-green)))
+ `(treemacs-on-failure-pulse-face ((,class :inherit modus-themes-intense-red)))
+ `(treemacs-on-success-pulse-face ((,class :inherit modus-themes-intense-green)))
`(treemacs-root-face ((,class :inherit bold :foreground ,blue-alt-other :height 1.2 :underline t)))
`(treemacs-root-remote-disconnected-face ((,class :inherit treemacs-root-remote-face :foreground ,yellow)))
`(treemacs-root-remote-face ((,class :inherit treemacs-root-face :foreground ,magenta)))
;;;;; tty-menu
`(tty-menu-disabled-face ((,class :background ,bg-alt :foreground ,fg-alt)))
`(tty-menu-enabled-face ((,class :inherit bold :background ,bg-alt :foreground ,fg-main)))
- `(tty-menu-selected-face ((,class :inherit modus-theme-intense-blue)))
+ `(tty-menu-selected-face ((,class :inherit modus-themes-intense-blue)))
;;;;; tuareg
- `(caml-types-def-face ((,class :inherit modus-theme-subtle-red)))
- `(caml-types-expr-face ((,class :inherit modus-theme-subtle-green)))
- `(caml-types-occ-face ((,class :inherit modus-theme-subtle-green)))
- `(caml-types-scope-face ((,class :inherit modus-theme-subtle-blue)))
- `(caml-types-typed-face ((,class :inherit modus-theme-subtle-magenta)))
+ `(caml-types-def-face ((,class :inherit modus-themes-subtle-red)))
+ `(caml-types-expr-face ((,class :inherit modus-themes-subtle-green)))
+ `(caml-types-occ-face ((,class :inherit modus-themes-subtle-green)))
+ `(caml-types-scope-face ((,class :inherit modus-themes-subtle-blue)))
+ `(caml-types-typed-face ((,class :inherit modus-themes-subtle-magenta)))
`(tuareg-font-double-semicolon-face ((,class :inherit font-lock-preprocessor-face)))
`(tuareg-font-lock-attribute-face ((,class :inherit font-lock-function-name-face)))
`(tuareg-font-lock-constructor-face ((,class :foreground ,fg-main)))
- `(tuareg-font-lock-error-face ((,class :inherit (modus-theme-intense-red bold))))
+ `(tuareg-font-lock-error-face ((,class :inherit (modus-themes-intense-red bold))))
`(tuareg-font-lock-extension-node-face ((,class :background ,bg-alt :foreground ,magenta)))
`(tuareg-font-lock-governing-face ((,class :inherit bold :foreground ,fg-main)))
`(tuareg-font-lock-infix-extension-node-face ((,class :inherit font-lock-function-name-face)))
`(tuareg-opam-error-face ((,class :inherit error)))
`(tuareg-opam-pkg-variable-name-face ((,class :inherit font-lock-variable-name-face)))
;;;;; typescript
- `(typescript-jsdoc-tag ((,class :inherit modus-theme-slant :foreground ,fg-special-mild)))
- `(typescript-jsdoc-type ((,class :inherit modus-theme-slant :foreground ,fg-special-calm)))
- `(typescript-jsdoc-value ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
+ `(typescript-jsdoc-tag ((,class :inherit (font-lock-builtin-face font-lock-comment-face) :weight normal)))
+ `(typescript-jsdoc-type ((,class :inherit (font-lock-type-face font-lock-comment-face) :weight normal)))
+ `(typescript-jsdoc-value ((,class :inherit (font-lock-constant-face font-lock-comment-face) :weight normal)))
;;;;; undo-tree
`(undo-tree-visualizer-active-branch-face ((,class :inherit bold :foreground ,fg-main)))
`(undo-tree-visualizer-current-face ((,class :foreground ,blue-intense)))
`(vc-dir-status-ignored ((,class :foreground ,fg-unfocused)))
`(vc-dir-status-up-to-date ((,class :foreground ,cyan)))
`(vc-dir-status-warning ((,class :foreground ,red)))
- `(vc-conflict-state ((,class :inherit modus-theme-slant :foreground ,red-active)))
+ `(vc-conflict-state ((,class :inherit modus-themes-slant :foreground ,red-active)))
`(vc-edited-state ((,class :foreground ,yellow-active)))
`(vc-locally-added-state ((,class :foreground ,cyan-active)))
`(vc-locked-state ((,class :foreground ,blue-active)))
- `(vc-missing-state ((,class :inherit modus-theme-slant :foreground ,magenta-active)))
- `(vc-needs-update-state ((,class :inherit modus-theme-slant :foreground ,green-active)))
+ `(vc-missing-state ((,class :inherit modus-themes-slant :foreground ,magenta-active)))
+ `(vc-needs-update-state ((,class :inherit modus-themes-slant :foreground ,green-active)))
`(vc-removed-state ((,class :foreground ,red-active)))
`(vc-state-base ((,class :foreground ,fg-active)))
`(vc-up-to-date-state ((,class :foreground ,fg-special-cold)))
;;;;; vdiff
- `(vdiff-addition-face ((,class :inherit modus-theme-diff-added)))
- `(vdiff-change-face ((,class :inherit modus-theme-diff-changed)))
- `(vdiff-closed-fold-face ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
- `(vdiff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
- `(vdiff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
- `(vdiff-subtraction-face ((,class :inherit modus-theme-diff-removed)))
- `(vdiff-target-face ((,class :inherit modus-theme-intense-blue)))
+ `(vdiff-addition-face ((,class :inherit modus-themes-diff-added)))
+ `(vdiff-change-face ((,class :inherit modus-themes-diff-changed)))
+ `(vdiff-closed-fold-face ((,class :inherit modus-themes-diff-heading)))
+ `(vdiff-refine-added ((,class :inherit modus-themes-diff-refine-added)))
+ `(vdiff-refine-changed ((,class :inherit modus-themes-diff-refine-changed)))
+ `(vdiff-subtraction-face ((,class :inherit modus-themes-diff-removed)))
+ `(vdiff-target-face ((,class :inherit modus-themes-intense-blue)))
+;;;;; vertico
+ `(vertico-current ((,class :inherit bold :foreground ,fg-main
+ :background ,@(pcase modus-themes-completions
+ ('opinionated (list bg-active))
+ (_ (list bg-inactive))))))
;;;;; vimish-fold
`(vimish-fold-fringe ((,class :foreground ,cyan-active)))
- `(vimish-fold-mouse-face ((,class :inherit modus-theme-intense-blue)))
+ `(vimish-fold-mouse-face ((,class :inherit modus-themes-intense-blue)))
`(vimish-fold-overlay ((,class :background ,bg-alt :foreground ,fg-special-cold)))
;;;;; visible-mark
`(visible-mark-active ((,class :background ,blue-intense-bg)))
`(visible-mark-forward-face1 ((,class :background ,magenta-intense-bg)))
`(visible-mark-forward-face2 ((,class :background ,green-intense-bg)))
;;;;; visual-regexp
- `(vr/group-0 ((,class :inherit modus-theme-intense-blue)))
- `(vr/group-1 ((,class :inherit modus-theme-intense-magenta)))
- `(vr/group-2 ((,class :inherit modus-theme-intense-green)))
- `(vr/match-0 ((,class :inherit modus-theme-refine-yellow)))
- `(vr/match-1 ((,class :inherit modus-theme-refine-yellow)))
- `(vr/match-separator-face ((,class :inherit (modus-theme-intense-neutral bold))))
+ `(vr/group-0 ((,class :inherit modus-themes-intense-blue)))
+ `(vr/group-1 ((,class :inherit modus-themes-intense-magenta)))
+ `(vr/group-2 ((,class :inherit modus-themes-intense-green)))
+ `(vr/match-0 ((,class :inherit modus-themes-refine-yellow)))
+ `(vr/match-1 ((,class :inherit modus-themes-refine-yellow)))
+ `(vr/match-separator-face ((,class :inherit (modus-themes-intense-neutral bold))))
;;;;; volatile-highlights
`(vhl/default-face ((,class :background ,bg-alt :foreground ,blue-nuanced-fg :extend t)))
;;;;; vterm
`(web-mode-css-string-face ((,class :inherit web-mode-string-face)))
`(web-mode-css-variable-face ((,class :foreground ,fg-special-warm)))
`(web-mode-current-column-highlight-face ((,class :background ,bg-alt)))
- `(web-mode-current-element-highlight-face ((,class :inherit modus-theme-special-mild)))
- `(web-mode-doctype-face ((,class :inherit modus-theme-slant :foreground ,fg-special-cold)))
- `(web-mode-error-face ((,class :inherit modus-theme-intense-red)))
+ `(web-mode-current-element-highlight-face ((,class :inherit modus-themes-special-mild)))
+ `(web-mode-doctype-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold)))
+ `(web-mode-error-face ((,class :inherit modus-themes-intense-red)))
`(web-mode-filter-face ((,class :inherit font-lock-function-name-face)))
`(web-mode-folded-face ((,class :underline t)))
`(web-mode-function-call-face ((,class :inherit font-lock-function-name-face)))
`(web-mode-warning-face ((,class :inherit font-lock-warning-face)))
`(web-mode-whitespace-face ((,class :background ,bg-whitespace :foreground ,fg-whitespace)))
;;;;; wgrep
- `(wgrep-delete-face ((,class :inherit modus-theme-refine-yellow)))
- `(wgrep-done-face ((,class :inherit modus-theme-refine-blue)))
- `(wgrep-face ((,class :inherit modus-theme-refine-green)))
+ `(wgrep-delete-face ((,class :inherit modus-themes-refine-yellow)))
+ `(wgrep-done-face ((,class :inherit modus-themes-refine-blue)))
+ `(wgrep-face ((,class :inherit modus-themes-refine-green)))
`(wgrep-file-face ((,class :foreground ,fg-special-warm)))
- `(wgrep-reject-face ((,class :inherit (modus-theme-intense-red bold))))
+ `(wgrep-reject-face ((,class :inherit (modus-themes-intense-red bold))))
;;;;; which-function-mode
`(which-func ((,class :foreground ,magenta-active)))
;;;;; which-key
`(which-key-command-description-face ((,class :foreground ,fg-main)))
`(which-key-group-description-face ((,class :foreground ,magenta-alt)))
`(which-key-highlighted-command-face ((,class :foreground ,yellow :underline t)))
- `(which-key-key-face ((,class :inherit bold :foreground ,blue-intense)))
+ `(which-key-key-face ((,class :inherit modus-themes-key-binding)))
`(which-key-local-map-description-face ((,class :foreground ,fg-main)))
`(which-key-note-face ((,class :foreground ,fg-special-warm)))
`(which-key-separator-face ((,class :inherit shadow)))
`(which-key-special-key-face ((,class :inherit bold :foreground ,orange-intense)))
;;;;; whitespace-mode
- `(whitespace-big-indent ((,class :inherit modus-theme-subtle-red)))
- `(whitespace-empty ((,class :inherit modus-theme-intense-magenta)))
+ `(whitespace-big-indent ((,class :inherit modus-themes-subtle-red)))
+ `(whitespace-empty ((,class :inherit modus-themes-intense-magenta)))
`(whitespace-hspace ((,class :background ,bg-whitespace :foreground ,fg-whitespace)))
`(whitespace-indentation ((,class :background ,bg-whitespace :foreground ,fg-whitespace)))
`(whitespace-line ((,class :background ,bg-alt)))
`(whitespace-newline ((,class :background ,bg-whitespace :foreground ,fg-whitespace)))
`(whitespace-space ((,class :background ,bg-whitespace :foreground ,fg-whitespace)))
- `(whitespace-space-after-tab ((,class :inherit modus-theme-subtle-magenta)))
- `(whitespace-space-before-tab ((,class :inherit modus-theme-subtle-cyan)))
+ `(whitespace-space-after-tab ((,class :inherit modus-themes-subtle-magenta)))
+ `(whitespace-space-before-tab ((,class :inherit modus-themes-subtle-cyan)))
`(whitespace-tab ((,class :background ,bg-whitespace :foreground ,fg-whitespace)))
- `(whitespace-trailing ((,class :inherit modus-theme-intense-red)))
+ `(whitespace-trailing ((,class :inherit modus-themes-intense-red)))
;;;;; window-divider-mode
`(window-divider ((,class :foreground ,fg-window-divider-inner)))
`(window-divider-first-pixel ((,class :foreground ,fg-window-divider-outer)))
`(window-divider-last-pixel ((,class :foreground ,fg-window-divider-outer)))
;;;;; winum
- `(winum-face ((,class :inherit modus-theme-bold :foreground ,cyan-active)))
+ `(winum-face ((,class :inherit modus-themes-bold :foreground ,cyan-active)))
;;;;; writegood-mode
`(writegood-duplicates-face ((,class :background ,bg-alt :foreground ,red-alt :underline t)))
- `(writegood-passive-voice-face ((,class :inherit modus-theme-lang-warning)))
- `(writegood-weasels-face ((,class :inherit modus-theme-lang-error)))
+ `(writegood-passive-voice-face ((,class :inherit modus-themes-lang-warning)))
+ `(writegood-weasels-face ((,class :inherit modus-themes-lang-error)))
;;;;; woman
`(woman-addition ((,class :foreground ,magenta-alt-other)))
`(woman-bold ((,class :inherit bold :foreground ,magenta)))
`(xref-line-number ((,class :inherit shadow)))
`(xref-match ((,class :inherit match)))
;;;;; yaml-mode
- `(yaml-tab-face ((,class :inherit modus-theme-intense-red)))
+ `(yaml-tab-face ((,class :inherit modus-themes-intense-red)))
;;;;; yasnippet
`(yas-field-highlight-face ((,class :background ,bg-hl-alt-intense)))
;;;;; ztree
`(ztreep-arrow-face ((,class :foreground ,fg-inactive)))
`(ztreep-diff-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold)))
- `(ztreep-diff-header-small-face ((,class :inherit bold :foreground ,fg-special-mild)))
- `(ztreep-diff-model-add-face ((,class :foreground ,green)))
+ `(ztreep-diff-header-small-face ((,class :foreground ,fg-main)))
+ `(ztreep-diff-model-add-face ((,class :foreground ,@(modus-themes--diff-deuteran blue green))))
`(ztreep-diff-model-diff-face ((,class :foreground ,red)))
`(ztreep-diff-model-ignored-face ((,class :inherit shadow :strike-through t)))
`(ztreep-diff-model-normal-face ((,class :inherit shadow)))
- `(ztreep-expand-sign-face ((,class :foreground ,blue)))
+ `(ztreep-expand-sign-face ((,class :inherit ztreep-arrow-face)))
`(ztreep-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold)))
`(ztreep-leaf-face ((,class :foreground ,cyan)))
`(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm)))
;;;; exwm
`(exwm-floating-border-color ,fg-window-divider-inner)
;;;; flymake fringe indicators
- `(flymake-error-bitmap '(flymake-double-exclamation-mark modus-theme-fringe-red))
- `(flymake-warning-bitmap '(exclamation-mark modus-theme-fringe-yellow))
- `(flymake-note-bitmap '(exclamation-mark modus-theme-fringe-cyan))
+ `(flymake-error-bitmap '(flymake-double-exclamation-mark modus-themes-fringe-red))
+ `(flymake-warning-bitmap '(exclamation-mark modus-themes-fringe-yellow))
+ `(flymake-note-bitmap '(exclamation-mark modus-themes-fringe-cyan))
;;;; ibuffer
- `(ibuffer-deletion-face 'modus-theme-mark-del)
- `(ibuffer-filter-group-name-face 'modus-theme-mark-symbol)
- `(ibuffer-marked-face 'modus-theme-mark-sel)
- `(ibuffer-title-face 'modus-theme-pseudo-header)
+ `(ibuffer-deletion-face 'modus-themes-mark-del)
+ `(ibuffer-filter-group-name-face 'modus-themes-mark-symbol)
+ `(ibuffer-marked-face 'modus-themes-mark-sel)
+ `(ibuffer-title-face 'modus-themes-pseudo-header)
;;;; highlight-tail
`(highlight-tail-colors
'((,green-subtle-bg . 0)
`(xterm-color-names-bright ["gray35" ,red-alt ,green-alt ,yellow-alt ,blue-alt ,magenta-alt ,cyan-alt "white"])
(if (eq modus-themes-org-blocks 'rainbow)
`(org-src-block-faces ; TODO this list should be expanded
- `(("emacs-lisp" modus-theme-nuanced-magenta)
- ("elisp" modus-theme-nuanced-magenta)
- ("clojure" modus-theme-nuanced-magenta)
- ("clojurescript" modus-theme-nuanced-magenta)
- ("c" modus-theme-nuanced-blue)
- ("c++" modus-theme-nuanced-blue)
- ("sh" modus-theme-nuanced-green)
- ("shell" modus-theme-nuanced-green)
- ("html" modus-theme-nuanced-yellow)
- ("xml" modus-theme-nuanced-yellow)
- ("css" modus-theme-nuanced-red)
- ("scss" modus-theme-nuanced-red)
- ("python" modus-theme-nuanced-green)
- ("ipython" modus-theme-nuanced-magenta)
- ("r" modus-theme-nuanced-cyan)
- ("yaml" modus-theme-nuanced-cyan)
- ("conf" modus-theme-nuanced-cyan)
- ("docker" modus-theme-nuanced-cyan)))
+ `(("emacs-lisp" modus-themes-nuanced-magenta)
+ ("elisp" modus-themes-nuanced-magenta)
+ ("clojure" modus-themes-nuanced-magenta)
+ ("clojurescript" modus-themes-nuanced-magenta)
+ ("c" modus-themes-nuanced-blue)
+ ("c++" modus-themes-nuanced-blue)
+ ("sh" modus-themes-nuanced-green)
+ ("shell" modus-themes-nuanced-green)
+ ("html" modus-themes-nuanced-yellow)
+ ("xml" modus-themes-nuanced-yellow)
+ ("css" modus-themes-nuanced-red)
+ ("scss" modus-themes-nuanced-red)
+ ("python" modus-themes-nuanced-green)
+ ("ipython" modus-themes-nuanced-magenta)
+ ("r" modus-themes-nuanced-cyan)
+ ("yaml" modus-themes-nuanced-cyan)
+ ("conf" modus-themes-nuanced-cyan)
+ ("docker" modus-themes-nuanced-cyan)))
`(org-src-block-faces '())))
"Custom variables for `modus-themes-theme'.")
(add-to-list 'custom-theme-load-path dir))))
(provide 'modus-themes)
+
+;; Local Variables:
+;; time-stamp-start: "Last-Modified:[ \t]+\\\\?[\"<]"
+;; time-stamp-end: "\\\\?[\">]"
+;; time-stamp-format: "%Y-%02m-%02d %02H:%02M:%02S %5z"
+;; End:
+
;;; modus-themes.el ends here
projects / emacs.git / commitdiff