diff options
| author | cashmere <cashmere@autistici.org> | 2026-07-11 08:52:32 +0200 |
|---|---|---|
| committer | cashmere <cashmere@autistici.org> | 2026-07-11 08:52:32 +0200 |
| commit | aaf69035d6e1c86cb72c1ea3455e5bcc4619d0b4 (patch) | |
| tree | 1cbd065eed9db7a77d9d1fab490609a519b079a2 /themes/tinty-theme.el | |
| parent | c74c3526fe719ff8127d17f44b67a33772adc334 (diff) | |
| download | emacs-aaf69035d6e1c86cb72c1ea3455e5bcc4619d0b4.tar.gz | |
feat(theme): overhaul tinty theme to tinted8/catppuccin palette
Diffstat (limited to 'themes/tinty-theme.el')
| -rw-r--r-- | themes/tinty-theme.el | 2156 |
1 files changed, 1205 insertions, 951 deletions
diff --git a/themes/tinty-theme.el b/themes/tinty-theme.el index 8888e01..dac7528 100644 --- a/themes/tinty-theme.el +++ b/themes/tinty-theme.el @@ -18,302 +18,363 @@ (deftheme tinty "Noctalia theme with proper color contrast.") -(let* (;; Core surface colors - (bg "#161616") - (fg "#f2f4f8") - (surface "#161616") - (on-surface "#f2f4f8") - (on-surface-variant "#dde1e6") - (surface-variant "#262626") - (surface-container "#262626") - (surface-container-low "#262626") - (surface-container-lowest "#161616") - (surface-container-high "#78a9ff") - (surface-container-highest "#78a9ff") +(let* (;; Tinted8 UI surface colors + (ui-bg "#1e1e2e") + (ui-fg "#cdd6f4") + (ui-fg-dim "#a6adc8") + ;; Use dim foreground for borders/muted chrome so they stay visible in + ;; light variants (the raw border color is nearly white on latte). + (ui-border "#a6adc8") + (ui-line-highlight "#232336") + (ui-bg-dark "#181825") + (ui-bg-light "#45475a") - ;; Accent colors (always readable on surface) - (primary "#33b1ff") - (secondary "#42be65") - (tertiary "#be95ff") - (err "#ee5396") + ;; Tinted8 UI accent/status colors + (ui-accent "#f38ba8") + (ui-link "#89b4fa") + (ui-info "#fab387") + (ui-error "#f38ba8") + (ui-success "#a6e3a1") + (ui-warning "#f9e2af") - ;; Container colors (for BACKGROUNDS only, never as foreground text) - (primary-container "#78a9ff") - (secondary-container "#78a9ff") - (tertiary-container "#78a9ff") - (err-container "#78a9ff") + ;; Tinted8 UI container colors (for BACKGROUNDS only) + (ui-selection-bg "#45475a") + (ui-selection-fg "#cdd6f4") + (ui-button-bg "#45475a") + (ui-button-fg "#cdd6f4") + (ui-tooltip-bg "#313244") + (ui-tooltip-fg "#cdd6f4") + (ui-active-text-bg "#9399b2") + (ui-active-text-fg "#cdd6f4") + (ui-search-bg "#94e2d5") + (ui-search-fg "#1e1e2e") - ;; On-color text (for text ON accent backgrounds) - (on-primary "#161616") - (on-secondary "#161616") - (on-tertiary "#161616") - (on-err "#161616") + ;; Tinted8 syntax colors + ;; Comments use dim foreground instead of the raw syntax-comment gray, + ;; which becomes almost invisible in light variants. + (syntax-comment "#a6adc8") + (syntax-constant "#fab387") + (syntax-function "#89b4fa") + (syntax-keyword "#cba6f7") + (syntax-string "#a6e3a1") + (syntax-type "#f9e2af") + ;; Give variables/imported names a distinct hue instead of blending into + ;; the default foreground. + (syntax-variable "#aa69f7") + (syntax-warning "#f6c5d3") + (syntax-preprocessor "#488dfd") + (syntax-annotation "#f9e2af") + (syntax-attribute "#c7dafa") + (syntax-number "#fab387") + (syntax-operator "#89dceb") - ;; On-container text (for text on container backgrounds) - (on-primary-container "#f2f4f8") - (on-secondary-container "#f2f4f8") - (on-tertiary-container "#f2f4f8") - (on-err-container "#f2f4f8") - - ;; Outline colors - (outline-color "#525252") - (outline-variant "#525252") - - ;; Shadow - (shadow "#000000") - - ;; Auto-lightness variants: lighten in dark mode, darken in light mode - ;; Used for heading levels 5-7, rainbow delimiters 5-7, terminal variants - (primary-variant "#33b1ff") - (secondary-variant "#42be65") - (tertiary-variant "#be95ff") - (err-variant "#ee5396")) + ;; Raw palette colors for rainbow headings, delimiters, terminal faces, + ;; and anywhere else we need a predictable hue cycle. + (pal-red "#f38ba8") + (pal-orange "#fab387") + (pal-yellow "#f9e2af") + (pal-green "#a6e3a1") + (pal-cyan "#94e2d5") + (pal-blue "#89b4fa") + (pal-magenta "#cba6f7") + (pal-gray "#9399b2") + (pal-white "#cdd6f4") + (pal-black "#1e1e2e")) (custom-theme-set-faces 'tinty ;; === Basic faces === - `(default ((t (:background ,bg :foreground ,fg)))) - `(cursor ((t (:background ,primary)))) - `(highlight ((t (:background ,surface-container-high)))) - `(region ((t (:background ,primary-container :foreground ,on-primary-container :extend t)))) - `(secondary-selection ((t (:background ,secondary-container :foreground ,on-secondary-container :extend t)))) - `(isearch ((t (:background ,tertiary-container :foreground ,on-tertiary-container :weight bold)))) - `(lazy-highlight ((t (:background ,secondary-container :foreground ,on-secondary-container)))) - `(vertical-border ((t (:foreground ,surface-variant)))) - `(border ((t (:background ,surface-variant :foreground ,surface-variant)))) - `(fringe ((t (:background ,surface :foreground ,outline-variant)))) - `(shadow ((t (:foreground ,outline-variant)))) - `(link ((t (:foreground ,primary :underline t)))) - `(link-visited ((t (:foreground ,tertiary :underline t)))) - `(success ((t (:foreground ,tertiary)))) - `(warning ((t (:foreground ,secondary)))) - `(error ((t (:foreground ,err)))) - `(match ((t (:background ,secondary-container :foreground ,on-secondary-container)))) + `(default ((t (:background ,ui-bg :foreground ,ui-fg)))) + `(cursor ((t (:background ,ui-accent)))) + `(highlight ((t (:background ,ui-bg-light)))) + `(region ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg :extend t)))) + `(secondary-selection ((t (:background ,ui-button-bg :foreground ,ui-button-fg :extend t)))) + `(isearch ((t (:background ,ui-search-bg :foreground ,ui-search-fg :weight bold)))) + `(lazy-highlight ((t (:background ,ui-button-bg :foreground ,ui-button-fg)))) + `(vertical-border ((t (:foreground ,ui-border)))) + `(border ((t (:background ,ui-border :foreground ,ui-border)))) + `(fringe ((t (:background ,ui-bg :foreground ,ui-border)))) + `(shadow ((t (:foreground ,ui-border)))) + `(link ((t (:foreground ,ui-link :underline t)))) + `(link-visited ((t (:foreground ,ui-info :underline t)))) + `(button ((t (:foreground ,ui-link :underline t)))) + `(success ((t (:foreground ,ui-success)))) + `(warning ((t (:foreground ,ui-warning)))) + `(error ((t (:foreground ,ui-error)))) + `(match ((t (:background ,ui-search-bg :foreground ,ui-search-fg :weight bold)))) + `(escape-glyph ((t (:foreground ,syntax-keyword)))) + `(homoglyph ((t (:foreground ,syntax-keyword)))) + `(fill-column-indicator ((t (:foreground ,ui-bg-light :weight normal)))) + `(minibuffer-nonselected ((t (:foreground ,ui-fg-dim :background ,ui-bg)))) - ;; === Font-lock === - `(font-lock-builtin-face ((t (:foreground ,primary)))) - `(font-lock-comment-face ((t (:foreground ,outline-color :slant italic)))) - `(font-lock-comment-delimiter-face ((t (:foreground ,outline-variant)))) - `(font-lock-constant-face ((t (:foreground ,tertiary :weight bold)))) - `(font-lock-doc-face ((t (:foreground ,on-surface-variant :slant italic)))) - `(font-lock-function-name-face ((t (:foreground ,primary :weight bold)))) - `(font-lock-keyword-face ((t (:foreground ,secondary :weight bold)))) - `(font-lock-string-face ((t (:foreground ,tertiary)))) - `(font-lock-type-face ((t (:foreground ,primary)))) - `(font-lock-variable-name-face ((t (:foreground ,on-surface)))) - `(font-lock-warning-face ((t (:foreground ,err :weight bold)))) - `(font-lock-preprocessor-face ((t (:foreground ,on-surface-variant)))) ;; FIX: was secondary_fixed_dim (invisible) - `(font-lock-negation-char-face ((t (:foreground ,tertiary)))) + ;; === Font-lock (driven by Tinted8 syntax properties) === + `(font-lock-builtin-face ((t (:foreground ,syntax-constant)))) + `(font-lock-comment-face ((t (:foreground ,syntax-comment :slant italic)))) + `(font-lock-comment-delimiter-face ((t (:foreground ,syntax-comment)))) + `(font-lock-constant-face ((t (:foreground ,syntax-constant :weight bold)))) + `(font-lock-doc-face ((t (:foreground ,syntax-comment :slant italic)))) + `(font-lock-doc-markup-face ((t (:foreground ,syntax-annotation)))) + `(font-lock-function-name-face ((t (:foreground ,syntax-function :weight bold)))) + `(font-lock-function-call-face ((t (:foreground ,syntax-function)))) + `(font-lock-keyword-face ((t (:foreground ,syntax-keyword :weight bold)))) + `(font-lock-string-face ((t (:foreground ,syntax-string)))) + `(font-lock-type-face ((t (:foreground ,syntax-type)))) + `(font-lock-variable-name-face ((t (:foreground ,syntax-variable)))) + `(font-lock-variable-use-face ((t (:foreground ,ui-fg)))) + `(font-lock-warning-face ((t (:foreground ,syntax-warning :weight bold)))) + `(font-lock-preprocessor-face ((t (:foreground ,syntax-preprocessor)))) + `(font-lock-preprocessor-char-face ((t (:foreground ,syntax-keyword :weight bold)))) + `(font-lock-negation-char-face ((t (:foreground ,syntax-constant)))) + `(font-lock-number-face ((t (:foreground ,syntax-number :weight bold)))) + `(font-lock-operator-face ((t (:foreground ,syntax-operator)))) + `(font-lock-property-name-face ((t (:foreground ,syntax-attribute)))) + `(font-lock-property-use-face ((t (:foreground ,syntax-attribute)))) + `(font-lock-bracket-face ((t (:foreground ,ui-fg-dim)))) + `(font-lock-delimiter-face ((t (:foreground ,ui-fg-dim)))) + `(font-lock-escape-face ((t (:foreground ,syntax-keyword)))) + `(font-lock-misc-punctuation-face ((t (:foreground ,ui-fg-dim)))) + `(font-lock-regexp-grouping-backslash ((t (:foreground ,syntax-keyword :weight bold)))) + `(font-lock-regexp-grouping-construct ((t (:foreground ,syntax-function :weight bold)))) ;; === Show paren === - `(show-paren-match ((t (:background ,primary-container :foreground ,on-primary-container :weight bold)))) - `(show-paren-mismatch ((t (:background ,err-container :foreground ,on-err-container :weight bold)))) + `(show-paren-match ((t (:background ,ui-bg-light :foreground ,ui-accent :weight bold)))) + `(show-paren-match-expression ((t (:background ,ui-button-bg)))) + `(show-paren-mismatch ((t (:background ,ui-active-text-bg :foreground ,ui-error :weight bold :underline t)))) ;; === Mode line === - `(mode-line ((t (:background ,surface-container-high :foreground ,on-surface :box nil)))) - `(mode-line-inactive ((t (:background ,surface :foreground ,on-surface-variant :box nil)))) - `(mode-line-buffer-id ((t (:foreground ,primary :weight bold)))) - `(mode-line-emphasis ((t (:foreground ,primary :weight bold)))) - `(mode-line-highlight ((t (:foreground ,primary :box nil)))) + `(mode-line ((t (:background ,ui-line-highlight :foreground ,ui-fg :box (:line-width -1 :color ,ui-border))))) + `(mode-line-inactive ((t (:background ,ui-bg-dark :foreground ,ui-fg-dim :box (:line-width -1 :color ,ui-border))))) + `(mode-line-buffer-id ((t (:foreground ,ui-accent :weight bold)))) + `(mode-line-emphasis ((t (:foreground ,ui-fg :weight bold)))) + `(mode-line-highlight ((t (:foreground ,ui-accent :box nil)))) ;; === Org source blocks === - `(org-block ((t (:background ,surface-container-low :extend t :inherit fixed-pitch)))) - `(org-block-begin-line ((t (:background ,surface-container-low :foreground ,outline-color :extend t :slant italic :inherit fixed-pitch)))) ;; FIX: was primary_fixed_dim - `(org-block-end-line ((t (:background ,surface-container-low :foreground ,outline-color :extend t :slant italic :inherit fixed-pitch)))) ;; FIX: was primary_fixed_dim - `(org-code ((t (:background ,surface-container-low :foreground ,tertiary :inherit fixed-pitch)))) - `(org-verbatim ((t (:background ,surface-container-low :foreground ,primary :inherit fixed-pitch)))) - `(org-meta-line ((t (:foreground ,outline-color :slant italic)))) + `(org-block ((t (:background ,ui-bg-dark :extend t :inherit fixed-pitch)))) + `(org-block-begin-line ((t (:background ,ui-bg-dark :foreground ,ui-border :extend t :slant italic :inherit fixed-pitch)))) ;; FIX: was primary_fixed_dim + `(org-block-end-line ((t (:background ,ui-bg-dark :foreground ,ui-border :extend t :slant italic :inherit fixed-pitch)))) ;; FIX: was primary_fixed_dim + `(org-code ((t (:background ,ui-bg-dark :foreground ,ui-info :inherit fixed-pitch)))) + `(org-verbatim ((t (:background ,ui-bg-dark :foreground ,ui-accent :inherit fixed-pitch)))) + `(org-meta-line ((t (:foreground ,ui-border :slant italic)))) - ;; === Org headings - FIXED: 4 distinct hues + variants, all surface-readable === - `(org-level-1 ((t (:foreground ,primary :weight bold :height 1.2)))) - `(org-level-2 ((t (:foreground ,secondary :weight bold :height 1.1)))) ;; FIX: was primary_container - `(org-level-3 ((t (:foreground ,tertiary :weight bold)))) ;; FIX: was secondary - `(org-level-4 ((t (:foreground ,err :weight bold)))) ;; FIX: was secondary_container - `(org-level-5 ((t (:foreground ,primary-variant :weight bold)))) ;; FIX: was tertiary - `(org-level-6 ((t (:foreground ,secondary-variant :weight bold)))) ;; FIX: was tertiary_container - `(org-level-7 ((t (:foreground ,tertiary-variant :weight bold)))) ;; FIX: was primary_fixed (= primary duplicate) - `(org-level-8 ((t (:foreground ,on-surface-variant :weight bold)))) ;; FIX: was primary_fixed_dim - `(org-document-title ((t (:foreground ,primary :weight bold :height 1.3)))) - `(org-document-info ((t (:foreground ,on-surface-variant)))) ;; FIX: was primary_container - `(org-todo ((t (:foreground ,err :weight bold)))) - `(org-done ((t (:foreground ,tertiary :weight bold)))) - `(org-headline-done ((t (:foreground ,on-surface-variant)))) - `(org-hide ((t (:foreground ,bg)))) - `(org-ellipsis ((t (:foreground ,tertiary :underline nil)))) - `(org-table ((t (:foreground ,secondary :inherit fixed-pitch)))) - `(org-formula ((t (:foreground ,tertiary :inherit fixed-pitch)))) - `(org-checkbox ((t (:foreground ,primary :weight bold :inherit fixed-pitch)))) - `(org-date ((t (:foreground ,secondary :underline t)))) - `(org-special-keyword ((t (:foreground ,on-surface-variant :slant italic)))) - `(org-tag ((t (:foreground ,outline-color :weight normal)))) + ;; === Org headings - rainbow cycle across the available palette === + `(org-level-1 ((t (:foreground ,pal-red :weight bold :height 1.2)))) + `(org-level-2 ((t (:foreground ,pal-orange :weight bold :height 1.1)))) + `(org-level-3 ((t (:foreground ,pal-yellow :weight bold)))) + `(org-level-4 ((t (:foreground ,pal-green :weight bold)))) + `(org-level-5 ((t (:foreground ,pal-cyan :weight bold)))) + `(org-level-6 ((t (:foreground ,pal-blue :weight bold)))) + `(org-level-7 ((t (:foreground ,pal-magenta :weight bold)))) + `(org-level-8 ((t (:foreground ,pal-gray :weight bold)))) + `(org-document-title ((t (:foreground ,pal-red :weight bold :height 1.3)))) + `(org-document-info ((t (:foreground ,ui-fg-dim)))) + `(org-todo ((t (:foreground ,pal-orange :weight bold)))) + `(org-done ((t (:foreground ,pal-green :weight bold)))) + `(org-headline-done ((t (:foreground ,ui-fg-dim)))) + `(org-hide ((t (:foreground ,ui-bg)))) + `(org-ellipsis ((t (:foreground ,pal-cyan :underline nil)))) + `(org-table ((t (:foreground ,ui-link :inherit fixed-pitch)))) + `(org-formula ((t (:foreground ,pal-orange :inherit fixed-pitch)))) + `(org-checkbox ((t (:foreground ,pal-blue :weight bold :inherit fixed-pitch)))) + `(org-date ((t (:foreground ,pal-cyan :underline t)))) + `(org-special-keyword ((t (:foreground ,ui-fg-dim :slant italic)))) + `(org-tag ((t (:foreground ,ui-border :weight normal)))) ;; === Magit === - `(magit-section-highlight ((t (:background ,surface-container-low)))) - `(magit-diff-hunk-heading ((t (:background ,surface-container :foreground ,on-surface-variant)))) - `(magit-diff-hunk-heading-highlight ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(magit-diff-context ((t (:foreground ,on-surface-variant)))) - `(magit-diff-context-highlight ((t (:background ,surface-container-low :foreground ,on-surface)))) - `(magit-diff-added ((t (:background ,tertiary-container :foreground ,on-tertiary-container)))) - `(magit-diff-added-highlight ((t (:background ,tertiary-container :foreground ,on-tertiary-container :weight bold)))) - `(magit-diff-removed ((t (:background ,err-container :foreground ,on-err-container)))) - `(magit-diff-removed-highlight ((t (:background ,err-container :foreground ,on-err-container :weight bold)))) - `(magit-hash ((t (:foreground ,outline-color)))) - `(magit-branch-local ((t (:foreground ,tertiary :weight bold)))) - `(magit-branch-remote ((t (:foreground ,primary :weight bold)))) + `(magit-section-highlight ((t (:background ,ui-bg-dark)))) + `(magit-diff-hunk-heading ((t (:background ,ui-line-highlight :foreground ,ui-fg-dim)))) + `(magit-diff-hunk-heading-highlight ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(magit-diff-context ((t (:foreground ,ui-fg-dim :extend t)))) + `(magit-diff-context-highlight ((t (:background ,ui-bg-dark :foreground ,ui-fg :extend t)))) + `(magit-diff-added ((t (:background ,ui-tooltip-bg :foreground ,ui-success :extend t)))) + `(magit-diff-added-highlight ((t (:background ,ui-tooltip-bg :foreground ,ui-success :weight bold :extend t)))) + `(magit-diff-removed ((t (:background ,ui-active-text-bg :foreground ,ui-error :extend t)))) + `(magit-diff-removed-highlight ((t (:background ,ui-active-text-bg :foreground ,ui-error :weight bold :extend t)))) + `(magit-diff-base ((t (:background ,ui-button-bg :foreground ,ui-link :extend t)))) + `(magit-diff-base-highlight ((t (:background ,ui-button-bg :foreground ,ui-link :weight bold :extend t)))) + `(magit-hash ((t (:foreground ,ui-border)))) + `(magit-branch-local ((t (:foreground ,pal-blue :weight bold)))) + `(magit-branch-remote ((t (:foreground ,pal-green :weight bold)))) ;; === Company === - `(company-tooltip ((t (:background ,surface-container :foreground ,on-surface)))) - `(company-tooltip-selection ((t (:background ,primary-container :foreground ,on-primary-container)))) - `(company-tooltip-common ((t (:foreground ,primary)))) - `(company-tooltip-common-selection ((t (:foreground ,on-primary-container :weight bold)))) - `(company-tooltip-annotation ((t (:foreground ,tertiary)))) - `(company-scrollbar-fg ((t (:background ,primary)))) - `(company-scrollbar-bg ((t (:background ,surface-variant)))) - `(company-preview ((t (:foreground ,on-surface-variant :slant italic)))) - `(company-preview-common ((t (:foreground ,primary :slant italic)))) + `(company-tooltip ((t (:background ,ui-line-highlight :foreground ,ui-fg)))) + `(company-tooltip-selection ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg)))) + `(company-tooltip-deprecated ((t (:foreground ,ui-fg-dim :strike-through t)))) + `(company-tooltip-search ((t (:foreground ,ui-error :weight bold)))) + `(company-tooltip-search-selection ((t (:foreground ,ui-error :background ,ui-selection-bg :weight bold)))) + `(company-tooltip-mouse ((t (:background ,ui-bg-light)))) + `(company-tooltip-common ((t (:foreground ,ui-link :weight bold)))) + `(company-tooltip-common-selection ((t (:foreground ,ui-link :weight bold)))) + `(company-tooltip-annotation ((t (:foreground ,ui-fg-dim)))) + `(company-tooltip-annotation-selection ((t (:foreground ,ui-fg-dim)))) + `(company-scrollbar-fg ((t (:background ,ui-border)))) + `(company-scrollbar-bg ((t (:background ,ui-bg-dark)))) + `(company-preview ((t (:foreground ,ui-fg-dim :slant italic)))) + `(company-preview-common ((t (:foreground ,ui-link :weight bold :slant italic)))) ;; === Ido === - `(ido-first-match ((t (:foreground ,primary :weight bold)))) - `(ido-only-match ((t (:foreground ,tertiary :weight bold)))) - `(ido-subdir ((t (:foreground ,secondary)))) - `(ido-indicator ((t (:foreground ,err)))) - `(ido-virtual ((t (:foreground ,outline-color)))) + `(ido-first-match ((t (:foreground ,ui-success :weight bold)))) + `(ido-only-match ((t (:foreground ,pal-cyan :weight bold)))) + `(ido-subdir ((t (:foreground ,pal-blue)))) + `(ido-incomplete-regexp ((t (:foreground ,ui-error)))) + `(ido-indicator ((t (:foreground ,ui-warning :background ,ui-bg)))) + `(ido-virtual ((t (:foreground ,ui-border)))) + + ;; === Completions (built-in) === + `(completions-annotations ((t (:foreground ,ui-fg-dim)))) + `(completions-common-part ((t (:foreground ,ui-link :weight bold)))) + `(completions-first-difference ((t (:foreground ,pal-orange)))) + `(completions-highlight ((t (:background ,ui-bg-light)))) + `(completions-group-title ((t (:foreground ,ui-accent :weight bold :slant italic)))) + `(completions-group-separator ((t (:foreground ,ui-border :strike-through t)))) + + ;; === Icomplete === + `(icomplete-first-match ((t (:foreground ,ui-success :weight bold)))) + `(icomplete-selected-match ((t (:background ,ui-bg-light)))) ;; === Helm === - `(helm-selection ((t (:background ,primary-container :foreground ,on-primary-container)))) - `(helm-match ((t (:foreground ,primary :weight bold)))) - `(helm-source-header ((t (:background ,surface-container-high :foreground ,primary :weight bold :height 1.1)))) - `(helm-candidate-number ((t (:foreground ,tertiary :weight bold)))) - `(helm-ff-directory ((t (:foreground ,primary :weight bold)))) - `(helm-ff-file ((t (:foreground ,on-surface)))) - `(helm-ff-executable ((t (:foreground ,tertiary)))) + `(helm-selection ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg)))) + `(helm-match ((t (:foreground ,ui-accent :weight bold)))) + `(helm-source-header ((t (:background ,ui-bg-light :foreground ,ui-accent :weight bold :height 1.1)))) + `(helm-candidate-number ((t (:foreground ,ui-info :weight bold)))) + `(helm-ff-directory ((t (:foreground ,ui-accent :weight bold)))) + `(helm-ff-file ((t (:foreground ,ui-fg)))) + `(helm-ff-executable ((t (:foreground ,ui-info)))) ;; === Corfu === - `(corfu-default ((t (:background ,surface-container :foreground ,on-surface)))) - `(corfu-current ((t (:background ,primary-container :foreground ,on-primary-container)))) + `(corfu-default ((t (:background ,ui-line-highlight :foreground ,ui-fg)))) + `(corfu-current ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg)))) + `(corfu-bar ((t (:background ,ui-border)))) + `(corfu-border ((t (:background ,ui-bg-dark)))) + `(corfu-annotations ((t (:foreground ,ui-fg-dim)))) + `(corfu-deprecated ((t (:foreground ,ui-fg-dim :strike-through t)))) ;; === Which-key === - `(which-key-key-face ((t (:foreground ,primary :weight bold)))) - `(which-key-separator-face ((t (:foreground ,outline-variant)))) - `(which-key-command-description-face ((t (:foreground ,on-surface)))) - `(which-key-group-description-face ((t (:foreground ,secondary)))) - `(which-key-special-key-face ((t (:foreground ,tertiary :weight bold)))) + `(which-key-key-face ((t (:foreground ,syntax-keyword :weight bold)))) + `(which-key-separator-face ((t (:foreground ,ui-border)))) + `(which-key-note-face ((t (:foreground ,ui-fg-dim)))) + `(which-key-command-description-face ((t (:foreground ,ui-fg)))) + `(which-key-group-description-face ((t (:foreground ,pal-blue)))) + `(which-key-local-map-description-face ((t (:foreground ,pal-cyan)))) + `(which-key-special-key-face ((t (:foreground ,pal-orange :weight bold)))) ;; === Line numbers === - `(line-number ((t (:foreground ,outline-variant :inherit fixed-pitch)))) - `(line-number-current-line ((t (:foreground ,primary :weight bold :inherit fixed-pitch)))) + `(line-number ((t (:foreground ,ui-border :inherit fixed-pitch)))) + `(line-number-current-line ((t (:foreground ,ui-accent :weight bold :inherit fixed-pitch)))) ;; === Parenthesis matching === - `(sp-show-pair-match-face ((t (:background ,primary-container :foreground ,on-primary-container)))) - `(sp-show-pair-mismatch-face ((t (:background ,err-container :foreground ,on-err-container)))) + `(sp-show-pair-match-face ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg)))) + `(sp-show-pair-mismatch-face ((t (:background ,ui-active-text-bg :foreground ,ui-active-text-fg)))) - ;; === Rainbow delimiters - FIXED: all levels use readable colors === - `(rainbow-delimiters-depth-1-face ((t (:foreground ,primary)))) - `(rainbow-delimiters-depth-2-face ((t (:foreground ,secondary)))) - `(rainbow-delimiters-depth-3-face ((t (:foreground ,tertiary)))) - `(rainbow-delimiters-depth-4-face ((t (:foreground ,err)))) - `(rainbow-delimiters-depth-5-face ((t (:foreground ,primary-variant)))) - `(rainbow-delimiters-depth-6-face ((t (:foreground ,secondary-variant)))) - `(rainbow-delimiters-depth-7-face ((t (:foreground ,tertiary-variant)))) ;; FIX: was primary_fixed_dim - `(rainbow-delimiters-depth-8-face ((t (:foreground ,on-surface-variant)))) ;; FIX: was secondary_fixed_dim - `(rainbow-delimiters-depth-9-face ((t (:foreground ,outline-color)))) ;; FIX: was tertiary_fixed_dim - `(rainbow-delimiters-mismatched-face ((t (:foreground ,err :weight bold)))) - `(rainbow-delimiters-unmatched-face ((t (:foreground ,err :weight bold)))) + ;; === Rainbow delimiters - rainbow cycle, mismatches highlighted === + `(rainbow-delimiters-depth-1-face ((t (:foreground ,pal-red)))) + `(rainbow-delimiters-depth-2-face ((t (:foreground ,pal-orange)))) + `(rainbow-delimiters-depth-3-face ((t (:foreground ,pal-yellow)))) + `(rainbow-delimiters-depth-4-face ((t (:foreground ,pal-green)))) + `(rainbow-delimiters-depth-5-face ((t (:foreground ,pal-cyan)))) + `(rainbow-delimiters-depth-6-face ((t (:foreground ,pal-blue)))) + `(rainbow-delimiters-depth-7-face ((t (:foreground ,pal-magenta)))) + `(rainbow-delimiters-depth-8-face ((t (:foreground ,pal-gray)))) + `(rainbow-delimiters-depth-9-face ((t (:foreground ,ui-fg-dim)))) + `(rainbow-delimiters-mismatched-face ((t (:box (:line-width -1 :color ,ui-error) :weight bold)))) + `(rainbow-delimiters-unmatched-face ((t (:box (:line-width -1 :color ,ui-error) :weight bold)))) + `(rainbow-delimiters-base-error-face ((t (:box (:line-width -1 :color ,ui-error) :weight bold)))) ;; === Dired === - `(dired-directory ((t (:foreground ,primary :weight bold)))) - `(dired-ignored ((t (:foreground ,outline-variant)))) - `(dired-flagged ((t (:foreground ,err)))) - `(dired-marked ((t (:foreground ,tertiary :weight bold)))) - `(dired-symlink ((t (:foreground ,secondary :slant italic)))) - `(dired-header ((t (:foreground ,primary :weight bold :height 1.1)))) + `(dired-directory ((t (:foreground ,ui-accent :weight bold)))) + `(dired-ignored ((t (:foreground ,ui-border)))) + `(dired-flagged ((t (:foreground ,ui-error)))) + `(dired-marked ((t (:foreground ,ui-info :weight bold)))) + `(dired-symlink ((t (:foreground ,ui-link :slant italic)))) + `(dired-header ((t (:foreground ,ui-accent :weight bold :height 1.1)))) - ;; === Terminal colors - FIXED: no container colors as foreground === - `(term-color-black ((t (:foreground ,surface-container-lowest :background ,surface-container-lowest)))) - `(term-color-red ((t (:foreground ,err :background ,err)))) - `(term-color-green ((t (:foreground ,tertiary :background ,tertiary)))) - `(term-color-yellow ((t (:foreground ,secondary :background ,secondary)))) - `(term-color-blue ((t (:foreground ,primary :background ,primary)))) - `(term-color-magenta ((t (:foreground ,err-variant :background ,err-variant)))) ;; FIX: was tertiary_container - `(term-color-cyan ((t (:foreground ,primary-variant :background ,primary-variant)))) ;; FIX: was secondary_container - `(term-color-white ((t (:foreground ,on-surface :background ,on-surface)))) + ;; === Terminal colors - mapped to the palette so they stay correct in both variants === + `(term-color-black ((t (:foreground ,ui-bg-dark :background ,ui-bg-dark)))) + `(term-color-red ((t (:foreground "#f38ba8" :background "#f38ba8")))) + `(term-color-green ((t (:foreground "#a6e3a1" :background "#a6e3a1")))) + `(term-color-yellow ((t (:foreground "#f9e2af" :background "#f9e2af")))) + `(term-color-blue ((t (:foreground "#89b4fa" :background "#89b4fa")))) + `(term-color-magenta ((t (:foreground "#cba6f7" :background "#cba6f7")))) + `(term-color-cyan ((t (:foreground "#94e2d5" :background "#94e2d5")))) + `(term-color-white ((t (:foreground "#cdd6f4" :background "#cdd6f4")))) ;; === EShell === - `(eshell-prompt ((t (:foreground ,primary :weight bold)))) - `(eshell-ls-directory ((t (:foreground ,primary :weight bold)))) - `(eshell-ls-symlink ((t (:foreground ,secondary :slant italic)))) - `(eshell-ls-executable ((t (:foreground ,tertiary)))) - `(eshell-ls-archive ((t (:foreground ,on-tertiary-container)))) - `(eshell-ls-backup ((t (:foreground ,outline-variant)))) - `(eshell-ls-clutter ((t (:foreground ,err)))) - `(eshell-ls-missing ((t (:foreground ,err)))) - `(eshell-ls-product ((t (:foreground ,on-surface-variant)))) - `(eshell-ls-readonly ((t (:foreground ,on-surface-variant)))) - `(eshell-ls-special ((t (:foreground ,secondary)))) - `(eshell-ls-unreadable ((t (:foreground ,outline-variant)))) + `(eshell-prompt ((t (:foreground ,ui-accent :weight bold)))) + `(eshell-ls-directory ((t (:foreground ,ui-accent :weight bold)))) + `(eshell-ls-symlink ((t (:foreground ,ui-link :slant italic)))) + `(eshell-ls-executable ((t (:foreground ,ui-info)))) + `(eshell-ls-archive ((t (:foreground ,ui-tooltip-fg)))) + `(eshell-ls-backup ((t (:foreground ,ui-border)))) + `(eshell-ls-clutter ((t (:foreground ,ui-error)))) + `(eshell-ls-missing ((t (:foreground ,ui-error)))) + `(eshell-ls-product ((t (:foreground ,ui-fg-dim)))) + `(eshell-ls-readonly ((t (:foreground ,ui-fg-dim)))) + `(eshell-ls-special ((t (:foreground ,ui-link)))) + `(eshell-ls-unreadable ((t (:foreground ,ui-border)))) - ;; === Markdown - FIXED: same heading fix as org === - `(markdown-header-face ((t (:foreground ,primary :weight bold)))) - `(markdown-header-face-1 ((t (:foreground ,primary :weight bold :height 1.2)))) - `(markdown-header-face-2 ((t (:foreground ,secondary :weight bold :height 1.1)))) ;; FIX: was primary_container - `(markdown-header-face-3 ((t (:foreground ,tertiary :weight bold)))) ;; FIX: was secondary - `(markdown-header-face-4 ((t (:foreground ,err :weight bold)))) ;; FIX: was secondary_container - `(markdown-inline-code-face ((t (:foreground ,tertiary :background ,surface-container-low :inherit fixed-pitch)))) - `(markdown-code-face ((t (:background ,surface-container-low :extend t :inherit fixed-pitch)))) - `(markdown-pre-face ((t (:background ,surface-container-low :inherit fixed-pitch)))) - `(markdown-table-face ((t (:foreground ,secondary :inherit fixed-pitch)))) + ;; === Markdown - rainbow heading cycle === + `(markdown-header-face ((t (:foreground ,pal-red :weight bold)))) + `(markdown-header-face-1 ((t (:foreground ,pal-red :weight bold :height 1.2)))) + `(markdown-header-face-2 ((t (:foreground ,pal-orange :weight bold :height 1.1)))) + `(markdown-header-face-3 ((t (:foreground ,pal-yellow :weight bold)))) + `(markdown-header-face-4 ((t (:foreground ,pal-green :weight bold)))) + `(markdown-header-face-5 ((t (:foreground ,pal-cyan :weight bold)))) + `(markdown-header-face-6 ((t (:foreground ,pal-blue :weight bold)))) + `(markdown-inline-code-face ((t (:foreground ,pal-cyan :background ,ui-bg-dark :inherit fixed-pitch)))) + `(markdown-code-face ((t (:background ,ui-bg-dark :extend t :inherit fixed-pitch)))) + `(markdown-pre-face ((t (:background ,ui-bg-dark :inherit fixed-pitch)))) + `(markdown-table-face ((t (:foreground ,ui-link :inherit fixed-pitch)))) ;; === Web mode === - `(web-mode-html-tag-face ((t (:foreground ,primary)))) - `(web-mode-html-tag-bracket-face ((t (:foreground ,on-surface-variant)))) - `(web-mode-html-attr-name-face ((t (:foreground ,secondary)))) - `(web-mode-html-attr-value-face ((t (:foreground ,tertiary)))) - `(web-mode-css-selector-face ((t (:foreground ,primary)))) - `(web-mode-css-property-name-face ((t (:foreground ,secondary)))) - `(web-mode-css-string-face ((t (:foreground ,tertiary)))) + `(web-mode-html-tag-face ((t (:foreground ,ui-accent)))) + `(web-mode-html-tag-bracket-face ((t (:foreground ,ui-fg-dim)))) + `(web-mode-html-attr-name-face ((t (:foreground ,ui-link)))) + `(web-mode-html-attr-value-face ((t (:foreground ,ui-info)))) + `(web-mode-css-selector-face ((t (:foreground ,ui-accent)))) + `(web-mode-css-property-name-face ((t (:foreground ,ui-link)))) + `(web-mode-css-string-face ((t (:foreground ,ui-info)))) ;; === Flycheck === - `(flycheck-error ((t (:underline (:style wave :color ,err))))) - `(flycheck-warning ((t (:underline (:style wave :color ,secondary))))) - `(flycheck-info ((t (:underline (:style wave :color ,tertiary))))) - `(flycheck-fringe-error ((t (:foreground ,err)))) - `(flycheck-fringe-warning ((t (:foreground ,secondary)))) - `(flycheck-fringe-info ((t (:foreground ,tertiary)))) + `(flycheck-error ((t (:underline (:style wave :color ,ui-error))))) + `(flycheck-warning ((t (:underline (:style wave :color ,ui-link))))) + `(flycheck-info ((t (:underline (:style wave :color ,ui-info))))) + `(flycheck-fringe-error ((t (:foreground ,ui-error)))) + `(flycheck-fringe-warning ((t (:foreground ,ui-link)))) + `(flycheck-fringe-info ((t (:foreground ,ui-info)))) ;; === Minibuffer === - `(minibuffer-prompt ((t (:foreground ,primary :weight bold)))) + `(minibuffer-prompt ((t (:foreground ,ui-accent :weight bold)))) ;; === LSP === - `(lsp-face-highlight-textual ((t (:background ,primary-container :foreground ,on-primary-container :weight bold)))) - `(lsp-face-highlight-read ((t (:background ,secondary-container :foreground ,on-secondary-container :weight bold)))) - `(lsp-face-highlight-write ((t (:background ,tertiary-container :foreground ,on-tertiary-container :weight bold)))) + `(lsp-face-highlight-textual ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg :weight bold)))) + `(lsp-face-highlight-read ((t (:background ,ui-button-bg :foreground ,ui-button-fg :weight bold)))) + `(lsp-face-highlight-write ((t (:background ,ui-tooltip-bg :foreground ,ui-tooltip-fg :weight bold)))) - ;; === Info titles - FIXED: same heading fix === - `(info-title-1 ((t (:foreground ,primary :weight bold :height 1.3)))) - `(info-title-2 ((t (:foreground ,secondary :weight bold :height 1.2)))) ;; FIX: was primary_container - `(info-title-3 ((t (:foreground ,tertiary :weight bold :height 1.1)))) ;; FIX: was secondary - `(info-title-4 ((t (:foreground ,err :weight bold)))) ;; FIX: was secondary_container - `(Info-quoted ((t (:foreground ,tertiary)))) - `(info-menu-header ((t (:foreground ,primary :weight bold)))) - `(info-menu-star ((t (:foreground ,primary)))) - `(info-node ((t (:foreground ,tertiary :weight bold)))) + ;; === Info titles - rainbow heading cycle === + `(info-title-1 ((t (:foreground ,pal-red :weight bold :height 1.3)))) + `(info-title-2 ((t (:foreground ,pal-orange :weight bold :height 1.2)))) + `(info-title-3 ((t (:foreground ,pal-yellow :weight bold :height 1.1)))) + `(info-title-4 ((t (:foreground ,pal-green :weight bold)))) + `(Info-quoted ((t (:foreground ,pal-cyan)))) + `(info-menu-header ((t (:foreground ,pal-red :weight bold)))) + `(info-menu-star ((t (:foreground ,pal-red)))) + `(info-node ((t (:foreground ,pal-cyan :weight bold)))) ;; === Tabs === - `(tab-bar ((t (:background ,surface-container-high :foreground ,on-surface :box nil)))) - `(tab-bar-tab ((t (:background ,surface-container-high :foreground ,on-surface :weight bold :box nil)))) - `(tab-bar-tab-inactive ((t (:background ,surface :foreground ,on-surface-variant :box nil)))) - `(tab-line ((t (:background ,surface-container-high :foreground ,on-surface :box nil)))) - `(tab-line-tab ((t (:background ,surface :foreground ,on-surface-variant :box nil)))) - `(tab-line-tab-current ((t (:background ,surface-container-high :foreground ,on-surface :weight bold :box nil)))) - `(tab-line-tab-inactive ((t (:background ,surface :foreground ,on-surface-variant :box nil)))) - `(tab-line-highlight ((t (:background ,surface-container-highest :foreground ,on-surface)))) - `(centaur-tabs-default ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(centaur-tabs-selected ((t (:background ,surface-container-high :foreground ,on-surface :weight bold)))) - `(centaur-tabs-unselected ((t (:background ,surface :foreground ,on-surface-variant)))) - `(centaur-tabs-selected-modified ((t (:background ,surface-container-high :foreground ,tertiary :weight bold)))) - `(centaur-tabs-unselected-modified ((t (:background ,surface :foreground ,tertiary)))) - `(centaur-tabs-active-bar-face ((t (:background ,primary)))) + `(tab-bar ((t (:background ,ui-bg-light :foreground ,ui-fg :box nil)))) + `(tab-bar-tab ((t (:background ,ui-bg-light :foreground ,ui-fg :weight bold :box nil)))) + `(tab-bar-tab-inactive ((t (:background ,ui-bg :foreground ,ui-fg-dim :box nil)))) + `(tab-line ((t (:background ,ui-bg-light :foreground ,ui-fg :box nil)))) + `(tab-line-tab ((t (:background ,ui-bg :foreground ,ui-fg-dim :box nil)))) + `(tab-line-tab-current ((t (:background ,ui-bg-light :foreground ,ui-fg :weight bold :box nil)))) + `(tab-line-tab-inactive ((t (:background ,ui-bg :foreground ,ui-fg-dim :box nil)))) + `(tab-line-highlight ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(centaur-tabs-default ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(centaur-tabs-selected ((t (:background ,ui-bg-light :foreground ,ui-fg :weight bold)))) + `(centaur-tabs-unselected ((t (:background ,ui-bg :foreground ,ui-fg-dim)))) + `(centaur-tabs-selected-modified ((t (:background ,ui-bg-light :foreground ,ui-info :weight bold)))) + `(centaur-tabs-unselected-modified ((t (:background ,ui-bg :foreground ,ui-info)))) + `(centaur-tabs-active-bar-face ((t (:background ,ui-accent)))) ;; === Fixed/variable pitch === `(fixed-pitch ((t (:family "monospace")))) @@ -324,909 +385,1102 @@ `(bold ((t (:weight bold)))) `(bold-italic ((t (:weight bold :slant italic)))) `(italic ((t (:slant italic)))) - `(bookmark-face ((t (:foreground ,primary :weight bold :underline t)))) - `(nobreak-space ((t (:background ,bg :foreground ,fg)))) - `(tooltip ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(trailing-whitespace ((t (:background ,err)))) - `(header-line ((t (:background ,surface-container-low :foreground ,on-surface)))) - `(window-divider ((t (:background ,outline-variant :foreground ,outline-variant)))) - `(window-divider-first-pixel ((t (:background ,outline-variant :foreground ,outline-variant)))) - `(window-divider-last-pixel ((t (:background ,outline-variant :foreground ,outline-variant)))) - - ;; === Font-lock (missing) === - `(font-lock-preprocessor-char-face ((t (:foreground ,on-surface-variant :weight bold)))) - `(font-lock-regexp-grouping-backslash ((t (:foreground ,tertiary :weight bold)))) - `(font-lock-regexp-grouping-construct ((t (:foreground ,secondary :weight bold)))) + `(bookmark-face ((t (:foreground ,ui-accent :weight bold :underline t)))) + `(nobreak-space ((t (:background ,ui-bg :foreground ,ui-fg)))) + `(tooltip ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(trailing-whitespace ((t (:background ,ui-error)))) + `(header-line ((t (:background ,ui-bg-dark :foreground ,ui-fg)))) + `(window-divider ((t (:background ,ui-border :foreground ,ui-border)))) + `(window-divider-first-pixel ((t (:background ,ui-border :foreground ,ui-border)))) + `(window-divider-last-pixel ((t (:background ,ui-border :foreground ,ui-border)))) - ;; === Isearch === - `(isearch ((t (:background ,tertiary-container :foreground ,on-tertiary-container :weight bold)))) - `(isearch-fail ((t (:background ,err-container :foreground ,on-err-container :weight bold)))) + ;; === Isearch (additional states) === + `(isearch-fail ((t (:background ,ui-active-text-bg :foreground ,ui-error :weight bold)))) + `(isearch-group-1 ((t (:background ,pal-blue :foreground ,ui-bg :weight bold)))) + `(isearch-group-2 ((t (:background ,pal-cyan :foreground ,ui-bg :weight bold)))) ;; === HL-line === - `(hl-line ((t (:background ,surface-container-low :extend t)))) + `(hl-line ((t (:background ,ui-bg-dark :extend t)))) ;; === HL-todo === - `(hl-todo ((t (:foreground ,err :weight bold)))) + `(hl-todo ((t (:foreground ,ui-error :weight bold)))) ;; === Trailing whitespace & linum === - `(linum ((t (:foreground ,outline-variant)))) - `(linum-relative-current-face ((t (:background ,surface-container :foreground ,on-surface)))) - `(linum-highlight-face ((t (:foreground ,on-surface :weight normal)))) + `(linum ((t (:foreground ,ui-border)))) + `(linum-relative-current-face ((t (:background ,ui-line-highlight :foreground ,ui-fg)))) + `(linum-highlight-face ((t (:foreground ,ui-fg :weight normal)))) - ;; === Outline (non-org) === - `(outline-1 ((t (:foreground ,primary :weight ultra-bold)))) - `(outline-2 ((t (:foreground ,secondary :weight bold)))) - `(outline-3 ((t (:foreground ,tertiary :weight bold)))) - `(outline-4 ((t (:foreground ,err)))) - `(outline-5 ((t (:foreground ,primary-variant)))) - `(outline-6 ((t (:foreground ,secondary-variant)))) - `(outline-7 ((t (:foreground ,tertiary-variant)))) - `(outline-8 ((t (:foreground ,on-surface-variant)))) - `(outline-minor-1 ((t (:foreground ,primary :weight ultra-bold)))) - `(outline-minor-2 ((t (:foreground ,secondary :weight bold)))) - `(outline-minor-3 ((t (:foreground ,tertiary :weight bold)))) - `(outline-minor-4 ((t (:foreground ,err)))) - `(outline-minor-5 ((t (:foreground ,primary-variant)))) - `(outline-minor-6 ((t (:foreground ,secondary-variant)))) - `(outline-minor-7 ((t (:foreground ,tertiary-variant)))) - `(outline-minor-8 ((t (:foreground ,on-surface-variant)))) + ;; === Outline (non-org) - rainbow cycle === + `(outline-1 ((t (:foreground ,pal-red :weight ultra-bold)))) + `(outline-2 ((t (:foreground ,pal-orange :weight bold)))) + `(outline-3 ((t (:foreground ,pal-yellow :weight bold)))) + `(outline-4 ((t (:foreground ,pal-green)))) + `(outline-5 ((t (:foreground ,pal-cyan)))) + `(outline-6 ((t (:foreground ,pal-blue)))) + `(outline-7 ((t (:foreground ,pal-magenta)))) + `(outline-8 ((t (:foreground ,pal-gray)))) + `(outline-minor-1 ((t (:foreground ,pal-red :weight ultra-bold)))) + `(outline-minor-2 ((t (:foreground ,pal-orange :weight bold)))) + `(outline-minor-3 ((t (:foreground ,pal-yellow :weight bold)))) + `(outline-minor-4 ((t (:foreground ,pal-green)))) + `(outline-minor-5 ((t (:foreground ,pal-cyan)))) + `(outline-minor-6 ((t (:foreground ,pal-blue)))) + `(outline-minor-7 ((t (:foreground ,pal-magenta)))) + `(outline-minor-8 ((t (:foreground ,pal-gray)))) ;; === Org (missing faces) === - `(org-archived ((t (:foreground ,outline-color)))) - `(org-block-background ((t (:background ,surface-container-low :extend t)))) - `(org-checkbox-statistics-done ((t (:foreground ,outline-color :weight bold)))) - `(org-checkbox-statistics-todo ((t (:foreground ,tertiary :weight bold)))) - `(org-default ((t (:background ,bg :foreground ,fg)))) - `(org-document-info-keyword ((t (:foreground ,outline-color)))) - `(org-footnote ((t (:foreground ,secondary :underline t)))) - `(org-latex-and-related ((t (:foreground ,on-surface-variant :weight bold)))) - `(org-link ((t (:foreground ,primary :underline t)))) - `(org-list-dt ((t (:foreground ,secondary :weight bold)))) - `(org-priority ((t (:foreground ,err)))) - `(org-property-value ((t (:foreground ,outline-color)))) - `(org-quote ((t (:background ,surface-container :slant italic :extend t)))) - `(org-warning ((t (:foreground ,secondary :weight bold)))) + `(org-archived ((t (:foreground ,ui-border)))) + `(org-block-background ((t (:background ,ui-bg-dark :extend t)))) + `(org-checkbox-statistics-done ((t (:foreground ,ui-border :weight bold)))) + `(org-checkbox-statistics-todo ((t (:foreground ,ui-info :weight bold)))) + `(org-default ((t (:background ,ui-bg :foreground ,ui-fg)))) + `(org-document-info-keyword ((t (:foreground ,ui-border)))) + `(org-footnote ((t (:foreground ,ui-link :underline t)))) + `(org-latex-and-related ((t (:foreground ,ui-fg-dim :weight bold)))) + `(org-link ((t (:foreground ,ui-accent :underline t)))) + `(org-list-dt ((t (:foreground ,ui-link :weight bold)))) + `(org-priority ((t (:foreground ,ui-error)))) + `(org-property-value ((t (:foreground ,ui-border)))) + `(org-quote ((t (:background ,ui-line-highlight :slant italic :extend t)))) + `(org-warning ((t (:foreground ,ui-link :weight bold)))) ;; === Org agenda === - `(org-agenda-clocking ((t (:background ,secondary-container :foreground ,on-secondary-container)))) - `(org-agenda-current-time ((t (:foreground ,tertiary :weight bold)))) - `(org-agenda-date ((t (:foreground ,primary :weight ultra-bold)))) - `(org-agenda-date-today ((t (:foreground ,primary :weight ultra-bold)))) - `(org-agenda-date-weekend ((t (:foreground ,primary :weight ultra-bold)))) - `(org-agenda-dimmed-todo-face ((t (:foreground ,outline-color)))) - `(org-agenda-done ((t (:foreground ,tertiary)))) - `(org-agenda-structure ((t (:foreground ,on-surface :weight ultra-bold)))) - `(org-imminent-deadline ((t (:foreground ,err)))) - `(org-scheduled ((t (:foreground ,on-surface)))) - `(org-scheduled-previously ((t (:foreground ,on-surface-variant)))) - `(org-scheduled-today ((t (:foreground ,on-surface)))) - `(org-sexp-date ((t (:foreground ,on-surface)))) - `(org-time-grid ((t (:foreground ,outline-variant)))) - `(org-upcoming-deadline ((t (:foreground ,on-surface)))) - `(org-upcoming-distant-deadline ((t (:foreground ,on-surface)))) - `(org-agenda-structure-filter ((t (:foreground ,primary :weight bold)))) + `(org-agenda-clocking ((t (:background ,ui-button-bg :foreground ,ui-button-fg)))) + `(org-agenda-current-time ((t (:foreground ,ui-info :weight bold)))) + `(org-agenda-date ((t (:foreground ,ui-accent :weight ultra-bold)))) + `(org-agenda-date-today ((t (:foreground ,ui-accent :weight ultra-bold)))) + `(org-agenda-date-weekend ((t (:foreground ,ui-accent :weight ultra-bold)))) + `(org-agenda-dimmed-todo-face ((t (:foreground ,ui-border)))) + `(org-agenda-done ((t (:foreground ,ui-info)))) + `(org-agenda-structure ((t (:foreground ,ui-fg :weight ultra-bold)))) + `(org-imminent-deadline ((t (:foreground ,ui-error)))) + `(org-scheduled ((t (:foreground ,ui-fg)))) + `(org-scheduled-previously ((t (:foreground ,ui-fg-dim)))) + `(org-scheduled-today ((t (:foreground ,ui-fg)))) + `(org-sexp-date ((t (:foreground ,ui-fg)))) + `(org-time-grid ((t (:foreground ,ui-border)))) + `(org-upcoming-deadline ((t (:foreground ,ui-fg)))) + `(org-upcoming-distant-deadline ((t (:foreground ,ui-fg)))) + `(org-agenda-structure-filter ((t (:foreground ,ui-accent :weight bold)))) ;; === Org habit === - `(org-habit-alert-face ((t (:weight bold :background ,secondary-container)))) - `(org-habit-alert-future-face ((t (:weight bold :background ,secondary-container)))) - `(org-habit-clear-face ((t (:weight bold :background ,surface-container-high)))) - `(org-habit-clear-future-face ((t (:weight bold :background ,surface-container)))) - `(org-habit-overdue-face ((t (:weight bold :background ,err-container)))) - `(org-habit-overdue-future-face ((t (:weight bold :background ,err-container)))) - `(org-habit-ready-face ((t (:weight bold :background ,tertiary-container)))) - `(org-habit-ready-future-face ((t (:weight bold :background ,tertiary-container)))) + `(org-habit-alert-face ((t (:weight bold :background ,ui-button-bg)))) + `(org-habit-alert-future-face ((t (:weight bold :background ,ui-button-bg)))) + `(org-habit-clear-face ((t (:weight bold :background ,ui-bg-light)))) + `(org-habit-clear-future-face ((t (:weight bold :background ,ui-line-highlight)))) + `(org-habit-overdue-face ((t (:weight bold :background ,ui-active-text-bg)))) + `(org-habit-overdue-future-face ((t (:weight bold :background ,ui-active-text-bg)))) + `(org-habit-ready-face ((t (:weight bold :background ,ui-tooltip-bg)))) + `(org-habit-ready-future-face ((t (:weight bold :background ,ui-tooltip-bg)))) ;; === Org journal === - `(org-journal-calendar-entry-face ((t (:foreground ,secondary :slant italic)))) - `(org-journal-calendar-scheduled-face ((t (:foreground ,err :slant italic)))) - `(org-journal-highlight ((t (:foreground ,tertiary)))) + `(org-journal-calendar-entry-face ((t (:foreground ,ui-link :slant italic)))) + `(org-journal-calendar-scheduled-face ((t (:foreground ,ui-error :slant italic)))) + `(org-journal-highlight ((t (:foreground ,ui-info)))) ;; === Org pomodoro === - `(org-pomodoro-mode-line ((t (:foreground ,err)))) - `(org-pomodoro-mode-line-overtime ((t (:foreground ,secondary :weight bold)))) + `(org-pomodoro-mode-line ((t (:foreground ,ui-error)))) + `(org-pomodoro-mode-line-overtime ((t (:foreground ,ui-link :weight bold)))) ;; === Org ref === - `(org-ref-acronym-face ((t (:foreground ,primary)))) - `(org-ref-cite-face ((t (:foreground ,secondary :weight light :underline t)))) - `(org-ref-glossary-face ((t (:foreground ,tertiary)))) - `(org-ref-label-face ((t (:foreground ,primary)))) - `(org-ref-ref-face ((t (:foreground ,err :underline t :weight bold)))) + `(org-ref-acronym-face ((t (:foreground ,ui-accent)))) + `(org-ref-cite-face ((t (:foreground ,ui-link :weight light :underline t)))) + `(org-ref-glossary-face ((t (:foreground ,ui-info)))) + `(org-ref-label-face ((t (:foreground ,ui-accent)))) + `(org-ref-ref-face ((t (:foreground ,ui-error :underline t :weight bold)))) ;; === Ace-window === - `(aw-leading-char-face ((t (:foreground ,err :height 500 :weight bold)))) - `(aw-background-face ((t (:foreground ,outline-color)))) + `(aw-leading-char-face ((t (:foreground ,ui-error :height 500 :weight bold)))) + `(aw-background-face ((t (:foreground ,ui-border)))) ;; === Alert === - `(alert-high-face ((t (:foreground ,secondary :weight bold)))) - `(alert-low-face ((t (:foreground ,outline-color)))) - `(alert-moderate-face ((t (:foreground ,on-surface-variant :weight bold)))) - `(alert-trivial-face ((t (:foreground ,outline-variant)))) - `(alert-urgent-face ((t (:foreground ,err :weight bold)))) + `(alert-high-face ((t (:foreground ,ui-link :weight bold)))) + `(alert-low-face ((t (:foreground ,ui-border)))) + `(alert-moderate-face ((t (:foreground ,ui-fg-dim :weight bold)))) + `(alert-trivial-face ((t (:foreground ,ui-border)))) + `(alert-urgent-face ((t (:foreground ,ui-error :weight bold)))) - ;; === ANSI colors === - `(ansi-color-black ((t (:foreground ,surface-container-lowest)))) - `(ansi-color-red ((t (:foreground ,err)))) - `(ansi-color-green ((t (:foreground ,tertiary)))) - `(ansi-color-yellow ((t (:foreground ,secondary)))) - `(ansi-color-blue ((t (:foreground ,primary)))) - `(ansi-color-magenta ((t (:foreground ,err-variant)))) - `(ansi-color-cyan ((t (:foreground ,primary-variant)))) - `(ansi-color-white ((t (:foreground ,on-surface)))) - `(ansi-color-bright-black ((t (:foreground ,surface-container-high)))) - `(ansi-color-bright-red ((t (:foreground ,err-variant)))) - `(ansi-color-bright-green ((t (:foreground ,tertiary-variant)))) - `(ansi-color-bright-yellow ((t (:foreground ,secondary-variant)))) - `(ansi-color-bright-blue ((t (:foreground ,primary-variant)))) - `(ansi-color-bright-magenta ((t (:foreground ,err)))) - `(ansi-color-bright-cyan ((t (:foreground ,tertiary)))) - `(ansi-color-bright-white ((t (:foreground ,fg)))) + ;; === ANSI colors - mapped to the palette so they stay correct in both variants === + `(ansi-color-black ((t (:foreground ,pal-black :background ,pal-black)))) + `(ansi-color-red ((t (:foreground ,pal-red :background ,pal-red)))) + `(ansi-color-green ((t (:foreground ,pal-green :background ,pal-green)))) + `(ansi-color-yellow ((t (:foreground ,pal-yellow :background ,pal-yellow)))) + `(ansi-color-blue ((t (:foreground ,pal-blue :background ,pal-blue)))) + `(ansi-color-magenta ((t (:foreground ,pal-magenta :background ,pal-magenta)))) + `(ansi-color-cyan ((t (:foreground ,pal-cyan :background ,pal-cyan)))) + `(ansi-color-white ((t (:foreground ,pal-white :background ,pal-white)))) + `(ansi-color-bright-black ((t (:foreground "#45475a" :background "#45475a")))) + `(ansi-color-bright-red ((t (:foreground "#f6c5d3" :background "#f6c5d3")))) + `(ansi-color-bright-green ((t (:foreground "#d4efd2" :background "#d4efd2")))) + `(ansi-color-bright-yellow ((t (:foreground "#fcf6e9" :background "#fcf6e9")))) + `(ansi-color-bright-blue ((t (:foreground "#c7dafa" :background "#c7dafa")))) + `(ansi-color-bright-magenta ((t (:foreground "#ece0fb" :background "#ece0fb")))) + `(ansi-color-bright-cyan ((t (:foreground "#c6ede6" :background "#c6ede6")))) + `(ansi-color-bright-white ((t (:foreground "#bac2de" :background "#bac2de")))) ;; === Anzu === - `(anzu-replace-highlight ((t (:background ,surface-container :foreground ,err :weight bold :strike-through t)))) - `(anzu-replace-to ((t (:background ,surface-container :foreground ,tertiary :weight bold)))) + `(anzu-replace-highlight ((t (:background ,ui-line-highlight :foreground ,ui-error :weight bold :strike-through t)))) + `(anzu-replace-to ((t (:background ,ui-line-highlight :foreground ,ui-info :weight bold)))) ;; === Avy === - `(avy-background-face ((t (:foreground ,outline-color)))) - `(avy-lead-face ((t (:background ,primary :foreground ,on-primary :weight bold)))) - `(avy-lead-face-0 ((t (:background ,primary :foreground ,on-primary :weight bold)))) - `(avy-lead-face-1 ((t (:background ,secondary :foreground ,on-secondary :weight bold)))) - `(avy-lead-face-2 ((t (:background ,tertiary :foreground ,on-tertiary :weight bold)))) + `(avy-background-face ((t (:foreground ,ui-border)))) + `(avy-lead-face ((t (:background ,ui-accent :foreground ,ui-bg :weight bold)))) + `(avy-lead-face-0 ((t (:background ,ui-accent :foreground ,ui-bg :weight bold)))) + `(avy-lead-face-1 ((t (:background ,ui-link :foreground ,ui-bg :weight bold)))) + `(avy-lead-face-2 ((t (:background ,ui-info :foreground ,ui-bg :weight bold)))) ;; === Compilation === - `(compilation-column-number ((t (:foreground ,outline-color)))) - `(compilation-error ((t (:foreground ,err :weight bold)))) - `(compilation-info ((t (:foreground ,tertiary)))) - `(compilation-line-number ((t (:foreground ,err)))) - `(compilation-mode-line-exit ((t (:foreground ,tertiary)))) - `(compilation-mode-line-fail ((t (:foreground ,err :weight bold)))) - `(compilation-warning ((t (:foreground ,secondary :slant italic)))) + `(compilation-column-number ((t (:foreground ,ui-border)))) + `(compilation-error ((t (:foreground ,ui-error :weight bold)))) + `(compilation-info ((t (:foreground ,ui-info)))) + `(compilation-line-number ((t (:foreground ,ui-error)))) + `(compilation-mode-line-exit ((t (:foreground ,ui-info)))) + `(compilation-mode-line-fail ((t (:foreground ,ui-error :weight bold)))) + `(compilation-warning ((t (:foreground ,ui-link :slant italic)))) ;; === Consult === - `(consult-file ((t (:foreground ,primary)))) - `(consult-separator ((t (:foreground ,outline-variant)))) - `(consult-notes-dir ((t (:foreground ,primary)))) - `(consult-notes-size ((t (:foreground ,secondary)))) - `(consult-notes-name ((t (:foreground ,primary)))) - `(consult-notes-time ((t (:foreground ,primary)))) + `(consult-file ((t (:foreground ,ui-fg-dim)))) + `(consult-bookmark ((t (:foreground ,pal-yellow)))) + `(consult-buffer ((t (:foreground ,ui-fg)))) + `(consult-line-number ((t (:foreground ,ui-fg-dim)))) + `(consult-line-number-prefix ((t (:foreground ,ui-border)))) + `(consult-separator ((t (:foreground ,ui-border)))) + `(consult-highlight-match ((t (:foreground ,pal-orange :weight bold)))) + `(consult-preview-match ((t (:background ,ui-bg-light)))) + `(consult-async-split ((t (:foreground ,syntax-keyword)))) + `(consult-key ((t (:foreground ,syntax-keyword)))) + `(consult-imenu-prefix ((t (:foreground ,ui-fg-dim)))) + `(consult-notes-dir ((t (:foreground ,ui-accent)))) + `(consult-notes-size ((t (:foreground ,ui-link)))) + `(consult-notes-name ((t (:foreground ,ui-accent)))) + `(consult-notes-time ((t (:foreground ,ui-accent)))) ;; === Counsel === - `(counsel-variable-documentation ((t (:foreground ,primary)))) + `(counsel-variable-documentation ((t (:foreground ,ui-accent)))) ;; === Custom widget === - `(custom-button ((t (:foreground ,on-surface :background ,surface-container :box (:line-width 3 :style released-button))))) - `(custom-button-mouse ((t (:foreground ,secondary :background ,surface-container :box (:line-width 3 :style released-button))))) - `(custom-button-pressed ((t (:foreground ,bg :background ,surface-container :box (:line-width 3 :style pressed-button))))) - `(custom-button-pressed-unraised ((t (:foreground ,primary :background ,bg :box (:line-width 3 :style pressed-button))))) - `(custom-button-unraised ((t (:foreground ,primary :background ,bg :box (:line-width 3 :style pressed-button))))) - `(custom-changed ((t (:foreground ,primary :background ,bg)))) - `(custom-comment ((t (:foreground ,on-surface :background ,surface-container)))) - `(custom-comment-tag ((t (:foreground ,outline-color)))) - `(custom-documentation ((t (:foreground ,on-surface)))) - `(custom-face-tag ((t (:foreground ,primary :weight bold)))) - `(custom-group-subtitle ((t (:foreground ,secondary :weight bold)))) - `(custom-group-tag ((t (:foreground ,primary :weight bold)))) - `(custom-group-tag-1 ((t (:foreground ,primary)))) - `(custom-invalid ((t (:foreground ,err)))) - `(custom-link ((t (:foreground ,primary :underline t)))) - `(custom-modified ((t (:foreground ,primary)))) - `(custom-rogue ((t (:foreground ,primary :box (:line-width 3))))) - `(custom-saved ((t (:foreground ,tertiary :weight bold)))) - `(custom-set ((t (:foreground ,secondary :background ,bg)))) - `(custom-state ((t (:foreground ,tertiary)))) - `(custom-themed ((t (:foreground ,secondary :background ,bg)))) - `(custom-variable-button ((t (:foreground ,tertiary :underline t)))) - `(custom-variable-obsolete ((t (:foreground ,outline-color :background ,bg)))) - `(custom-variable-tag ((t (:foreground ,primary :underline t :extend unspecified)))) - `(custom-visibility ((t (:foreground ,secondary :height 0.8 :underline t)))) + `(custom-button ((t (:foreground ,ui-fg :background ,ui-line-highlight :box (:line-width 3 :style released-button))))) + `(custom-button-mouse ((t (:foreground ,ui-link :background ,ui-line-highlight :box (:line-width 3 :style released-button))))) + `(custom-button-pressed ((t (:foreground ,ui-bg :background ,ui-line-highlight :box (:line-width 3 :style pressed-button))))) + `(custom-button-pressed-unraised ((t (:foreground ,ui-accent :background ,ui-bg :box (:line-width 3 :style pressed-button))))) + `(custom-button-unraised ((t (:foreground ,ui-accent :background ,ui-bg :box (:line-width 3 :style pressed-button))))) + `(custom-changed ((t (:foreground ,ui-accent :background ,ui-bg)))) + `(custom-comment ((t (:foreground ,ui-fg :background ,ui-line-highlight)))) + `(custom-comment-tag ((t (:foreground ,ui-border)))) + `(custom-documentation ((t (:foreground ,ui-fg)))) + `(custom-face-tag ((t (:foreground ,ui-accent :weight bold)))) + `(custom-group-subtitle ((t (:foreground ,ui-link :weight bold)))) + `(custom-group-tag ((t (:foreground ,ui-accent :weight bold)))) + `(custom-group-tag-1 ((t (:foreground ,ui-accent)))) + `(custom-invalid ((t (:foreground ,ui-error)))) + `(custom-link ((t (:foreground ,ui-accent :underline t)))) + `(custom-modified ((t (:foreground ,ui-accent)))) + `(custom-rogue ((t (:foreground ,ui-accent :box (:line-width 3))))) + `(custom-saved ((t (:foreground ,ui-info :weight bold)))) + `(custom-set ((t (:foreground ,ui-link :background ,ui-bg)))) + `(custom-state ((t (:foreground ,ui-info)))) + `(custom-themed ((t (:foreground ,ui-link :background ,ui-bg)))) + `(custom-variable-button ((t (:foreground ,ui-info :underline t)))) + `(custom-variable-obsolete ((t (:foreground ,ui-border :background ,ui-bg)))) + `(custom-variable-tag ((t (:foreground ,ui-accent :underline t :extend unspecified)))) + `(custom-visibility ((t (:foreground ,ui-link :height 0.8 :underline t)))) + + ;; === Built-in packages (batppuccin-inspired additions) === + ;; === Calendar === + `(calendar-today ((t (:foreground ,pal-blue :weight bold :underline t)))) + `(calendar-weekend-header ((t (:foreground ,ui-error)))) + `(calendar-weekday-header ((t (:foreground ,pal-cyan)))) + `(calendar-month-header ((t (:foreground ,syntax-keyword :weight bold)))) + `(holiday ((t (:foreground ,pal-orange)))) + `(diary ((t (:foreground ,pal-yellow)))) + + ;; === Eglot === + `(eglot-highlight-symbol-face ((t (:background ,ui-bg-light :weight bold)))) + `(eglot-diagnostic-tag-unnecessary-face ((t (:foreground ,ui-fg-dim :underline (:style wave :color ,ui-border))))) + `(eglot-diagnostic-tag-deprecated-face ((t (:foreground ,ui-fg-dim :strike-through ,ui-border)))) + `(eglot-inlay-hint-face ((t (:foreground ,ui-fg-dim :height 0.9)))) + + ;; === EPA (EasyPG) === + `(epa-field-body ((t (:foreground ,ui-fg-dim :slant italic)))) + `(epa-field-name ((t (:foreground ,pal-blue :weight bold)))) + `(epa-mark ((t (:foreground ,pal-orange :weight bold)))) + `(epa-string ((t (:foreground ,syntax-string)))) + `(epa-validity-disabled ((t (:foreground ,ui-error :slant italic)))) + `(epa-validity-high ((t (:foreground ,ui-success :weight bold)))) + `(epa-validity-low ((t (:foreground ,ui-fg-dim)))) + `(epa-validity-medium ((t (:foreground ,ui-warning)))) + + ;; === Proced === + `(proced-mark ((t (:foreground ,pal-orange :weight bold)))) + `(proced-marked ((t (:foreground ,syntax-keyword :weight bold)))) + `(proced-sort-header ((t (:foreground ,pal-blue :weight bold :underline t)))) + + ;; === Speedbar === + `(speedbar-button-face ((t (:foreground ,ui-success)))) + `(speedbar-directory-face ((t (:foreground ,pal-blue :weight bold)))) + `(speedbar-file-face ((t (:foreground ,ui-fg)))) + `(speedbar-highlight-face ((t (:background ,ui-bg-light)))) + `(speedbar-selected-face ((t (:foreground ,pal-orange :weight bold)))) + `(speedbar-separator-face ((t (:foreground ,ui-border :background ,ui-bg-dark)))) + `(speedbar-tag-face ((t (:foreground ,pal-cyan)))) + + ;; === VC === + `(vc-state-base ((t (:foreground ,ui-success)))) + `(vc-conflict-state ((t (:foreground ,ui-error :weight bold)))) + `(vc-edited-state ((t (:foreground ,ui-warning)))) + `(vc-locally-added-state ((t (:foreground ,ui-success)))) + `(vc-locked-state ((t (:foreground ,pal-orange :weight bold)))) + `(vc-missing-state ((t (:foreground ,ui-error)))) + `(vc-needs-update-state ((t (:foreground ,pal-orange)))) + `(vc-removed-state ((t (:foreground ,ui-error)))) + `(vc-up-to-date-state ((t (:foreground ,ui-success)))) + + ;; === Xref === + `(xref-file-header ((t (:foreground ,pal-blue :weight bold)))) + `(xref-line-number ((t (:foreground ,ui-fg-dim)))) + `(xref-match ((t (:foreground ,pal-orange :weight bold)))) + + ;; === Man / Woman === + `(Man-overstrike ((t (:foreground ,pal-blue :weight bold)))) + `(Man-underline ((t (:foreground ,pal-cyan :underline t)))) + `(Man-reverse ((t (:foreground ,ui-bg :background ,ui-fg)))) + `(woman-bold ((t (:foreground ,pal-blue :weight bold)))) + `(woman-italic ((t (:foreground ,syntax-keyword :slant italic)))) + + ;; === Pulse === + `(pulse-highlight-start-face ((t (:background ,ui-bg-light)))) ;; === Diff === - `(diff-added ((t (:foreground ,on-tertiary-container :background ,tertiary-container :extend t)))) - `(diff-indicator-added ((t (:foreground ,on-tertiary-container :weight bold :background ,tertiary-container :extend t)))) - `(diff-refine-added ((t (:foreground ,on-tertiary-container :weight bold :background ,tertiary-container :extend t)))) - `(diff-changed ((t (:foreground ,on-secondary-container :background ,secondary-container :extend t)))) - `(diff-indicator-changed ((t (:foreground ,on-secondary-container :weight bold :background ,secondary-container :extend t)))) - `(diff-refine-changed ((t (:foreground ,on-secondary-container :weight bold :background ,secondary-container :extend t)))) - `(diff-removed ((t (:foreground ,on-err-container :background ,err-container :extend t)))) - `(diff-indicator-removed ((t (:foreground ,on-err-container :weight bold :background ,err-container :extend t)))) - `(diff-refine-removed ((t (:foreground ,on-err-container :weight bold :background ,err-container :extend t)))) - `(diff-header ((t (:foreground ,on-surface-variant)))) - `(diff-file-header ((t (:foreground ,primary :weight bold)))) - `(diff-hunk-header ((t (:foreground ,on-primary-container :background ,primary-container :extend t)))) - `(diff-function ((t (:foreground ,on-primary-container :background ,primary-container :extend t)))) + `(diff-added ((t (:foreground ,ui-success :background ,ui-tooltip-bg :extend t)))) + `(diff-indicator-added ((t (:foreground ,ui-success :weight bold :background ,ui-tooltip-bg :extend t)))) + `(diff-refine-added ((t (:foreground ,ui-success :weight bold :background ,ui-tooltip-bg :extend t)))) + `(diff-changed ((t (:foreground ,ui-link :background ,ui-button-bg :extend t)))) + `(diff-indicator-changed ((t (:foreground ,ui-link :weight bold :background ,ui-button-bg :extend t)))) + `(diff-refine-changed ((t (:foreground ,ui-link :weight bold :background ,ui-button-bg :extend t)))) + `(diff-removed ((t (:foreground ,ui-error :background ,ui-active-text-bg :extend t)))) + `(diff-indicator-removed ((t (:foreground ,ui-error :weight bold :background ,ui-active-text-bg :extend t)))) + `(diff-refine-removed ((t (:foreground ,ui-error :weight bold :background ,ui-active-text-bg :extend t)))) + `(diff-header ((t (:foreground ,ui-fg-dim :background ,ui-bg-dark :extend t)))) + `(diff-file-header ((t (:foreground ,pal-blue :background ,ui-bg-dark :weight bold :extend t)))) + `(diff-hunk-header ((t (:foreground ,pal-orange :background ,ui-bg-dark :extend t)))) + `(diff-function ((t (:foreground ,ui-selection-fg :background ,ui-selection-bg :extend t)))) ;; === Diff-hl === - `(diff-hl-change ((t (:foreground ,secondary :background ,secondary-container)))) - `(diff-hl-delete ((t (:foreground ,err :background ,err-container)))) - `(diff-hl-insert ((t (:foreground ,tertiary :background ,tertiary-container)))) + `(diff-hl-change ((t (:foreground ,ui-link :background ,ui-button-bg)))) + `(diff-hl-delete ((t (:foreground ,ui-error :background ,ui-active-text-bg)))) + `(diff-hl-insert ((t (:foreground ,ui-info :background ,ui-tooltip-bg)))) ;; === Dired (missing faces) === - `(dired-mark ((t (:foreground ,secondary :weight bold)))) - `(dired-perm-write ((t (:foreground ,err :underline t)))) - `(dired-warning ((t (:foreground ,secondary)))) + `(dired-mark ((t (:foreground ,ui-link :weight bold)))) + `(dired-perm-write ((t (:foreground ,ui-error :underline t)))) + `(dired-warning ((t (:foreground ,ui-link)))) ;; === Diredfl === - `(diredfl-autofile-name ((t (:foreground ,outline-variant)))) - `(diredfl-compressed-file-name ((t (:foreground ,primary)))) - `(diredfl-compressed-file-suffix ((t (:foreground ,secondary)))) - `(diredfl-date-time ((t (:foreground ,primary :weight light)))) - `(diredfl-deletion ((t (:foreground ,err :weight bold)))) - `(diredfl-deletion-file-name ((t (:foreground ,err)))) - `(diredfl-dir-heading ((t (:foreground ,primary :weight bold)))) - `(diredfl-dir-name ((t (:foreground ,primary)))) - `(diredfl-dir-priv ((t (:foreground ,primary)))) - `(diredfl-exec-priv ((t (:foreground ,err)))) - `(diredfl-executable-tag ((t (:foreground ,tertiary)))) - `(diredfl-file-name ((t (:foreground ,on-surface)))) - `(diredfl-file-suffix ((t (:foreground ,on-surface-variant)))) - `(diredfl-flag-mark ((t (:foreground ,on-secondary-container :background ,secondary-container :weight bold)))) - `(diredfl-flag-mark-line ((t (:background ,secondary-container)))) - `(diredfl-ignored-file-name ((t (:foreground ,outline-color)))) - `(diredfl-link-priv ((t (:foreground ,primary)))) - `(diredfl-no-priv ((t (:foreground ,on-surface)))) - `(diredfl-number ((t (:foreground ,primary)))) - `(diredfl-other-priv ((t (:foreground ,tertiary)))) - `(diredfl-rare-priv ((t (:foreground ,on-surface)))) - `(diredfl-read-priv ((t (:foreground ,secondary)))) - `(diredfl-symlink ((t (:foreground ,secondary)))) - `(diredfl-tagged-autofile-name ((t (:foreground ,outline-color)))) - `(diredfl-write-priv ((t (:foreground ,err)))) + `(diredfl-file-name ((t (:inherit default)))) + `(diredfl-file-suffix ((t (:inherit default)))) + `(diredfl-autofile-name ((t (:foreground ,ui-border)))) + `(diredfl-compressed-file-name ((t (:foreground ,pal-green)))) + `(diredfl-compressed-file-suffix ((t (:foreground ,pal-green)))) + `(diredfl-date-time ((t (:foreground ,ui-fg-dim :weight light)))) + `(diredfl-deletion ((t (:foreground ,ui-error :weight bold)))) + `(diredfl-deletion-file-name ((t (:foreground ,ui-error)))) + `(diredfl-dir-heading ((t (:inherit dired-header)))) + `(diredfl-dir-name ((t (:inherit dired-directory)))) + `(diredfl-dir-priv ((t (:inherit dired-directory)))) + `(diredfl-exec-priv ((t (:foreground ,ui-error)))) + `(diredfl-executable-tag ((t (:foreground ,ui-error)))) + `(diredfl-flag-mark ((t (:inherit dired-mark)))) + `(diredfl-flag-mark-line ((t (:inherit dired-marked)))) + `(diredfl-ignored-file-name ((t (:inherit dired-ignored)))) + `(diredfl-link-priv ((t (:inherit dired-symlink)))) + `(diredfl-no-priv ((t (:foreground ,ui-fg-dim)))) + `(diredfl-number ((t (:foreground ,pal-yellow)))) + `(diredfl-other-priv ((t (:inherit diredfl-exec-priv)))) + `(diredfl-rare-priv ((t (:inherit diredfl-exec-priv)))) + `(diredfl-read-priv ((t (:foreground ,pal-cyan)))) + `(diredfl-symlink ((t (:inherit dired-symlink)))) + `(diredfl-tagged-autofile-name ((t (:foreground ,pal-magenta)))) + `(diredfl-write-priv ((t (:foreground ,ui-error)))) ;; === Dired-subtree === - `(dired-subtree-depth-1-face ((t (:background ,surface-container-low)))) - `(dired-subtree-depth-2-face ((t (:background ,surface-container-low)))) - `(dired-subtree-depth-3-face ((t (:background ,surface-container-low)))) - `(dired-subtree-depth-4-face ((t (:background ,surface-container-low)))) - `(dired-subtree-depth-5-face ((t (:background ,surface-container-low)))) - `(dired-subtree-depth-6-face ((t (:background ,surface-container-low)))) + `(dired-subtree-depth-1-face ((t (:background ,ui-bg-dark)))) + `(dired-subtree-depth-2-face ((t (:background ,ui-bg-dark)))) + `(dired-subtree-depth-3-face ((t (:background ,ui-bg-dark)))) + `(dired-subtree-depth-4-face ((t (:background ,ui-bg-dark)))) + `(dired-subtree-depth-5-face ((t (:background ,ui-bg-dark)))) + `(dired-subtree-depth-6-face ((t (:background ,ui-bg-dark)))) ;; === Dired-k === - `(dired-k-added ((t (:foreground ,tertiary :weight bold)))) - `(dired-k-commited ((t (:foreground ,tertiary :weight bold)))) - `(dired-k-directory ((t (:foreground ,primary :weight bold)))) - `(dired-k-ignored ((t (:foreground ,outline-color :weight bold)))) - `(dired-k-modified ((t (:foreground ,secondary :weight bold)))) - `(dired-k-untracked ((t (:foreground ,secondary :weight bold)))) + `(dired-k-added ((t (:foreground ,ui-info :weight bold)))) + `(dired-k-commited ((t (:foreground ,ui-info :weight bold)))) + `(dired-k-directory ((t (:foreground ,ui-accent :weight bold)))) + `(dired-k-ignored ((t (:foreground ,ui-border :weight bold)))) + `(dired-k-modified ((t (:foreground ,ui-link :weight bold)))) + `(dired-k-untracked ((t (:foreground ,ui-link :weight bold)))) ;; === Doom-modeline === - `(doom-modeline-bar ((t (:foreground ,primary)))) - `(doom-modeline-buffer-major-mode ((t (:foreground ,primary)))) - `(doom-modeline-buffer-path ((t (:foreground ,primary)))) - `(doom-modeline-eldoc-bar ((t (:background ,tertiary)))) - `(doom-modeline-evil-emacs-state ((t (:foreground ,secondary :weight bold)))) - `(doom-modeline-evil-insert-state ((t (:foreground ,err :weight bold)))) - `(doom-modeline-evil-motion-state ((t (:foreground ,primary :weight bold)))) - `(doom-modeline-evil-normal-state ((t (:foreground ,tertiary :weight bold)))) - `(doom-modeline-evil-operator-state ((t (:foreground ,primary :weight bold)))) - `(doom-modeline-evil-replace-state ((t (:foreground ,secondary :weight bold)))) - `(doom-modeline-evil-visual-state ((t (:foreground ,secondary :weight bold)))) - `(doom-modeline-highlight ((t (:foreground ,primary)))) - `(doom-modeline-input-method ((t (:foreground ,primary)))) - `(doom-modeline-panel ((t (:foreground ,primary)))) - `(doom-modeline-project-dir ((t (:foreground ,primary :weight bold)))) - `(doom-modeline-project-root-dir ((t (:foreground ,primary)))) + `(doom-modeline-bar ((t (:foreground ,ui-accent)))) + `(doom-modeline-buffer-major-mode ((t (:foreground ,ui-accent)))) + `(doom-modeline-buffer-path ((t (:foreground ,ui-accent)))) + `(doom-modeline-eldoc-bar ((t (:background ,ui-info)))) + `(doom-modeline-evil-emacs-state ((t (:foreground ,ui-link :weight bold)))) + `(doom-modeline-evil-insert-state ((t (:foreground ,ui-error :weight bold)))) + `(doom-modeline-evil-motion-state ((t (:foreground ,ui-accent :weight bold)))) + `(doom-modeline-evil-normal-state ((t (:foreground ,ui-info :weight bold)))) + `(doom-modeline-evil-operator-state ((t (:foreground ,ui-accent :weight bold)))) + `(doom-modeline-evil-replace-state ((t (:foreground ,ui-link :weight bold)))) + `(doom-modeline-evil-visual-state ((t (:foreground ,ui-link :weight bold)))) + `(doom-modeline-highlight ((t (:foreground ,ui-accent)))) + `(doom-modeline-input-method ((t (:foreground ,ui-accent)))) + `(doom-modeline-panel ((t (:foreground ,ui-accent)))) + `(doom-modeline-project-dir ((t (:foreground ,ui-accent :weight bold)))) + `(doom-modeline-project-root-dir ((t (:foreground ,ui-accent)))) ;; === Ediff === - `(ediff-current-diff-A ((t (:foreground ,on-err-container :background ,err-container :extend t)))) - `(ediff-current-diff-B ((t (:foreground ,on-tertiary-container :background ,tertiary-container :extend t)))) - `(ediff-current-diff-C ((t (:foreground ,on-secondary-container :background ,secondary-container :extend t)))) - `(ediff-even-diff-A ((t (:background ,surface-container-low :extend t)))) - `(ediff-even-diff-B ((t (:background ,surface-container-low :extend t)))) - `(ediff-even-diff-C ((t (:background ,surface-container-low :extend t)))) - `(ediff-fine-diff-A ((t (:background ,err-container :weight bold :underline t :extend t)))) - `(ediff-fine-diff-B ((t (:background ,tertiary-container :weight bold :underline t :extend t)))) - `(ediff-fine-diff-C ((t (:background ,secondary-container :weight bold :underline t :extend t)))) - `(ediff-odd-diff-A ((t (:background ,surface-container-low :extend t)))) - `(ediff-odd-diff-B ((t (:background ,surface-container-low :extend t)))) - `(ediff-odd-diff-C ((t (:background ,surface-container-low :extend t)))) + `(ediff-current-diff-A ((t (:foreground ,ui-active-text-fg :background ,ui-active-text-bg :extend t)))) + `(ediff-current-diff-B ((t (:foreground ,ui-tooltip-fg :background ,ui-tooltip-bg :extend t)))) + `(ediff-current-diff-C ((t (:foreground ,ui-button-fg :background ,ui-button-bg :extend t)))) + `(ediff-even-diff-A ((t (:background ,ui-bg-dark :extend t)))) + `(ediff-even-diff-B ((t (:background ,ui-bg-dark :extend t)))) + `(ediff-even-diff-C ((t (:background ,ui-bg-dark :extend t)))) + `(ediff-fine-diff-A ((t (:background ,ui-active-text-bg :weight bold :underline t :extend t)))) + `(ediff-fine-diff-B ((t (:background ,ui-tooltip-bg :weight bold :underline t :extend t)))) + `(ediff-fine-diff-C ((t (:background ,ui-button-bg :weight bold :underline t :extend t)))) + `(ediff-odd-diff-A ((t (:background ,ui-bg-dark :extend t)))) + `(ediff-odd-diff-B ((t (:background ,ui-bg-dark :extend t)))) + `(ediff-odd-diff-C ((t (:background ,ui-bg-dark :extend t)))) ;; === Eldoc === - `(eldoc-highlight-function-argument ((t (:foreground ,primary :weight bold)))) + `(eldoc-highlight-function-argument ((t (:foreground ,ui-accent :weight bold)))) ;; === Elfeed === - `(elfeed-log-debug-level-face ((t (:foreground ,outline-color)))) - `(elfeed-log-error-level-face ((t (:foreground ,err)))) - `(elfeed-log-info-level-face ((t (:foreground ,tertiary)))) - `(elfeed-log-warn-level-face ((t (:foreground ,secondary)))) - `(elfeed-search-date-face ((t (:foreground ,primary)))) - `(elfeed-search-feed-face ((t (:foreground ,primary)))) - `(elfeed-search-filter-face ((t (:foreground ,primary)))) - `(elfeed-search-tag-face ((t (:foreground ,outline-color)))) - `(elfeed-search-title-face ((t (:foreground ,outline-color)))) - `(elfeed-search-unread-count-face ((t (:foreground ,secondary)))) - `(elfeed-search-unread-title-face ((t (:foreground ,on-surface :weight bold)))) + `(elfeed-log-debug-level-face ((t (:foreground ,syntax-keyword)))) + `(elfeed-log-error-level-face ((t (:foreground ,ui-error)))) + `(elfeed-log-info-level-face ((t (:foreground ,pal-cyan)))) + `(elfeed-log-warn-level-face ((t (:foreground ,ui-warning)))) + `(elfeed-search-date-face ((t (:foreground ,pal-cyan)))) + `(elfeed-search-feed-face ((t (:foreground ,pal-blue)))) + `(elfeed-search-filter-face ((t (:foreground ,syntax-keyword)))) + `(elfeed-search-tag-face ((t (:foreground ,pal-cyan)))) + `(elfeed-search-title-face ((t (:foreground ,ui-fg-dim)))) + `(elfeed-search-unread-count-face ((t (:foreground ,pal-blue :weight bold)))) + `(elfeed-search-unread-title-face ((t (:foreground ,ui-fg :weight bold)))) + + ;; === Cider === + `(cider-result-overlay-face ((t (:foreground ,ui-success :background ,ui-bg-dark :box (:line-width -1 :color ,ui-border))))) + `(cider-deprecated-face ((t (:foreground ,ui-fg-dim :strike-through ,ui-border)))) + `(cider-enlightened-face ((t (:foreground ,ui-warning :weight bold)))) + `(cider-error-highlight-face ((t (:underline (:style wave :color ,ui-error))))) + `(cider-warning-highlight-face ((t (:underline (:style wave :color ,ui-warning))))) + `(cider-fringe-good-face ((t (:foreground ,ui-success)))) + `(cider-repl-prompt-face ((t (:foreground ,pal-blue :weight bold)))) + `(cider-repl-stderr-face ((t (:foreground ,ui-error)))) + `(cider-repl-stdout-face ((t (:foreground ,ui-success)))) + `(cider-test-failure-face ((t (:foreground ,ui-error :weight bold)))) + `(cider-test-success-face ((t (:foreground ,ui-success :weight bold)))) ;; === Evil === - `(evil-ex-info ((t (:foreground ,err :slant italic)))) - `(evil-ex-search ((t (:background ,primary-container :foreground ,on-primary-container :weight bold)))) - `(evil-ex-substitute-matches ((t (:background ,surface-container :foreground ,err :weight bold :strike-through t)))) - `(evil-ex-substitute-replacement ((t (:background ,surface-container :foreground ,tertiary :weight bold)))) - `(evil-search-highlight-persist-highlight-face ((t (:background ,primary-container :foreground ,on-primary-container :weight bold)))) + `(evil-ex-info ((t (:foreground ,ui-error :slant italic)))) + `(evil-ex-search ((t (:background ,ui-search-bg :foreground ,ui-search-fg :weight bold)))) + `(evil-ex-lazy-highlight ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(evil-ex-substitute-matches ((t (:background ,ui-bg-light :foreground ,ui-error :weight bold :strike-through t)))) + `(evil-ex-substitute-replacement ((t (:background ,ui-bg-light :foreground ,pal-orange :weight bold)))) + `(evil-search-highlight-persist-highlight-face ((t (:background ,ui-search-bg :foreground ,ui-search-fg :weight bold)))) ;; === Evil-goggles === - `(evil-goggles-default-face ((t (:background ,surface-container-high :distant-foreground ,bg :extend t)))) + `(evil-goggles-default-face ((t (:background ,ui-bg-light :distant-foreground ,ui-bg :extend t)))) ;; === Evil-mc === - `(evil-mc-cursor-bar-face ((t (:height 1 :background ,secondary :foreground ,on-secondary)))) - `(evil-mc-cursor-default-face ((t (:background ,secondary :foreground ,on-secondary :inverse-video unspecified)))) - `(evil-mc-cursor-hbar-face ((t (:underline (:color ,primary))))) - `(evil-mc-region-face ((t (:background ,surface-container-high :distant-foreground ,bg :extend t)))) + `(evil-mc-cursor-bar-face ((t (:height 1 :background ,ui-link :foreground ,ui-bg)))) + `(evil-mc-cursor-default-face ((t (:background ,ui-link :foreground ,ui-bg :inverse-video unspecified)))) + `(evil-mc-cursor-hbar-face ((t (:underline (:color ,ui-accent))))) + `(evil-mc-region-face ((t (:background ,ui-bg-light :distant-foreground ,ui-bg :extend t)))) ;; === Evil-snipe === - `(evil-snipe-first-match-face ((t (:foreground ,err :background ,primary-container :weight bold)))) - `(evil-snipe-matches-face ((t (:foreground ,err :underline t :weight bold)))) + `(evil-snipe-first-match-face ((t (:foreground ,ui-error :background ,ui-selection-bg :weight bold)))) + `(evil-snipe-matches-face ((t (:foreground ,ui-error :underline t :weight bold)))) ;; === Flycheck (missing) === - `(flycheck-error-list-filename ((t (:foreground ,primary)))) - `(flycheck-error-list-checker-name ((t (:foreground ,primary)))) - `(flycheck-error-list-warning ((t (:foreground ,secondary)))) - `(flycheck-posframe-background-face ((t (:background ,surface-container-low)))) - `(flycheck-posframe-error-face ((t (:background ,surface-container-low :foreground ,err)))) - `(flycheck-posframe-face ((t (:background ,surface-container-low :foreground ,on-surface)))) - `(flycheck-posframe-info-face ((t (:background ,surface-container-low :foreground ,tertiary)))) - `(flycheck-posframe-warning-face ((t (:background ,surface-container-low :foreground ,secondary)))) + `(flycheck-error-list-filename ((t (:foreground ,ui-accent)))) + `(flycheck-error-list-checker-name ((t (:foreground ,ui-accent)))) + `(flycheck-error-list-warning ((t (:foreground ,ui-link)))) + `(flycheck-posframe-background-face ((t (:background ,ui-bg-dark)))) + `(flycheck-posframe-error-face ((t (:background ,ui-bg-dark :foreground ,ui-error)))) + `(flycheck-posframe-face ((t (:background ,ui-bg-dark :foreground ,ui-fg)))) + `(flycheck-posframe-info-face ((t (:background ,ui-bg-dark :foreground ,ui-info)))) + `(flycheck-posframe-warning-face ((t (:background ,ui-bg-dark :foreground ,ui-link)))) ;; === Flymake === - `(flymake-error ((t (:underline (:style wave :color ,err))))) - `(flymake-note ((t (:underline (:style wave :color ,tertiary))))) - `(flymake-warning ((t (:underline (:style wave :color ,secondary))))) + `(flymake-error ((t (:underline (:style wave :color ,ui-error))))) + `(flymake-note ((t (:underline (:style wave :color ,ui-info))))) + `(flymake-warning ((t (:underline (:style wave :color ,ui-link))))) ;; === Flyspell === - `(flyspell-duplicate ((t (:underline (:style wave :color ,secondary))))) - `(flyspell-incorrect ((t (:underline (:style wave :color ,err))))) + `(flyspell-duplicate ((t (:underline (:style wave :color ,ui-link))))) + `(flyspell-incorrect ((t (:underline (:style wave :color ,ui-error))))) ;; === Flx-ido === - `(flx-highlight-face ((t (:weight bold :foreground ,secondary :underline unspecified)))) + `(flx-highlight-face ((t (:weight bold :foreground ,ui-link :underline unspecified)))) ;; === Forge === - `(forge-topic-closed ((t (:foreground ,outline-color :strike-through t)))) + `(forge-topic-closed ((t (:foreground ,ui-border :strike-through t)))) `(forge-topic-label ((t (:box unspecified)))) - `(forge-issue-completed ((t (:foreground ,outline-color :strike-through t)))) - `(forge-pullreq-merged ((t (:foreground ,primary)))) - `(forge-pullreq-open ((t (:foreground ,tertiary)))) - `(forge-pullreq-rejected ((t (:foreground ,err :strike-through t)))) + `(forge-issue-completed ((t (:foreground ,ui-border :strike-through t)))) + `(forge-pullreq-merged ((t (:foreground ,ui-accent)))) + `(forge-pullreq-open ((t (:foreground ,ui-info)))) + `(forge-pullreq-rejected ((t (:foreground ,ui-error :strike-through t)))) ;; === Git-commit === - `(git-commit-comment-branch-local ((t (:foreground ,tertiary)))) - `(git-commit-comment-branch-remote ((t (:foreground ,tertiary)))) - `(git-commit-comment-detached ((t (:foreground ,primary)))) - `(git-commit-comment-file ((t (:foreground ,primary)))) - `(git-commit-comment-heading ((t (:foreground ,primary)))) - `(git-commit-keyword ((t (:foreground ,secondary :slant italic)))) - `(git-commit-known-pseudo-header ((t (:foreground ,outline-color :weight bold :slant italic)))) - `(git-commit-nonempty-second-line ((t (:foreground ,err)))) - `(git-commit-overlong-summary ((t (:foreground ,err :slant italic :weight bold)))) - `(git-commit-pseudo-header ((t (:foreground ,outline-color :slant italic)))) - `(git-commit-summary ((t (:foreground ,primary)))) + `(git-commit-comment-branch-local ((t (:foreground ,ui-info)))) + `(git-commit-comment-branch-remote ((t (:foreground ,ui-info)))) + `(git-commit-comment-detached ((t (:foreground ,ui-accent)))) + `(git-commit-comment-file ((t (:foreground ,ui-accent)))) + `(git-commit-comment-heading ((t (:foreground ,ui-accent)))) + `(git-commit-keyword ((t (:foreground ,ui-link :slant italic)))) + `(git-commit-known-pseudo-header ((t (:foreground ,ui-border :weight bold :slant italic)))) + `(git-commit-nonempty-second-line ((t (:foreground ,ui-error)))) + `(git-commit-overlong-summary ((t (:foreground ,ui-error :slant italic :weight bold)))) + `(git-commit-pseudo-header ((t (:foreground ,ui-border :slant italic)))) + `(git-commit-summary ((t (:foreground ,ui-accent)))) ;; === Git-gutter === - `(git-gutter:added ((t (:foreground ,tertiary)))) - `(git-gutter:deleted ((t (:foreground ,err)))) - `(git-gutter:modified ((t (:foreground ,secondary)))) - `(git-gutter+-added ((t (:foreground ,tertiary)))) - `(git-gutter+-deleted ((t (:foreground ,err)))) - `(git-gutter+-modified ((t (:foreground ,secondary)))) - `(git-gutter-fr:added ((t (:foreground ,tertiary)))) - `(git-gutter-fr:deleted ((t (:foreground ,err)))) - `(git-gutter-fr:modified ((t (:foreground ,secondary)))) + `(git-gutter:added ((t (:foreground ,ui-info)))) + `(git-gutter:deleted ((t (:foreground ,ui-error)))) + `(git-gutter:modified ((t (:foreground ,ui-link)))) + `(git-gutter+-added ((t (:foreground ,ui-info)))) + `(git-gutter+-deleted ((t (:foreground ,ui-error)))) + `(git-gutter+-modified ((t (:foreground ,ui-link)))) + `(git-gutter-fr:added ((t (:foreground ,ui-info)))) + `(git-gutter-fr:deleted ((t (:foreground ,ui-error)))) + `(git-gutter-fr:modified ((t (:foreground ,ui-link)))) ;; === Goggles === - `(goggles-added ((t (:background ,tertiary-container)))) - `(goggles-changed ((t (:background ,secondary-container :distant-foreground ,bg :extend t)))) - `(goggles-removed ((t (:background ,err-container :extend t)))) + `(goggles-added ((t (:background ,ui-tooltip-bg)))) + `(goggles-changed ((t (:background ,ui-button-bg :distant-foreground ,ui-bg :extend t)))) + `(goggles-removed ((t (:background ,ui-active-text-bg :extend t)))) ;; === Helpful === - `(helpful-heading ((t (:foreground ,primary :weight bold :height 1.2)))) + `(helpful-heading ((t (:foreground ,ui-accent :weight bold :height 1.2)))) ;; === Hi-lock === - `(hi-blue ((t (:background ,primary-container)))) - `(hi-blue-b ((t (:foreground ,primary :weight bold)))) - `(hi-green ((t (:background ,tertiary-container)))) - `(hi-green-b ((t (:foreground ,tertiary :weight bold)))) - `(hi-magenta ((t (:background ,secondary-container)))) - `(hi-red-b ((t (:foreground ,err :weight bold)))) - `(hi-yellow ((t (:background ,secondary-container)))) + `(hi-blue ((t (:background ,ui-selection-bg)))) + `(hi-blue-b ((t (:foreground ,ui-accent :weight bold)))) + `(hi-green ((t (:background ,ui-tooltip-bg)))) + `(hi-green-b ((t (:foreground ,ui-info :weight bold)))) + `(hi-magenta ((t (:background ,ui-button-bg)))) + `(hi-red-b ((t (:foreground ,ui-error :weight bold)))) + `(hi-yellow ((t (:background ,ui-button-bg)))) ;; === Highlight-indentation === - `(highlight-indentation-current-column-face ((t (:background ,surface-container)))) - `(highlight-indentation-face ((t (:background ,surface-container-low :extend t)))) - `(highlight-indentation-guides-even-face ((t (:background ,surface-container-low :extend t)))) - `(highlight-indentation-guides-odd-face ((t (:background ,surface-container-low :extend t)))) + `(highlight-indentation-current-column-face ((t (:background ,ui-line-highlight)))) + `(highlight-indentation-face ((t (:background ,ui-bg-dark :extend t)))) + `(highlight-indentation-guides-even-face ((t (:background ,ui-bg-dark :extend t)))) + `(highlight-indentation-guides-odd-face ((t (:background ,ui-bg-dark :extend t)))) ;; === Highlight-numbers === - `(highlight-numbers-number ((t (:foreground ,primary :weight bold)))) + `(highlight-numbers-number ((t (:foreground ,ui-accent :weight bold)))) ;; === Highlight-quoted === - `(highlight-quoted-quote ((t (:foreground ,on-surface)))) - `(highlight-quoted-symbol ((t (:foreground ,secondary)))) + `(highlight-quoted-quote ((t (:foreground ,ui-fg)))) + `(highlight-quoted-symbol ((t (:foreground ,ui-link)))) ;; === Hydra === - `(hydra-face-amaranth ((t (:foreground ,secondary :weight bold)))) - `(hydra-face-blue ((t (:foreground ,primary :weight bold)))) - `(hydra-face-magenta ((t (:foreground ,primary :weight bold)))) - `(hydra-face-red ((t (:foreground ,err :weight bold)))) - `(hydra-face-teal ((t (:foreground ,tertiary :weight bold)))) + `(hydra-face-amaranth ((t (:foreground ,ui-link :weight bold)))) + `(hydra-face-blue ((t (:foreground ,ui-accent :weight bold)))) + `(hydra-face-magenta ((t (:foreground ,ui-accent :weight bold)))) + `(hydra-face-red ((t (:foreground ,ui-error :weight bold)))) + `(hydra-face-teal ((t (:foreground ,ui-info :weight bold)))) ;; === Iedit === - `(iedit-occurrence ((t (:foreground ,on-secondary-container :weight bold :background ,secondary-container)))) - `(iedit-read-only-occurrence ((t (:background ,surface-container-high :distant-foreground ,bg :extend t)))) + `(iedit-occurrence ((t (:foreground ,ui-button-fg :weight bold :background ,ui-button-bg)))) + `(iedit-read-only-occurrence ((t (:background ,ui-bg-light :distant-foreground ,ui-bg :extend t)))) ;; === Imenu-list === - `(imenu-list-entry-face-0 ((t (:foreground ,primary)))) - `(imenu-list-entry-face-1 ((t (:foreground ,secondary)))) - `(imenu-list-entry-face-2 ((t (:foreground ,tertiary)))) - `(imenu-list-entry-subalist-face-0 ((t (:foreground ,primary :weight bold)))) - `(imenu-list-entry-subalist-face-1 ((t (:foreground ,secondary :weight bold)))) - `(imenu-list-entry-subalist-face-2 ((t (:foreground ,tertiary :weight bold)))) + `(imenu-list-entry-face-0 ((t (:foreground ,ui-accent)))) + `(imenu-list-entry-face-1 ((t (:foreground ,ui-link)))) + `(imenu-list-entry-face-2 ((t (:foreground ,ui-info)))) + `(imenu-list-entry-subalist-face-0 ((t (:foreground ,ui-accent :weight bold)))) + `(imenu-list-entry-subalist-face-1 ((t (:foreground ,ui-link :weight bold)))) + `(imenu-list-entry-subalist-face-2 ((t (:foreground ,ui-info :weight bold)))) ;; === Indent-guide === - `(indent-guide-face ((t (:background ,surface-container-low :extend t)))) + `(indent-guide-face ((t (:background ,ui-bg-dark :extend t)))) ;; === Ivy (missing) === - `(ivy-confirm-face ((t (:foreground ,tertiary)))) - `(ivy-highlight-face ((t (:foreground ,primary)))) - `(ivy-match-required-face ((t (:foreground ,err)))) - `(ivy-minibuffer-match-face-1 ((t (:foreground ,primary :weight bold :underline t)))) - `(ivy-minibuffer-match-face-2 ((t (:foreground ,secondary :weight semi-bold)))) - `(ivy-minibuffer-match-face-3 ((t (:foreground ,tertiary :weight semi-bold)))) - `(ivy-minibuffer-match-face-4 ((t (:foreground ,secondary :weight semi-bold)))) - `(ivy-minibuffer-match-highlight ((t (:foreground ,primary)))) - `(ivy-modified-buffer ((t (:weight bold :foreground ,secondary)))) - `(ivy-virtual ((t (:slant italic :foreground ,on-surface)))) - `(ivy-posframe ((t (:background ,surface-container-low)))) - `(ivy-posframe-border ((t (:background ,err)))) + `(ivy-confirm-face ((t (:foreground ,ui-info)))) + `(ivy-highlight-face ((t (:foreground ,ui-accent)))) + `(ivy-match-required-face ((t (:foreground ,ui-error)))) + `(ivy-minibuffer-match-face-1 ((t (:foreground ,ui-accent :weight bold :underline t)))) + `(ivy-minibuffer-match-face-2 ((t (:foreground ,ui-link :weight semi-bold)))) + `(ivy-minibuffer-match-face-3 ((t (:foreground ,ui-info :weight semi-bold)))) + `(ivy-minibuffer-match-face-4 ((t (:foreground ,ui-link :weight semi-bold)))) + `(ivy-minibuffer-match-highlight ((t (:foreground ,ui-accent)))) + `(ivy-modified-buffer ((t (:weight bold :foreground ,ui-link)))) + `(ivy-virtual ((t (:slant italic :foreground ,ui-fg)))) + `(ivy-posframe ((t (:background ,ui-bg-dark)))) + `(ivy-posframe-border ((t (:background ,ui-error)))) ;; === Keycast === - `(keycast-command ((t (:foreground ,err)))) - `(keycast-key ((t (:foreground ,err :weight bold)))) + `(keycast-command ((t (:foreground ,ui-error)))) + `(keycast-key ((t (:foreground ,ui-error :weight bold)))) + + ;; === LSP === + `(lsp-face-highlight-textual ((t (:background ,ui-bg-light :weight bold)))) + `(lsp-face-highlight-read ((t (:background ,ui-bg-light)))) + `(lsp-face-highlight-write ((t (:background ,ui-bg-light :weight bold)))) ;; === LSP-UI === - `(lsp-headerline-breadcrumb-separator-face ((t (:foreground ,on-surface-variant)))) - `(lsp-ui-doc-background ((t (:background ,surface-container-low :foreground ,on-surface)))) - `(lsp-ui-peek-filename ((t (:weight bold)))) - `(lsp-ui-peek-header ((t (:foreground ,on-surface :background ,surface-container :weight bold)))) - `(lsp-ui-peek-highlight ((t (:background ,surface-container-high :foreground ,bg :box t)))) - `(lsp-ui-peek-line-number ((t (:foreground ,tertiary)))) - `(lsp-ui-peek-list ((t (:background ,surface-container-low)))) - `(lsp-ui-peek-peek ((t (:background ,surface-container-low)))) - `(lsp-ui-peek-selection ((t (:foreground ,on-primary-container :background ,primary-container :weight bold)))) - `(lsp-ui-sideline-code-action ((t (:foreground ,primary)))) - `(lsp-ui-sideline-current-symbol ((t (:foreground ,primary)))) - `(lsp-ui-sideline-symbol-info ((t (:foreground ,outline-color :background ,surface-container-low :extend t)))) + `(lsp-headerline-breadcrumb-separator-face ((t (:foreground ,ui-fg-dim)))) + `(lsp-ui-doc-background ((t (:background ,ui-bg-dark :foreground ,ui-fg)))) + `(lsp-ui-doc-header ((t (:foreground ,ui-fg :background ,ui-line-highlight :weight bold)))) + `(lsp-ui-doc-highlight-hover ((t (:background ,ui-bg-light)))) + `(lsp-ui-doc-url ((t (:foreground ,pal-blue :underline t)))) + `(lsp-ui-peek-filename ((t (:foreground ,pal-orange :weight bold)))) + `(lsp-ui-peek-header ((t (:foreground ,ui-fg :background ,ui-line-highlight :weight bold)))) + `(lsp-ui-peek-highlight ((t (:background ,ui-bg-light :foreground ,ui-bg :box t)))) + `(lsp-ui-peek-line-number ((t (:foreground ,ui-fg-dim)))) + `(lsp-ui-peek-list ((t (:background ,ui-bg-dark)))) + `(lsp-ui-peek-peek ((t (:background ,ui-bg-dark)))) + `(lsp-ui-peek-selection ((t (:foreground ,ui-selection-fg :background ,ui-selection-bg :weight bold)))) + `(lsp-ui-sideline-code-action ((t (:foreground ,ui-warning)))) + `(lsp-ui-sideline-current-symbol ((t (:foreground ,ui-fg :weight bold :box (:line-width -1 :color ,ui-fg))))) + `(lsp-ui-sideline-symbol ((t (:foreground ,ui-fg-dim :box (:line-width -1 :color ,ui-fg-dim))))) + `(lsp-ui-sideline-symbol-info ((t (:foreground ,ui-border :background ,ui-bg-dark :extend t)))) + `(lsp-ui-sideline-global ((t (:foreground ,ui-border)))) ;; === Magit (missing faces) === - `(magit-bisect-bad ((t (:foreground ,err)))) - `(magit-bisect-good ((t (:foreground ,tertiary)))) - `(magit-bisect-skip ((t (:foreground ,err)))) - `(magit-blame-date ((t (:foreground ,err)))) - `(magit-blame-heading ((t (:foreground ,primary :background ,surface-container :extend t)))) - `(magit-branch-current ((t (:foreground ,err)))) - `(magit-branch-remote-head ((t (:foreground ,tertiary)))) - `(magit-cherry-equivalent ((t (:foreground ,primary)))) - `(magit-cherry-unmatched ((t (:foreground ,secondary)))) - `(magit-diff-base ((t (:foreground ,on-secondary-container :background ,secondary-container :extend t)))) - `(magit-diff-base-highlight ((t (:foreground ,on-secondary-container :background ,secondary-container :weight bold :extend t)))) - `(magit-diff-file-heading ((t (:foreground ,on-surface :weight bold :extend t)))) - `(magit-diff-file-heading-selection ((t (:foreground ,on-secondary-container :background ,secondary-container :weight bold :extend t)))) - `(magit-diff-lines-heading ((t (:foreground ,on-primary-container :background ,primary-container :extend t)))) - `(magit-diff-revision-summary ((t (:foreground ,on-primary-container :background ,primary-container :extend t :weight bold)))) - `(magit-diffstat-added ((t (:foreground ,tertiary)))) - `(magit-diffstat-removed ((t (:foreground ,err)))) - `(magit-dimmed ((t (:foreground ,outline-color)))) - `(magit-filename ((t (:foreground ,primary)))) - `(magit-header-line ((t (:background ,surface-container-low :foreground ,primary :weight bold)))) - `(magit-log-author ((t (:foreground ,primary)))) - `(magit-log-date ((t (:foreground ,primary)))) - `(magit-log-graph ((t (:foreground ,outline-color)))) - `(magit-process-ng ((t (:foreground ,err)))) - `(magit-process-ok ((t (:foreground ,tertiary)))) - `(magit-reflog-amend ((t (:foreground ,secondary)))) - `(magit-reflog-checkout ((t (:foreground ,primary)))) - `(magit-reflog-cherry-pick ((t (:foreground ,tertiary)))) - `(magit-reflog-commit ((t (:foreground ,tertiary)))) - `(magit-reflog-merge ((t (:foreground ,tertiary)))) - `(magit-reflog-other ((t (:foreground ,secondary)))) - `(magit-reflog-rebase ((t (:foreground ,secondary)))) - `(magit-reflog-remote ((t (:foreground ,secondary)))) - `(magit-reflog-reset ((t (:foreground ,err)))) - `(magit-refname ((t (:foreground ,outline-color)))) - `(magit-section-heading ((t (:foreground ,primary :weight bold :extend t)))) - `(magit-section-heading-selection ((t (:foreground ,primary :weight bold :extend t)))) - `(magit-section-secondary-heading ((t (:foreground ,primary :weight bold :extend t)))) - `(magit-sequence-drop ((t (:foreground ,err)))) - `(magit-sequence-head ((t (:foreground ,primary)))) - `(magit-sequence-part ((t (:foreground ,primary)))) - `(magit-sequence-stop ((t (:foreground ,tertiary)))) - `(magit-signature-bad ((t (:foreground ,err)))) - `(magit-signature-error ((t (:foreground ,err)))) - `(magit-signature-expired ((t (:foreground ,secondary)))) - `(magit-signature-good ((t (:foreground ,tertiary)))) - `(magit-signature-revoked ((t (:foreground ,secondary)))) - `(magit-signature-untrusted ((t (:foreground ,secondary)))) - `(magit-tag ((t (:foreground ,secondary)))) + `(magit-bisect-bad ((t (:foreground ,ui-error)))) + `(magit-bisect-good ((t (:foreground ,ui-info)))) + `(magit-bisect-skip ((t (:foreground ,ui-error)))) + `(magit-blame-date ((t (:foreground ,ui-error)))) + `(magit-blame-heading ((t (:foreground ,ui-accent :background ,ui-line-highlight :extend t)))) + `(magit-branch-current ((t (:foreground ,ui-error)))) + `(magit-branch-remote-head ((t (:foreground ,ui-info)))) + `(magit-cherry-equivalent ((t (:foreground ,ui-accent)))) + `(magit-cherry-unmatched ((t (:foreground ,ui-link)))) + `(magit-diff-base ((t (:foreground ,ui-button-fg :background ,ui-button-bg :extend t)))) + `(magit-diff-base-highlight ((t (:foreground ,ui-button-fg :background ,ui-button-bg :weight bold :extend t)))) + `(magit-diff-file-heading ((t (:foreground ,ui-fg :weight bold :extend t)))) + `(magit-diff-file-heading-selection ((t (:foreground ,ui-button-fg :background ,ui-button-bg :weight bold :extend t)))) + `(magit-diff-lines-heading ((t (:foreground ,ui-selection-fg :background ,ui-selection-bg :extend t)))) + `(magit-diff-revision-summary ((t (:foreground ,ui-selection-fg :background ,ui-selection-bg :extend t :weight bold)))) + `(magit-diffstat-added ((t (:foreground ,ui-info)))) + `(magit-diffstat-removed ((t (:foreground ,ui-error)))) + `(magit-dimmed ((t (:foreground ,ui-border)))) + `(magit-filename ((t (:foreground ,ui-accent)))) + `(magit-header-line ((t (:background ,ui-bg-dark :foreground ,ui-accent :weight bold)))) + `(magit-log-author ((t (:foreground ,ui-accent)))) + `(magit-log-date ((t (:foreground ,ui-accent)))) + `(magit-log-graph ((t (:foreground ,ui-border)))) + `(magit-process-ng ((t (:foreground ,ui-error)))) + `(magit-process-ok ((t (:foreground ,ui-info)))) + `(magit-reflog-amend ((t (:foreground ,ui-link)))) + `(magit-reflog-checkout ((t (:foreground ,ui-accent)))) + `(magit-reflog-cherry-pick ((t (:foreground ,ui-info)))) + `(magit-reflog-commit ((t (:foreground ,ui-info)))) + `(magit-reflog-merge ((t (:foreground ,ui-info)))) + `(magit-reflog-other ((t (:foreground ,ui-link)))) + `(magit-reflog-rebase ((t (:foreground ,ui-link)))) + `(magit-reflog-remote ((t (:foreground ,ui-link)))) + `(magit-reflog-reset ((t (:foreground ,ui-error)))) + `(magit-refname ((t (:foreground ,ui-border)))) + `(magit-section-heading ((t (:foreground ,ui-accent :weight bold :extend t)))) + `(magit-section-heading-selection ((t (:foreground ,ui-accent :weight bold :extend t)))) + `(magit-section-secondary-heading ((t (:foreground ,ui-accent :weight bold :extend t)))) + `(magit-sequence-drop ((t (:foreground ,ui-error)))) + `(magit-sequence-head ((t (:foreground ,ui-accent)))) + `(magit-sequence-part ((t (:foreground ,ui-accent)))) + `(magit-sequence-stop ((t (:foreground ,ui-info)))) + `(magit-signature-bad ((t (:foreground ,ui-error)))) + `(magit-signature-error ((t (:foreground ,ui-error)))) + `(magit-signature-expired ((t (:foreground ,ui-link)))) + `(magit-signature-good ((t (:foreground ,ui-info)))) + `(magit-signature-revoked ((t (:foreground ,ui-link)))) + `(magit-signature-untrusted ((t (:foreground ,ui-link)))) + `(magit-tag ((t (:foreground ,ui-link)))) ;; === Make-mode === - `(makefile-targets ((t (:foreground ,primary)))) + `(makefile-targets ((t (:foreground ,ui-accent)))) ;; === Marginalia (missing) === - `(marginalia-documentation ((t (:foreground ,primary)))) - `(marginalia-file-name ((t (:foreground ,primary)))) - `(marginalia-size ((t (:foreground ,secondary)))) - `(marginalia-mode ((t (:foreground ,primary)))) - `(marginalia-modified ((t (:foreground ,err)))) - `(marginalia-file-priv-read ((t (:foreground ,tertiary)))) - `(marginalia-file-priv-write ((t (:foreground ,secondary)))) - `(marginalia-file-priv-exec ((t (:foreground ,err)))) + `(marginalia-documentation ((t (:foreground ,ui-accent)))) + `(marginalia-file-name ((t (:foreground ,ui-accent)))) + `(marginalia-size ((t (:foreground ,ui-link)))) + `(marginalia-mode ((t (:foreground ,ui-accent)))) + `(marginalia-modified ((t (:foreground ,ui-error)))) + `(marginalia-file-priv-read ((t (:foreground ,ui-info)))) + `(marginalia-file-priv-write ((t (:foreground ,ui-link)))) + `(marginalia-file-priv-exec ((t (:foreground ,ui-error)))) ;; === Markdown (missing faces) === - `(markdown-blockquote-face ((t (:foreground ,outline-color :slant italic)))) - `(markdown-bold-face ((t (:foreground ,on-surface :weight bold)))) - `(markdown-header-delimiter-face ((t (:foreground ,primary :weight bold)))) - `(markdown-header-face-5 ((t (:foreground ,primary-variant :weight bold)))) - `(markdown-header-face-6 ((t (:foreground ,secondary-variant :weight bold)))) - `(markdown-html-attr-name-face ((t (:foreground ,primary)))) - `(markdown-html-attr-value-face ((t (:foreground ,tertiary)))) - `(markdown-html-entity-face ((t (:foreground ,primary :slant italic)))) - `(markdown-html-tag-delimiter-face ((t (:foreground ,on-surface)))) - `(markdown-html-tag-name-face ((t (:foreground ,secondary)))) - `(markdown-italic-face ((t (:foreground ,primary :slant italic)))) - `(markdown-link-face ((t (:foreground ,primary :weight bold)))) - `(markdown-list-face ((t (:foreground ,primary)))) - `(markdown-markup-face ((t (:foreground ,on-surface)))) - `(markdown-metadata-key-face ((t (:foreground ,primary)))) - `(markdown-reference-face ((t (:foreground ,outline-color)))) - `(markdown-url-face ((t (:foreground ,tertiary)))) + `(markdown-blockquote-face ((t (:foreground ,ui-border :slant italic)))) + `(markdown-bold-face ((t (:foreground ,ui-fg :weight bold)))) + `(markdown-header-delimiter-face ((t (:foreground ,ui-accent :weight bold)))) + `(markdown-header-face-5 ((t (:foreground ,ui-accent :weight bold)))) + `(markdown-header-face-6 ((t (:foreground ,ui-link :weight bold)))) + `(markdown-html-attr-name-face ((t (:foreground ,ui-accent)))) + `(markdown-html-attr-value-face ((t (:foreground ,ui-info)))) + `(markdown-html-entity-face ((t (:foreground ,ui-accent :slant italic)))) + `(markdown-html-tag-delimiter-face ((t (:foreground ,ui-fg)))) + `(markdown-html-tag-name-face ((t (:foreground ,ui-link)))) + `(markdown-italic-face ((t (:foreground ,ui-accent :slant italic)))) + `(markdown-link-face ((t (:foreground ,ui-accent :weight bold)))) + `(markdown-list-face ((t (:foreground ,ui-accent)))) + `(markdown-markup-face ((t (:foreground ,ui-fg)))) + `(markdown-metadata-key-face ((t (:foreground ,ui-accent)))) + `(markdown-reference-face ((t (:foreground ,ui-border)))) + `(markdown-url-face ((t (:foreground ,ui-info)))) ;; === Message === - `(message-cited-text-1 ((t (:foreground ,secondary)))) - `(message-cited-text-2 ((t (:foreground ,primary)))) - `(message-cited-text-3 ((t (:foreground ,tertiary)))) - `(message-header-cc ((t (:foreground ,err :weight bold)))) - `(message-header-name ((t (:foreground ,err)))) - `(message-header-newsgroups ((t (:foreground ,secondary)))) - `(message-header-other ((t (:foreground ,primary)))) - `(message-header-subject ((t (:foreground ,primary :weight bold)))) - `(message-header-to ((t (:foreground ,primary :weight bold)))) - `(message-header-xheader ((t (:foreground ,outline-color)))) - `(message-mml ((t (:foreground ,outline-color :slant italic)))) - `(message-separator ((t (:foreground ,outline-color)))) + `(message-cited-text-1 ((t (:foreground ,ui-link)))) + `(message-cited-text-2 ((t (:foreground ,ui-accent)))) + `(message-cited-text-3 ((t (:foreground ,ui-info)))) + `(message-header-cc ((t (:foreground ,ui-error :weight bold)))) + `(message-header-name ((t (:foreground ,ui-error)))) + `(message-header-newsgroups ((t (:foreground ,ui-link)))) + `(message-header-other ((t (:foreground ,ui-accent)))) + `(message-header-subject ((t (:foreground ,ui-accent :weight bold)))) + `(message-header-to ((t (:foreground ,ui-accent :weight bold)))) + `(message-header-xheader ((t (:foreground ,ui-border)))) + `(message-mml ((t (:foreground ,ui-border :slant italic)))) + `(message-separator ((t (:foreground ,ui-border)))) ;; === Minimap === - `(minimap-active-region-background ((t (:background ,surface-container-low)))) - `(minimap-current-line-face ((t (:background ,surface-container-high)))) + `(minimap-active-region-background ((t (:background ,ui-bg-dark)))) + `(minimap-current-line-face ((t (:background ,ui-bg-light)))) ;; === Multiple-cursors === - `(mc/cursor-face ((t (:background ,secondary)))) + `(mc/cursor-face ((t (:background ,ui-link)))) ;; === Neotree === - `(neo-dir-link-face ((t (:foreground ,primary)))) - `(neo-expand-btn-face ((t (:foreground ,primary)))) - `(neo-file-link-face ((t (:foreground ,on-surface)))) - `(neo-root-dir-face ((t (:foreground ,tertiary :background ,bg)))) - `(neo-vc-added-face ((t (:foreground ,tertiary)))) - `(neo-vc-conflict-face ((t (:foreground ,secondary :weight bold)))) - `(neo-vc-edited-face ((t (:foreground ,secondary)))) - `(neo-vc-ignored-face ((t (:foreground ,outline-color)))) - `(neo-vc-removed-face ((t (:foreground ,err :strike-through t)))) + `(neo-dir-link-face ((t (:foreground ,ui-accent)))) + `(neo-expand-btn-face ((t (:foreground ,ui-accent)))) + `(neo-file-link-face ((t (:foreground ,ui-fg)))) + `(neo-root-dir-face ((t (:foreground ,ui-info :background ,ui-bg)))) + `(neo-vc-added-face ((t (:foreground ,ui-info)))) + `(neo-vc-conflict-face ((t (:foreground ,ui-link :weight bold)))) + `(neo-vc-edited-face ((t (:foreground ,ui-link)))) + `(neo-vc-ignored-face ((t (:foreground ,ui-border)))) + `(neo-vc-removed-face ((t (:foreground ,ui-error :strike-through t)))) + + ;; === Nerd-icons === + `(nerd-icons-red ((t (:foreground ,ui-error)))) + `(nerd-icons-green ((t (:foreground ,ui-success)))) + `(nerd-icons-yellow ((t (:foreground ,ui-warning)))) + `(nerd-icons-blue ((t (:foreground ,pal-blue)))) + `(nerd-icons-purple ((t (:foreground ,syntax-keyword)))) + `(nerd-icons-orange ((t (:foreground ,pal-orange)))) + `(nerd-icons-cyan ((t (:foreground ,pal-cyan)))) + `(nerd-icons-pink ((t (:foreground ,pal-magenta)))) + `(nerd-icons-silver ((t (:foreground ,ui-fg-dim)))) ;; === Notmuch === - `(notmuch-message-summary-face ((t (:foreground ,outline-color)))) - `(notmuch-search-count ((t (:foreground ,outline-color)))) - `(notmuch-search-date ((t (:foreground ,primary)))) - `(notmuch-search-flagged-face ((t (:foreground ,err)))) - `(notmuch-search-matching-authors ((t (:foreground ,primary)))) - `(notmuch-search-non-matching-authors ((t (:foreground ,on-surface)))) - `(notmuch-search-subject ((t (:foreground ,on-surface)))) + `(notmuch-message-summary-face ((t (:foreground ,ui-border)))) + `(notmuch-search-count ((t (:foreground ,ui-border)))) + `(notmuch-search-date ((t (:foreground ,ui-accent)))) + `(notmuch-search-flagged-face ((t (:foreground ,ui-error)))) + `(notmuch-search-matching-authors ((t (:foreground ,ui-accent)))) + `(notmuch-search-non-matching-authors ((t (:foreground ,ui-fg)))) + `(notmuch-search-subject ((t (:foreground ,ui-fg)))) `(notmuch-search-unread-face ((t (:weight bold)))) - `(notmuch-tag-added ((t (:foreground ,tertiary :weight normal)))) - `(notmuch-tag-deleted ((t (:foreground ,err :weight normal)))) - `(notmuch-tag-face ((t (:foreground ,secondary :weight normal)))) - `(notmuch-tag-flagged ((t (:foreground ,secondary :weight normal)))) - `(notmuch-tag-unread ((t (:foreground ,secondary :weight normal)))) - `(notmuch-tree-match-author-face ((t (:foreground ,primary :weight bold)))) - `(notmuch-tree-match-date-face ((t (:foreground ,primary :weight bold)))) - `(notmuch-tree-match-face ((t (:foreground ,on-surface)))) - `(notmuch-tree-match-subject-face ((t (:foreground ,on-surface)))) - `(notmuch-tree-match-tag-face ((t (:foreground ,secondary)))) - `(notmuch-tree-match-tree-face ((t (:foreground ,outline-color)))) - `(notmuch-tree-no-match-author-face ((t (:foreground ,primary)))) - `(notmuch-tree-no-match-date-face ((t (:foreground ,primary)))) - `(notmuch-tree-no-match-face ((t (:foreground ,outline-color)))) - `(notmuch-tree-no-match-subject-face ((t (:foreground ,outline-color)))) - `(notmuch-tree-no-match-tag-face ((t (:foreground ,secondary)))) - `(notmuch-tree-no-match-tree-face ((t (:foreground ,secondary)))) - `(notmuch-wash-cited-text ((t (:foreground ,outline-variant)))) - `(notmuch-wash-toggle-button ((t (:foreground ,on-surface)))) + `(notmuch-tag-added ((t (:foreground ,ui-info :weight normal)))) + `(notmuch-tag-deleted ((t (:foreground ,ui-error :weight normal)))) + `(notmuch-tag-face ((t (:foreground ,ui-link :weight normal)))) + `(notmuch-tag-flagged ((t (:foreground ,ui-link :weight normal)))) + `(notmuch-tag-unread ((t (:foreground ,ui-link :weight normal)))) + `(notmuch-tree-match-author-face ((t (:foreground ,ui-accent :weight bold)))) + `(notmuch-tree-match-date-face ((t (:foreground ,ui-accent :weight bold)))) + `(notmuch-tree-match-face ((t (:foreground ,ui-fg)))) + `(notmuch-tree-match-subject-face ((t (:foreground ,ui-fg)))) + `(notmuch-tree-match-tag-face ((t (:foreground ,ui-link)))) + `(notmuch-tree-match-tree-face ((t (:foreground ,ui-border)))) + `(notmuch-tree-no-match-author-face ((t (:foreground ,ui-accent)))) + `(notmuch-tree-no-match-date-face ((t (:foreground ,ui-accent)))) + `(notmuch-tree-no-match-face ((t (:foreground ,ui-border)))) + `(notmuch-tree-no-match-subject-face ((t (:foreground ,ui-border)))) + `(notmuch-tree-no-match-tag-face ((t (:foreground ,ui-link)))) + `(notmuch-tree-no-match-tree-face ((t (:foreground ,ui-link)))) + `(notmuch-wash-cited-text ((t (:foreground ,ui-border)))) + `(notmuch-wash-toggle-button ((t (:foreground ,ui-fg)))) ;; === Orderless === - `(orderless-match-face-0 ((t (:foreground ,primary :weight bold :underline t)))) - `(orderless-match-face-1 ((t (:foreground ,secondary :weight bold :underline t)))) - `(orderless-match-face-2 ((t (:foreground ,tertiary :weight bold :underline t)))) - `(orderless-match-face-3 ((t (:foreground ,primary-variant :weight bold :underline t)))) + `(orderless-match-face-0 ((t (:foreground ,pal-blue :weight bold :underline t)))) + `(orderless-match-face-1 ((t (:foreground ,pal-magenta :weight bold :underline t)))) + `(orderless-match-face-2 ((t (:foreground ,pal-cyan :weight bold :underline t)))) + `(orderless-match-face-3 ((t (:foreground ,pal-orange :weight bold :underline t)))) + + ;; === Vertico === + `(vertico-current ((t (:background ,ui-bg-light :extend t)))) + `(vertico-group-title ((t (:foreground ,ui-accent :weight bold :slant italic)))) + `(vertico-group-separator ((t (:foreground ,ui-border :strike-through t)))) + `(vertico-multiline ((t (:foreground ,ui-fg-dim)))) ;; === Objed === - `(objed-hl ((t (:background ,surface-container-high :distant-foreground ,bg :extend t)))) - `(objed-mode-line ((t (:foreground ,secondary :weight bold)))) + `(objed-hl ((t (:background ,ui-bg-light :distant-foreground ,ui-bg :extend t)))) + `(objed-mode-line ((t (:foreground ,ui-link :weight bold)))) ;; === Parenface === - `(paren-face ((t (:foreground ,outline-color)))) + `(paren-face ((t (:foreground ,ui-border)))) ;; === Popup === - `(popup-face ((t (:background ,surface-container-low :foreground ,on-surface)))) - `(popup-selection-face ((t (:background ,primary-container :foreground ,on-primary-container)))) - `(popup-tip-face ((t (:foreground ,primary :background ,surface-container)))) + `(popup-face ((t (:background ,ui-bg-dark :foreground ,ui-fg)))) + `(popup-selection-face ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg)))) + `(popup-tip-face ((t (:foreground ,ui-accent :background ,ui-line-highlight)))) ;; === Re-builder === - `(reb-match-0 ((t (:foreground ,err :inverse-video t)))) - `(reb-match-1 ((t (:foreground ,tertiary :inverse-video t)))) - `(reb-match-2 ((t (:foreground ,secondary :inverse-video t)))) - `(reb-match-3 ((t (:foreground ,primary :inverse-video t)))) + `(reb-match-0 ((t (:foreground ,ui-error :inverse-video t)))) + `(reb-match-1 ((t (:foreground ,ui-info :inverse-video t)))) + `(reb-match-2 ((t (:foreground ,ui-link :inverse-video t)))) + `(reb-match-3 ((t (:foreground ,ui-accent :inverse-video t)))) ;; === Selectrum === - `(selectrum-current-candidate ((t (:background ,surface-container-high :distant-foreground unspecified :extend t)))) + `(selectrum-current-candidate ((t (:background ,ui-bg-light :distant-foreground unspecified :extend t)))) ;; === Sh-script === - `(sh-heredoc ((t (:foreground ,primary)))) - `(sh-quoted-exec ((t (:foreground ,on-surface :weight bold)))) + `(sh-heredoc ((t (:foreground ,ui-accent)))) + `(sh-quoted-exec ((t (:foreground ,ui-fg :weight bold)))) ;; === Smerge === - `(smerge-base ((t (:background ,primary-container :foreground ,on-primary-container)))) - `(smerge-lower ((t (:background ,tertiary-container)))) - `(smerge-markers ((t (:background ,surface-container-high :foreground ,bg :distant-foreground ,on-surface :weight bold)))) - `(smerge-mine ((t (:background ,err-container :foreground ,on-err-container)))) - `(smerge-other ((t (:background ,tertiary-container :foreground ,on-tertiary-container)))) - `(smerge-refined-added ((t (:background ,tertiary-container :foreground ,on-tertiary-container)))) - `(smerge-refined-removed ((t (:background ,err-container :foreground ,on-err-container)))) - `(smerge-upper ((t (:background ,err-container)))) + `(smerge-base ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg)))) + `(smerge-lower ((t (:background ,ui-tooltip-bg)))) + `(smerge-markers ((t (:background ,ui-bg-light :foreground ,ui-bg :distant-foreground ,ui-fg :weight bold)))) + `(smerge-mine ((t (:background ,ui-active-text-bg :foreground ,ui-active-text-fg)))) + `(smerge-other ((t (:background ,ui-tooltip-bg :foreground ,ui-tooltip-fg)))) + `(smerge-refined-added ((t (:background ,ui-tooltip-bg :foreground ,ui-tooltip-fg)))) + `(smerge-refined-removed ((t (:background ,ui-active-text-bg :foreground ,ui-active-text-fg)))) + `(smerge-upper ((t (:background ,ui-active-text-bg)))) ;; === Solaire-mode === - `(solaire-default-face ((t (:background ,surface-container-low)))) - `(solaire-hl-line-face ((t (:background ,surface-container-low :extend t)))) - `(solaire-mode-line-face ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(solaire-mode-line-inactive-face ((t (:background ,surface-container-low :foreground ,on-surface-variant)))) - `(solaire-org-hide-face ((t (:foreground ,bg)))) + `(solaire-default-face ((t (:background ,ui-bg-dark)))) + `(solaire-hl-line-face ((t (:background ,ui-bg-dark :extend t)))) + `(solaire-mode-line-face ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(solaire-mode-line-inactive-face ((t (:background ,ui-bg-dark :foreground ,ui-fg-dim)))) + `(solaire-org-hide-face ((t (:foreground ,ui-bg)))) ;; === Swiper === - `(swiper-line-face ((t (:background ,primary-container :foreground ,on-primary-container)))) - `(swiper-match-face-1 ((t (:background ,surface-container :foreground ,outline-color)))) - `(swiper-match-face-2 ((t (:background ,primary-container :foreground ,on-primary-container :weight bold)))) - `(swiper-match-face-3 ((t (:background ,secondary-container :foreground ,on-secondary-container :weight bold)))) - `(swiper-match-face-4 ((t (:background ,tertiary-container :foreground ,on-tertiary-container :weight bold)))) + `(swiper-line-face ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(swiper-match-face-1 ((t (:background ,ui-line-highlight :foreground ,ui-fg-dim)))) + `(swiper-match-face-2 ((t (:background ,ui-search-bg :foreground ,ui-search-fg :weight bold)))) + `(swiper-match-face-3 ((t (:background ,ui-button-bg :foreground ,ui-button-fg :weight bold)))) + `(swiper-match-face-4 ((t (:background ,ui-tooltip-bg :foreground ,ui-tooltip-fg :weight bold)))) ;; === Term (extended) === - `(term ((t (:foreground ,on-surface)))) + `(term ((t (:foreground ,ui-fg :background ,ui-bg)))) `(term-bold ((t (:weight bold)))) - `(term-color-bright-black ((t (:foreground ,surface-container-high)))) - `(term-color-bright-red ((t (:foreground ,err-variant)))) - `(term-color-bright-green ((t (:foreground ,tertiary-variant)))) - `(term-color-bright-yellow ((t (:foreground ,secondary-variant)))) - `(term-color-bright-blue ((t (:foreground ,primary-variant)))) - `(term-color-bright-magenta ((t (:foreground ,err)))) - `(term-color-bright-cyan ((t (:foreground ,tertiary)))) - `(term-color-bright-white ((t (:foreground ,fg)))) + `(term-color-bright-black ((t (:foreground "#45475a" :background "#45475a")))) + `(term-color-bright-red ((t (:foreground "#f6c5d3" :background "#f6c5d3")))) + `(term-color-bright-green ((t (:foreground "#d4efd2" :background "#d4efd2")))) + `(term-color-bright-yellow ((t (:foreground "#fcf6e9" :background "#fcf6e9")))) + `(term-color-bright-blue ((t (:foreground "#c7dafa" :background "#c7dafa")))) + `(term-color-bright-magenta ((t (:foreground "#ece0fb" :background "#ece0fb")))) + `(term-color-bright-cyan ((t (:foreground "#c6ede6" :background "#c6ede6")))) + `(term-color-bright-white ((t (:foreground "#bac2de" :background "#bac2de")))) ;; === Transient === - `(transient-key ((t (:foreground ,primary :height 1.1)))) - `(transient-blue ((t (:foreground ,primary)))) - `(transient-pink ((t (:foreground ,primary)))) - `(transient-purple ((t (:foreground ,secondary)))) - `(transient-red ((t (:foreground ,err)))) - `(transient-teal ((t (:foreground ,tertiary)))) + `(transient-heading ((t (:foreground ,pal-blue :weight bold)))) + `(transient-key ((t (:foreground ,pal-magenta :weight bold :height 1.1)))) + `(transient-argument ((t (:foreground ,pal-green)))) + `(transient-value ((t (:foreground ,pal-green)))) + `(transient-inactive-argument ((t (:foreground ,ui-fg-dim)))) + `(transient-inactive-value ((t (:foreground ,ui-fg-dim)))) + `(transient-unreachable ((t (:foreground ,ui-border)))) + `(transient-unreachable-key ((t (:foreground ,ui-border)))) + `(transient-enabled-suffix ((t (:foreground ,ui-success :background ,ui-tooltip-bg)))) + `(transient-disabled-suffix ((t (:foreground ,ui-error :background ,ui-active-text-bg)))) + `(transient-separator ((t (:background ,ui-bg-dark :extend t)))) + `(transient-amaranth ((t (:foreground ,pal-orange :weight bold)))) + `(transient-blue ((t (:foreground ,pal-blue :weight bold)))) + `(transient-pink ((t (:foreground ,pal-magenta :weight bold)))) + `(transient-purple ((t (:foreground ,pal-magenta :weight bold)))) + `(transient-red ((t (:foreground ,ui-error :weight bold)))) + `(transient-teal ((t (:foreground ,pal-cyan :weight bold)))) ;; === Treemacs === - `(treemacs-directory-face ((t (:foreground ,on-surface)))) - `(treemacs-file-face ((t (:foreground ,on-surface)))) - `(treemacs-git-added-face ((t (:foreground ,tertiary)))) - `(treemacs-git-conflict-face ((t (:foreground ,err)))) - `(treemacs-git-modified-face ((t (:foreground ,primary)))) - `(treemacs-git-untracked-face ((t (:foreground ,outline-color)))) - `(treemacs-root-face ((t (:foreground ,primary :weight bold :height 1.2)))) - `(treemacs-tags-face ((t (:foreground ,err)))) + `(treemacs-directory-face ((t (:foreground ,ui-fg)))) + `(treemacs-directory-collapsed-face ((t (:foreground ,ui-fg)))) + `(treemacs-file-face ((t (:foreground ,ui-fg)))) + `(treemacs-window-background-face ((t (:background ,ui-bg-dark)))) + `(treemacs-hl-line-face ((t (:background ,ui-bg-light :extend t)))) + `(treemacs-git-added-face ((t (:foreground ,ui-success)))) + `(treemacs-git-conflict-face ((t (:foreground ,ui-error)))) + `(treemacs-git-modified-face ((t (:foreground ,ui-warning)))) + `(treemacs-git-untracked-face ((t (:foreground ,ui-border)))) + `(treemacs-git-ignored-face ((t (:foreground ,ui-border)))) + `(treemacs-root-face ((t (:foreground ,pal-blue :weight bold :height 1.2)))) + `(treemacs-tags-face ((t (:foreground ,ui-error)))) + `(treemacs-help-title-face ((t (:foreground ,syntax-keyword :weight bold)))) + `(treemacs-help-column-face ((t (:foreground ,pal-blue)))) + `(treemacs-on-success-pulse-face ((t (:background ,ui-tooltip-bg)))) + `(treemacs-on-failure-pulse-face ((t (:background ,ui-active-text-bg)))) ;; === Tree-sitter-hl === - `(tree-sitter-hl-face:function ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:function.call ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:function.builtin ((t (:foreground ,err)))) - `(tree-sitter-hl-face:function.special ((t (:foreground ,on-surface :weight bold)))) - `(tree-sitter-hl-face:function.macro ((t (:foreground ,on-surface :weight bold)))) - `(tree-sitter-hl-face:method ((t (:foreground ,secondary)))) - `(tree-sitter-hl-face:method.call ((t (:foreground ,secondary)))) - `(tree-sitter-hl-face:type ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:type.parameter ((t (:foreground ,on-surface-variant)))) - `(tree-sitter-hl-face:type.argument ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:type.builtin ((t (:foreground ,err)))) - `(tree-sitter-hl-face:type.super ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:constructor ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:variable ((t (:foreground ,on-surface)))) - `(tree-sitter-hl-face:variable.parameter ((t (:foreground ,on-surface-variant)))) - `(tree-sitter-hl-face:variable.builtin ((t (:foreground ,err)))) - `(tree-sitter-hl-face:variable.special ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:property ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:property.definition ((t (:foreground ,on-surface-variant)))) - `(tree-sitter-hl-face:comment ((t (:foreground ,outline-color :slant italic)))) - `(tree-sitter-hl-face:doc ((t (:foreground ,on-surface-variant :slant italic)))) - `(tree-sitter-hl-face:string ((t (:foreground ,tertiary)))) - `(tree-sitter-hl-face:string.special ((t (:foreground ,tertiary)))) - `(tree-sitter-hl-face:escape ((t (:foreground ,err)))) - `(tree-sitter-hl-face:embedded ((t (:foreground ,on-surface)))) - `(tree-sitter-hl-face:keyword ((t (:foreground ,secondary :weight bold)))) - `(tree-sitter-hl-face:operator ((t (:foreground ,secondary)))) - `(tree-sitter-hl-face:label ((t (:foreground ,on-surface)))) - `(tree-sitter-hl-face:constant ((t (:foreground ,tertiary :weight bold)))) - `(tree-sitter-hl-face:constant.builtin ((t (:foreground ,err)))) - `(tree-sitter-hl-face:number ((t (:foreground ,primary)))) - `(tree-sitter-hl-face:punctuation ((t (:foreground ,on-surface)))) - `(tree-sitter-hl-face:punctuation.bracket ((t (:foreground ,on-surface)))) - `(tree-sitter-hl-face:punctuation.delimiter ((t (:foreground ,on-surface)))) - `(tree-sitter-hl-face:punctuation.special ((t (:foreground ,err)))) - `(tree-sitter-hl-face:tag ((t (:foreground ,err)))) - `(tree-sitter-hl-face:attribute ((t (:foreground ,on-surface)))) + `(tree-sitter-hl-face:function ((t (:foreground ,syntax-function)))) + `(tree-sitter-hl-face:function.call ((t (:foreground ,syntax-function)))) + `(tree-sitter-hl-face:function.builtin ((t (:foreground ,ui-error)))) + `(tree-sitter-hl-face:function.special ((t (:foreground ,syntax-keyword :weight bold)))) + `(tree-sitter-hl-face:function.macro ((t (:foreground ,syntax-keyword :weight bold)))) + `(tree-sitter-hl-face:method ((t (:foreground ,syntax-function)))) + `(tree-sitter-hl-face:method.call ((t (:foreground ,syntax-function)))) + `(tree-sitter-hl-face:type ((t (:foreground ,syntax-type)))) + `(tree-sitter-hl-face:type.parameter ((t (:foreground ,ui-fg-dim)))) + `(tree-sitter-hl-face:type.argument ((t (:foreground ,syntax-type)))) + `(tree-sitter-hl-face:type.builtin ((t (:foreground ,ui-error)))) + `(tree-sitter-hl-face:type.super ((t (:foreground ,syntax-type)))) + `(tree-sitter-hl-face:constructor ((t (:foreground ,syntax-function)))) + `(tree-sitter-hl-face:variable ((t (:foreground ,syntax-variable)))) + `(tree-sitter-hl-face:variable.parameter ((t (:foreground ,ui-fg-dim)))) + `(tree-sitter-hl-face:variable.builtin ((t (:foreground ,ui-error)))) + `(tree-sitter-hl-face:variable.special ((t (:foreground ,syntax-keyword)))) + `(tree-sitter-hl-face:property ((t (:foreground ,syntax-attribute)))) + `(tree-sitter-hl-face:property.definition ((t (:foreground ,ui-fg-dim)))) + `(tree-sitter-hl-face:comment ((t (:foreground ,syntax-comment :slant italic)))) + `(tree-sitter-hl-face:doc ((t (:foreground ,syntax-comment :slant italic)))) + `(tree-sitter-hl-face:string ((t (:foreground ,syntax-string)))) + `(tree-sitter-hl-face:string.special ((t (:foreground ,syntax-string)))) + `(tree-sitter-hl-face:escape ((t (:foreground ,syntax-keyword)))) + `(tree-sitter-hl-face:embedded ((t (:foreground ,ui-fg)))) + `(tree-sitter-hl-face:keyword ((t (:foreground ,syntax-keyword :weight bold)))) + `(tree-sitter-hl-face:operator ((t (:foreground ,syntax-operator)))) + `(tree-sitter-hl-face:label ((t (:foreground ,ui-fg)))) + `(tree-sitter-hl-face:constant ((t (:foreground ,syntax-constant :weight bold)))) + `(tree-sitter-hl-face:constant.builtin ((t (:foreground ,ui-error)))) + `(tree-sitter-hl-face:number ((t (:foreground ,syntax-number)))) + `(tree-sitter-hl-face:punctuation ((t (:foreground ,ui-fg-dim)))) + `(tree-sitter-hl-face:punctuation.bracket ((t (:foreground ,ui-fg-dim)))) + `(tree-sitter-hl-face:punctuation.delimiter ((t (:foreground ,ui-fg-dim)))) + `(tree-sitter-hl-face:punctuation.special ((t (:foreground ,ui-error)))) + `(tree-sitter-hl-face:tag ((t (:foreground ,ui-error)))) + `(tree-sitter-hl-face:attribute ((t (:foreground ,syntax-attribute)))) ;; === Typescript-mode === - `(typescript-jsdoc-tag ((t (:foreground ,outline-color)))) - `(typescript-jsdoc-type ((t (:foreground ,outline-color)))) - `(typescript-jsdoc-value ((t (:foreground ,outline-color)))) + `(typescript-jsdoc-tag ((t (:foreground ,ui-border)))) + `(typescript-jsdoc-type ((t (:foreground ,ui-border)))) + `(typescript-jsdoc-value ((t (:foreground ,ui-border)))) ;; === Undo-tree === - `(undo-tree-visualizer-active-branch-face ((t (:foreground ,primary)))) - `(undo-tree-visualizer-current-face ((t (:foreground ,tertiary :weight bold)))) - `(undo-tree-visualizer-default-face ((t (:foreground ,outline-color)))) - `(undo-tree-visualizer-register-face ((t (:foreground ,secondary)))) - `(undo-tree-visualizer-unmodified-face ((t (:foreground ,outline-color)))) + `(undo-tree-visualizer-active-branch-face ((t (:foreground ,ui-accent)))) + `(undo-tree-visualizer-current-face ((t (:foreground ,ui-info :weight bold)))) + `(undo-tree-visualizer-default-face ((t (:foreground ,ui-border)))) + `(undo-tree-visualizer-register-face ((t (:foreground ,ui-link)))) + `(undo-tree-visualizer-unmodified-face ((t (:foreground ,ui-border)))) ;; === Volatile-highlights === - `(vhl/default-face ((t (:background ,surface-container-high)))) + `(vhl/default-face ((t (:background ,ui-bg-light)))) ;; === Vterm === - `(vterm ((t (:foreground ,on-surface)))) - `(vterm-color-black ((t (:background ,surface-container-lowest :foreground ,surface-container-lowest)))) - `(vterm-color-blue ((t (:background ,primary :foreground ,primary)))) - `(vterm-color-cyan ((t (:background ,primary-variant :foreground ,primary-variant)))) - `(vterm-color-default ((t (:background ,on-surface :foreground ,on-surface)))) - `(vterm-color-green ((t (:background ,tertiary :foreground ,tertiary)))) - `(vterm-color-magenta ((t (:background ,err-variant :foreground ,err-variant)))) - `(vterm-color-purple ((t (:background ,primary :foreground ,primary)))) - `(vterm-color-red ((t (:background ,err :foreground ,err)))) - `(vterm-color-white ((t (:background ,on-surface :foreground ,on-surface)))) - `(vterm-color-yellow ((t (:background ,secondary :foreground ,secondary)))) + `(vterm ((t (:foreground ,ui-fg :background ,ui-bg)))) + `(vterm-color-black ((t (:background ,pal-black :foreground ,pal-black)))) + `(vterm-color-blue ((t (:background ,pal-blue :foreground ,pal-blue)))) + `(vterm-color-cyan ((t (:background ,pal-cyan :foreground ,pal-cyan)))) + `(vterm-color-default ((t (:background ,ui-fg :foreground ,ui-fg)))) + `(vterm-color-green ((t (:background ,pal-green :foreground ,pal-green)))) + `(vterm-color-magenta ((t (:background ,pal-magenta :foreground ,pal-magenta)))) + `(vterm-color-purple ((t (:background ,pal-magenta :foreground ,pal-magenta)))) + `(vterm-color-red ((t (:background ,pal-red :foreground ,pal-red)))) + `(vterm-color-white ((t (:background ,pal-white :foreground ,pal-white)))) + `(vterm-color-yellow ((t (:background ,pal-yellow :foreground ,pal-yellow)))) - ;; === Web-mode (missing faces) === - `(web-mode-block-control-face ((t (:foreground ,err)))) - `(web-mode-block-delimiter-face ((t (:foreground ,err)))) - `(web-mode-doctype-face ((t (:foreground ,outline-color)))) - `(web-mode-html-entity-face ((t (:foreground ,secondary :slant italic)))) - `(web-mode-json-context-face ((t (:foreground ,tertiary)))) - `(web-mode-json-key-face ((t (:foreground ,tertiary)))) - `(web-mode-keyword-face ((t (:foreground ,primary)))) - `(web-mode-string-face ((t (:foreground ,tertiary)))) - `(web-mode-type-face ((t (:foreground ,primary)))) + ;; === Web-mode === + `(web-mode-error-face ((t (:foreground ,ui-error :underline t)))) + `(web-mode-warning-face ((t (:foreground ,ui-warning :underline t)))) + `(web-mode-preprocessor-face ((t (:foreground ,syntax-keyword)))) + `(web-mode-block-delimiter-face ((t (:foreground ,ui-fg-dim)))) + `(web-mode-block-control-face ((t (:foreground ,syntax-keyword)))) + `(web-mode-builtin-face ((t (:foreground ,ui-error)))) + `(web-mode-symbol-face ((t (:foreground ,syntax-constant)))) + `(web-mode-doctype-face ((t (:foreground ,syntax-comment)))) + `(web-mode-html-tag-face ((t (:foreground ,pal-blue)))) + `(web-mode-html-tag-custom-face ((t (:foreground ,pal-blue)))) + `(web-mode-html-tag-unclosed-face ((t (:foreground ,ui-error :underline t)))) + `(web-mode-html-tag-namespaced-face ((t (:foreground ,pal-blue)))) + `(web-mode-html-tag-bracket-face ((t (:foreground ,ui-fg-dim)))) + `(web-mode-html-attr-name-face ((t (:foreground ,pal-yellow)))) + `(web-mode-html-attr-custom-face ((t (:foreground ,pal-yellow :slant italic)))) + `(web-mode-html-attr-engine-face ((t (:foreground ,pal-yellow)))) + `(web-mode-html-attr-equal-face ((t (:foreground ,ui-fg-dim)))) + `(web-mode-html-attr-value-face ((t (:foreground ,pal-green)))) + `(web-mode-block-attr-name-face ((t (:foreground ,pal-yellow)))) + `(web-mode-block-attr-value-face ((t (:foreground ,pal-green)))) + `(web-mode-variable-name-face ((t (:foreground ,syntax-variable)))) + `(web-mode-css-selector-face ((t (:foreground ,pal-cyan)))) + `(web-mode-css-selector-class-face ((t (:foreground ,pal-green)))) + `(web-mode-css-selector-tag-face ((t (:foreground ,pal-cyan)))) + `(web-mode-css-pseudo-class-face ((t (:foreground ,pal-cyan)))) + `(web-mode-css-at-rule-face ((t (:foreground ,syntax-keyword)))) + `(web-mode-css-property-name-face ((t (:foreground ,pal-blue)))) + `(web-mode-css-color-face ((t (:foreground ,syntax-constant)))) + `(web-mode-css-priority-face ((t (:foreground ,syntax-constant :weight bold)))) + `(web-mode-css-function-face ((t (:foreground ,pal-cyan)))) + `(web-mode-css-variable-face ((t (:foreground ,syntax-variable)))) + `(web-mode-function-name-face ((t (:foreground ,syntax-function)))) + `(web-mode-filter-face ((t (:foreground ,pal-cyan)))) + `(web-mode-function-call-face ((t (:foreground ,syntax-function)))) + `(web-mode-string-face ((t (:foreground ,syntax-string)))) + `(web-mode-block-string-face ((t (:inherit web-mode-string-face)))) + `(web-mode-part-string-face ((t (:inherit web-mode-string-face)))) + `(web-mode-javascript-string-face ((t (:inherit web-mode-string-face)))) + `(web-mode-css-string-face ((t (:inherit web-mode-string-face)))) + `(web-mode-json-key-face ((t (:foreground ,pal-blue)))) + `(web-mode-json-context-face ((t (:foreground ,syntax-keyword)))) + `(web-mode-json-string-face ((t (:inherit web-mode-string-face)))) + `(web-mode-comment-face ((t (:foreground ,syntax-comment :slant italic)))) + `(web-mode-block-comment-face ((t (:inherit web-mode-comment-face)))) + `(web-mode-part-comment-face ((t (:inherit web-mode-comment-face)))) + `(web-mode-json-comment-face ((t (:inherit web-mode-comment-face)))) + `(web-mode-javascript-comment-face ((t (:inherit web-mode-comment-face)))) + `(web-mode-css-comment-face ((t (:inherit web-mode-comment-face)))) + `(web-mode-annotation-face ((t (:foreground ,syntax-comment)))) + `(web-mode-annotation-tag-face ((t (:foreground ,ui-fg-dim)))) + `(web-mode-annotation-type-face ((t (:foreground ,pal-yellow)))) + `(web-mode-annotation-value-face ((t (:foreground ,pal-green)))) + `(web-mode-annotation-html-face ((t (:foreground ,syntax-comment)))) + `(web-mode-constant-face ((t (:foreground ,syntax-constant)))) + `(web-mode-type-face ((t (:foreground ,syntax-type)))) + `(web-mode-keyword-face ((t (:foreground ,syntax-keyword :weight bold)))) + `(web-mode-param-name-face ((t (:foreground ,ui-error)))) + `(web-mode-whitespace-face ((t (:foreground ,ui-error :background ,ui-active-text-bg)))) + `(web-mode-inlay-face ((t (:background ,ui-bg-dark)))) + `(web-mode-block-face ((t (:inherit web-mode-inlay-face)))) + `(web-mode-part-face ((t (:inherit web-mode-inlay-face)))) + `(web-mode-script-face ((t (:inherit web-mode-inlay-face)))) + `(web-mode-style-face ((t (:inherit web-mode-inlay-face)))) + `(web-mode-folded-face ((t (:foreground ,ui-fg-dim :underline t)))) + `(web-mode-current-element-highlight-face ((t (:background ,ui-bg-light)))) + `(web-mode-current-column-highlight-face ((t (:background ,ui-line-highlight)))) + `(web-mode-comment-keyword-face ((t (:foreground ,syntax-keyword :weight bold)))) + `(web-mode-sql-keyword-face ((t (:foreground ,syntax-keyword)))) + `(web-mode-html-entity-face ((t (:foreground ,syntax-constant :slant italic)))) ;; === Wgrep === - `(wgrep-delete-face ((t (:foreground ,on-err-container :background ,err-container)))) - `(wgrep-done-face ((t (:foreground ,tertiary)))) - `(wgrep-face ((t (:weight bold :foreground ,on-tertiary-container :background ,tertiary-container)))) - `(wgrep-file-face ((t (:foreground ,outline-color)))) - `(wgrep-reject-face ((t (:foreground ,err :weight bold)))) + `(wgrep-delete-face ((t (:foreground ,ui-active-text-fg :background ,ui-active-text-bg)))) + `(wgrep-done-face ((t (:foreground ,ui-info)))) + `(wgrep-face ((t (:weight bold :foreground ,ui-tooltip-fg :background ,ui-tooltip-bg)))) + `(wgrep-file-face ((t (:foreground ,ui-border)))) + `(wgrep-reject-face ((t (:foreground ,ui-error :weight bold)))) ;; === Which-func === - `(which-func ((t (:foreground ,primary)))) + `(which-func ((t (:foreground ,ui-accent)))) ;; === Which-key (missing) === - `(which-key-local-map-description-face ((t (:foreground ,secondary)))) + `(which-key-local-map-description-face ((t (:foreground ,ui-link)))) ;; === Whitespace === - `(whitespace-empty ((t (:background ,surface-container)))) - `(whitespace-indentation ((t (:foreground ,outline-variant :background ,surface-container)))) - `(whitespace-line ((t (:background ,surface-container-low :foreground ,err :weight bold)))) - `(whitespace-newline ((t (:foreground ,outline-variant)))) - `(whitespace-space ((t (:foreground ,outline-variant)))) - `(whitespace-tab ((t (:foreground ,outline-variant :background ,surface-container)))) - `(whitespace-trailing ((t (:background ,err-container)))) + `(whitespace-empty ((t (:background ,ui-line-highlight)))) + `(whitespace-indentation ((t (:foreground ,ui-border :background ,ui-line-highlight)))) + `(whitespace-line ((t (:background ,ui-bg-dark :foreground ,ui-error :weight bold)))) + `(whitespace-newline ((t (:foreground ,ui-border)))) + `(whitespace-space ((t (:foreground ,ui-border)))) + `(whitespace-tab ((t (:foreground ,ui-border :background ,ui-line-highlight)))) + `(whitespace-trailing ((t (:background ,ui-active-text-bg)))) ;; === Widget === - `(widget-button ((t (:foreground ,on-surface :weight bold)))) - `(widget-button-pressed ((t (:foreground ,err)))) - `(widget-documentation ((t (:foreground ,tertiary)))) - `(widget-field ((t (:foreground ,on-surface :background ,surface-container-lowest :extend unspecified)))) - `(widget-inactive ((t (:foreground ,outline-color :background ,surface-container-low)))) - `(widget-single-line-field ((t (:foreground ,on-surface :background ,surface-container-lowest)))) - - ;; === Woman === - `(woman-bold ((t (:foreground ,on-surface :weight bold)))) - `(woman-italic ((t (:foreground ,primary :underline ,primary)))) + `(widget-button ((t (:foreground ,ui-fg :weight bold)))) + `(widget-button-pressed ((t (:foreground ,ui-error)))) + `(widget-documentation ((t (:foreground ,ui-info)))) + `(widget-field ((t (:foreground ,ui-fg :background ,ui-bg-dark :extend unspecified)))) + `(widget-inactive ((t (:foreground ,ui-border :background ,ui-bg-dark)))) + `(widget-single-line-field ((t (:foreground ,ui-fg :background ,ui-bg-dark)))) ;; === Yasnippet === - `(yas-field-highlight-face ((t (:foreground ,on-tertiary-container :background ,tertiary-container :weight bold)))) + `(yas-field-highlight-face ((t (:foreground ,ui-tooltip-fg :background ,ui-tooltip-bg :weight bold)))) ;; === Mu4e === - `(mu4e-forwarded-face ((t (:foreground ,primary)))) - `(mu4e-header-key-face ((t (:foreground ,primary :weight bold)))) - `(mu4e-header-title-face ((t (:foreground ,primary)))) - `(mu4e-highlight-face ((t (:foreground ,primary :weight bold)))) - `(mu4e-link-face ((t (:foreground ,primary :underline t)))) - `(mu4e-replied-face ((t (:foreground ,tertiary)))) - `(mu4e-title-face ((t (:foreground ,primary :weight bold)))) - `(mu4e-unread-face ((t (:foreground ,primary :weight bold)))) - `(mu4e-column-faces-date ((t (:foreground ,primary)))) - `(mu4e-column-faces-flags ((t (:foreground ,secondary)))) - `(mu4e-column-faces-to-from ((t (:foreground ,primary)))) + `(mu4e-forwarded-face ((t (:foreground ,ui-accent)))) + `(mu4e-header-key-face ((t (:foreground ,ui-accent :weight bold)))) + `(mu4e-header-title-face ((t (:foreground ,ui-accent)))) + `(mu4e-highlight-face ((t (:foreground ,ui-accent :weight bold)))) + `(mu4e-link-face ((t (:foreground ,ui-accent :underline t)))) + `(mu4e-replied-face ((t (:foreground ,ui-info)))) + `(mu4e-title-face ((t (:foreground ,ui-accent :weight bold)))) + `(mu4e-unread-face ((t (:foreground ,ui-accent :weight bold)))) + `(mu4e-column-faces-date ((t (:foreground ,ui-accent)))) + `(mu4e-column-faces-flags ((t (:foreground ,ui-link)))) + `(mu4e-column-faces-to-from ((t (:foreground ,ui-accent)))) ;; === ERC === `(erc-action-face ((t (:weight bold)))) `(erc-button ((t (:weight bold :underline t)))) `(erc-command-indicator-face ((t (:weight bold)))) - `(erc-current-nick-face ((t (:foreground ,tertiary :weight bold)))) - `(erc-default-face ((t (:background ,bg :foreground ,on-surface)))) - `(erc-direct-msg-face ((t (:foreground ,secondary)))) - `(erc-error-face ((t (:foreground ,err)))) - `(erc-header-line ((t (:background ,surface-container-low :foreground ,primary)))) - `(erc-input-face ((t (:foreground ,tertiary)))) - `(erc-my-nick-face ((t (:foreground ,tertiary :weight bold)))) - `(erc-my-nick-prefix-face ((t (:foreground ,tertiary :weight bold)))) + `(erc-current-nick-face ((t (:foreground ,ui-info :weight bold)))) + `(erc-default-face ((t (:background ,ui-bg :foreground ,ui-fg)))) + `(erc-direct-msg-face ((t (:foreground ,ui-link)))) + `(erc-error-face ((t (:foreground ,ui-error)))) + `(erc-header-line ((t (:background ,ui-bg-dark :foreground ,ui-accent)))) + `(erc-input-face ((t (:foreground ,ui-info)))) + `(erc-my-nick-face ((t (:foreground ,ui-info :weight bold)))) + `(erc-my-nick-prefix-face ((t (:foreground ,ui-info :weight bold)))) `(erc-nick-default-face ((t (:weight bold)))) - `(erc-nick-msg-face ((t (:foreground ,secondary)))) - `(erc-nick-prefix-face ((t (:background ,bg :foreground ,on-surface)))) - `(erc-notice-face ((t (:foreground ,outline-color)))) - `(erc-prompt-face ((t (:foreground ,primary :weight bold)))) - `(erc-timestamp-face ((t (:foreground ,primary :weight bold)))) + `(erc-nick-msg-face ((t (:foreground ,ui-link)))) + `(erc-nick-prefix-face ((t (:background ,ui-bg :foreground ,ui-fg)))) + `(erc-notice-face ((t (:foreground ,ui-border)))) + `(erc-prompt-face ((t (:foreground ,ui-accent :weight bold)))) + `(erc-timestamp-face ((t (:foreground ,ui-accent :weight bold)))) ;; === Nano-modeline === - `(nano-modeline-active-name ((t (:foreground ,on-surface :weight bold)))) - `(nano-modeline-inactive-name ((t (:foreground ,on-surface-variant :weight bold)))) - `(nano-modeline-active-primary ((t (:foreground ,primary)))) - `(nano-modeline-inactive-primary ((t (:foreground ,on-surface-variant)))) - `(nano-modeline-active-secondary ((t (:foreground ,primary :weight bold)))) - `(nano-modeline-inactive-secondary ((t (:foreground ,on-surface-variant :weight bold)))) - `(nano-modeline-active-status-RO ((t (:background ,secondary-container :foreground ,on-secondary-container :weight bold)))) - `(nano-modeline-inactive-status-RO ((t (:background ,surface-container :foreground ,on-surface-variant :weight bold)))) - `(nano-modeline-active-status-RW ((t (:background ,primary-container :foreground ,on-primary-container :weight bold)))) - `(nano-modeline-inactive-status-RW ((t (:background ,surface-container :foreground ,on-surface-variant :weight bold)))) - `(nano-modeline-active-status-** ((t (:background ,err-container :foreground ,on-err-container :weight bold)))) - `(nano-modeline-inactive-status-** ((t (:background ,surface-container :foreground ,on-surface-variant :weight bold)))) + `(nano-modeline-active-name ((t (:foreground ,ui-fg :weight bold)))) + `(nano-modeline-inactive-name ((t (:foreground ,ui-fg-dim :weight bold)))) + `(nano-modeline-active-primary ((t (:foreground ,ui-accent)))) + `(nano-modeline-inactive-primary ((t (:foreground ,ui-fg-dim)))) + `(nano-modeline-active-secondary ((t (:foreground ,ui-accent :weight bold)))) + `(nano-modeline-inactive-secondary ((t (:foreground ,ui-fg-dim :weight bold)))) + `(nano-modeline-active-status-RO ((t (:background ,ui-button-bg :foreground ,ui-button-fg :weight bold)))) + `(nano-modeline-inactive-status-RO ((t (:background ,ui-line-highlight :foreground ,ui-fg-dim :weight bold)))) + `(nano-modeline-active-status-RW ((t (:background ,ui-selection-bg :foreground ,ui-selection-fg :weight bold)))) + `(nano-modeline-inactive-status-RW ((t (:background ,ui-line-highlight :foreground ,ui-fg-dim :weight bold)))) + `(nano-modeline-active-status-** ((t (:background ,ui-active-text-bg :foreground ,ui-active-text-fg :weight bold)))) + `(nano-modeline-inactive-status-** ((t (:background ,ui-line-highlight :foreground ,ui-fg-dim :weight bold)))) ;; === Tab-line (missing) === - `(tab-line-close-highlight ((t (:foreground ,err)))) + `(tab-line-close-highlight ((t (:foreground ,ui-error)))) ;; === Centaur-tabs (missing) === - `(centaur-tabs-close-mouse-face ((t (:foreground ,primary)))) - `(centaur-tabs-close-selected ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(centaur-tabs-close-unselected ((t (:background ,surface-container-low :foreground ,outline-color)))) - `(centaur-tabs-modified-marker-selected ((t (:background ,surface-container-high :foreground ,primary)))) - `(centaur-tabs-modified-marker-unselected ((t (:background ,surface-container-low :foreground ,primary)))) - `(centaur-tabs-name-mouse-face ((t (:foreground ,primary :weight bold :underline t)))) - `(centaur-tabs-unselected-modified ((t (:background ,surface-container-low :foreground ,primary)))) + `(centaur-tabs-close-mouse-face ((t (:foreground ,ui-accent)))) + `(centaur-tabs-close-selected ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(centaur-tabs-close-unselected ((t (:background ,ui-bg-dark :foreground ,ui-border)))) + `(centaur-tabs-modified-marker-selected ((t (:background ,ui-bg-light :foreground ,ui-accent)))) + `(centaur-tabs-modified-marker-unselected ((t (:background ,ui-bg-dark :foreground ,ui-accent)))) + `(centaur-tabs-name-mouse-face ((t (:foreground ,ui-accent :weight bold :underline t)))) + `(centaur-tabs-unselected-modified ((t (:background ,ui-bg-dark :foreground ,ui-accent)))) ;; === Powerline === - `(powerline-active0 ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(powerline-active1 ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(powerline-active2 ((t (:background ,surface-container-high :foreground ,on-surface)))) - `(powerline-inactive0 ((t (:background ,surface-container-low :foreground ,on-surface-variant)))) - `(powerline-inactive1 ((t (:background ,surface-container-low :foreground ,on-surface-variant)))) - `(powerline-inactive2 ((t (:background ,surface-container-low :foreground ,on-surface-variant)))) + `(powerline-active0 ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(powerline-active1 ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(powerline-active2 ((t (:background ,ui-bg-light :foreground ,ui-fg)))) + `(powerline-inactive0 ((t (:background ,ui-bg-dark :foreground ,ui-fg-dim)))) + `(powerline-inactive1 ((t (:background ,ui-bg-dark :foreground ,ui-fg-dim)))) + `(powerline-inactive2 ((t (:background ,ui-bg-dark :foreground ,ui-fg-dim)))) ;; === Spaceline === - `(spaceline-evil-emacs ((t (:background ,secondary)))) - `(spaceline-evil-insert ((t (:background ,tertiary)))) - `(spaceline-evil-motion ((t (:background ,secondary)))) - `(spaceline-evil-normal ((t (:background ,primary)))) - `(spaceline-evil-replace ((t (:background ,err)))) - `(spaceline-evil-visual ((t (:background ,surface-container-high)))) - `(spaceline-flycheck-error ((t (:foreground ,err)))) - `(spaceline-flycheck-info ((t (:foreground ,tertiary)))) - `(spaceline-flycheck-warning ((t (:foreground ,secondary)))) + `(spaceline-evil-emacs ((t (:background ,ui-link)))) + `(spaceline-evil-insert ((t (:background ,ui-info)))) + `(spaceline-evil-motion ((t (:background ,ui-link)))) + `(spaceline-evil-normal ((t (:background ,ui-accent)))) + `(spaceline-evil-replace ((t (:background ,ui-error)))) + `(spaceline-evil-visual ((t (:background ,ui-bg-light)))) + `(spaceline-flycheck-error ((t (:foreground ,ui-error)))) + `(spaceline-flycheck-info ((t (:foreground ,ui-info)))) + `(spaceline-flycheck-warning ((t (:foreground ,ui-link)))) ;; === Smart-mode-line === - `(sml/charging ((t (:foreground ,tertiary)))) - `(sml/discharging ((t (:foreground ,secondary :weight bold)))) - `(sml/filename ((t (:foreground ,primary :weight bold)))) - `(sml/git ((t (:foreground ,primary)))) - `(sml/modified ((t (:foreground ,secondary)))) - `(sml/outside-modified ((t (:foreground ,secondary)))) + `(sml/charging ((t (:foreground ,ui-info)))) + `(sml/discharging ((t (:foreground ,ui-link :weight bold)))) + `(sml/filename ((t (:foreground ,ui-accent :weight bold)))) + `(sml/git ((t (:foreground ,ui-accent)))) + `(sml/modified ((t (:foreground ,ui-link)))) + `(sml/outside-modified ((t (:foreground ,ui-link)))) `(sml/process ((t (:weight bold)))) - `(sml/read-only ((t (:foreground ,secondary)))) - `(sml/sudo ((t (:foreground ,err :weight bold)))) - `(sml/vc-edited ((t (:foreground ,tertiary)))) + `(sml/read-only ((t (:foreground ,ui-link)))) + `(sml/sudo ((t (:foreground ,ui-error :weight bold)))) + `(sml/vc-edited ((t (:foreground ,ui-info)))) - )) + ) + + ;; === Theme variables === + (custom-theme-set-variables + 'tinty + `(ansi-color-names-vector [,ui-button-bg ,pal-red ,pal-green ,pal-yellow ,pal-blue ,pal-magenta ,pal-cyan ,ui-fg-dim]) + `(pdf-view-midnight-colors '(,ui-fg . ,ui-bg))) + ) ;; Org-mode settings (with-eval-after-load 'org |