diff options
| -rw-r--r-- | config.el | 81 | ||||
| -rw-r--r-- | custom-vars.el | 2 | ||||
| -rw-r--r-- | themes/tinty-theme.el | 488 |
3 files changed, 237 insertions, 334 deletions
@@ -2321,87 +2321,6 @@ Timers that expired while Emacs was closed fire immediately." ("C-k" . helm-previous-line))) (global-set-key (kbd "M-x") 'helm-M-x) -(use-package helm-xref - :ensure t - :after helm) - -(use-package citre - :ensure t - :demand t - :init - (require 'citre-config) - :custom - (citre-default-create-tags-file-location 'in-dir) - (citre-edit-ctags-options-manually nil) - (citre-auto-enable-citre-mode-modes '(prog-mode)) - :config - (defvar my/project-ctags-program - (expand-file-name "bin/project-ctags" user-emacs-directory)) - - (defvar-local my/project-ctags-arguments nil) - - (put 'my/project-ctags-arguments 'safe-local-variable - (lambda (value) - (and (listp value) (seq-every-p #'stringp value)))) - - (defun my/project-ctags-root () - (or (projectile-project-root) - (user-error "Not in a Projectile project"))) - - (defun my/project-ctags-enable-citre (root) - (dolist (buffer (buffer-list)) - (with-current-buffer buffer - (when (and buffer-file-name - (file-in-directory-p buffer-file-name root)) - (citre-mode 1))))) - - (defun my/project-ctags-sentinel (process _event) - (when (memq (process-status process) '(exit signal)) - (let ((root (process-get process 'project-root))) - (if (and (eq (process-status process) 'exit) - (zerop (process-exit-status process))) - (progn - (citre-clear-tags-file-cache) - (my/project-ctags-enable-citre root) - (message "Ctags ready for %s" root)) - (display-buffer (process-buffer process)) - (message "Ctags failed for %s; see %s" - root - (buffer-name (process-buffer process))))))) - - (defun my/project-ctags-start (root arguments) - (unless (file-executable-p my/project-ctags-program) - (user-error "Project Ctags generator is not executable: %s" - my/project-ctags-program)) - (let ((output (get-buffer-create "*project-ctags*"))) - (with-current-buffer output - (erase-buffer)) - (let ((process - (make-process - :name (format "ctags:%s" - (file-name-nondirectory - (directory-file-name root))) - :buffer output - :command (append (list my/project-ctags-program root) - arguments) - :connection-type 'pipe - :sentinel #'my/project-ctags-sentinel))) - (process-put process 'project-root root))) - (message "Generating Ctags for %s..." root)) - - (defun my/project-ctags-setup () - (interactive) - (my/project-ctags-start (my/project-ctags-root) - my/project-ctags-arguments)) - - (with-eval-after-load 'evil - (evil-define-key '(normal motion) 'global - (kbd "g d") #'citre-jump - (kbd "g D") #'citre-query-jump - (kbd "g p") #'citre-peek - (kbd "g r") #'citre-jump-to-reference - (kbd "g b") #'citre-jump-back))) - (use-package typst-ts-mode :ensure t :mode "\\.typ\\'") diff --git a/custom-vars.el b/custom-vars.el index acd2177..4f21c7c 100644 --- a/custom-vars.el +++ b/custom-vars.el @@ -42,7 +42,7 @@ (add-to-list 'auto-mode-alist '("\\.html\\'" . jinja2-mode)) (add-to-list 'auto-mode-alist '("\\.j2\\'" . jinja2-mode))))) '(sync-ui-repos - '(("~/org" . auto) ("~/.claude/skills" . auto) ("~/pass" . ask) + '(("~/org" . auto) ("~/.claude/skills" . auto) ("~/pass" . auto) ("~/nix" . ask) ("~/.emacs.d" . auto) ("~/garden/" . ask))) '(zoom-size '(0.382 . 0.618))) (custom-set-faces diff --git a/themes/tinty-theme.el b/themes/tinty-theme.el index b3c7cd9..2aee854 100644 --- a/themes/tinty-theme.el +++ b/themes/tinty-theme.el @@ -212,7 +212,7 @@ `(org-meta-line ((t (:foreground ,ui-border :slant italic)))) ;; === Org headings - rainbow cycle across the available palette === - `(org-level-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1)))) + `(org-level-1 ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h1)))) `(org-level-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2)))) `(org-level-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3)))) `(org-level-4 ((t (:inherit ,vpitch :foreground ,pal-green :weight bold)))) @@ -220,17 +220,17 @@ `(org-level-6 ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold)))) `(org-level-7 ((t (:inherit ,vpitch :foreground ,pal-magenta :weight bold)))) `(org-level-8 ((t (:inherit ,vpitch :foreground ,pal-gray :weight bold)))) - `(org-document-title ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h-doc)))) + `(org-document-title ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h-doc)))) `(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-todo ((t (:foreground ,ui-warning :weight bold)))) + `(org-done ((t (:foreground ,ui-success :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-ellipsis ((t (:foreground ,ui-info :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-formula ((t (:foreground ,syntax-constant :inherit fixed-pitch)))) + `(org-checkbox ((t (:foreground ,ui-accent :weight bold :inherit fixed-pitch)))) + `(org-date ((t (:foreground ,ui-info :underline t)))) `(org-special-keyword ((t (:foreground ,ui-fg-dim :slant italic)))) `(org-tag ((t (:foreground ,ui-border :weight normal)))) @@ -247,15 +247,15 @@ `(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)))) + `(magit-branch-local ((t (:foreground ,ui-accent :weight bold)))) + `(magit-branch-remote ((t (:foreground ,ui-success :weight bold)))) ;; === Company === `(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-search ((t (:foreground ,ui-accent :weight bold)))) + `(company-tooltip-search-selection ((t (:foreground ,ui-accent :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)))) @@ -268,8 +268,8 @@ ;; === Ido === `(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-only-match ((t (:foreground ,ui-info :weight bold)))) + `(ido-subdir ((t (:foreground ,ui-accent)))) `(ido-incomplete-regexp ((t (:foreground ,ui-error)))) `(ido-indicator ((t (:foreground ,ui-warning :background ,ui-bg)))) `(ido-virtual ((t (:foreground ,ui-border)))) @@ -277,7 +277,7 @@ ;; === 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-first-difference ((t (:foreground ,ui-warning)))) `(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)))) @@ -308,9 +308,9 @@ `(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)))) + `(which-key-group-description-face ((t (:foreground ,ui-accent)))) + `(which-key-local-map-description-face ((t (:foreground ,ui-info)))) + `(which-key-special-key-face ((t (:foreground ,ui-warning :weight bold)))) ;; === Line numbers === `(line-number ((t (:foreground ,ui-border :inherit fixed-pitch)))) @@ -367,33 +367,26 @@ `(eshell-ls-unreadable ((t (:foreground ,ui-border)))) ;; === Markdown - rainbow heading cycle === - `(markdown-header-face ((t (:foreground ,pal-red :weight bold)))) - `(markdown-header-face-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1)))) + `(markdown-header-face ((t (:foreground ,ui-accent :weight bold)))) + `(markdown-header-face-1 ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h1)))) `(markdown-header-face-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2)))) `(markdown-header-face-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3)))) `(markdown-header-face-4 ((t (:inherit ,vpitch :foreground ,pal-green :weight bold)))) `(markdown-header-face-5 ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold)))) `(markdown-header-face-6 ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold)))) - `(markdown-inline-code-face ((t (:foreground ,pal-cyan :background ,ui-bg-dark :inherit fixed-pitch)))) + `(markdown-inline-code-face ((t (:foreground ,ui-info :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 ,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 ,ui-error))))) - `(flycheck-warning ((t (:underline (:style wave :color ,ui-link))))) + `(flycheck-warning ((t (:underline (:style wave :color ,ui-warning))))) `(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-warning ((t (:foreground ,ui-warning)))) `(flycheck-fringe-info ((t (:foreground ,ui-info)))) ;; === Minibuffer === @@ -405,14 +398,14 @@ `(lsp-face-highlight-write ((t (:background ,ui-tooltip-bg :foreground ,ui-tooltip-fg :weight bold)))) ;; === Info titles - rainbow heading cycle === - `(info-title-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1)))) + `(info-title-1 ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h1)))) `(info-title-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2)))) `(info-title-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3)))) `(info-title-4 ((t (:inherit ,vpitch :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)))) + `(Info-quoted ((t (:foreground ,ui-info)))) + `(info-menu-header ((t (:foreground ,ui-accent :weight bold)))) + `(info-menu-star ((t (:foreground ,ui-accent)))) + `(info-node ((t (:foreground ,ui-info :weight bold)))) ;; === Tabs === `(tab-bar ((t (:background ,ui-bg-light :foreground ,ui-fg :box nil)))) @@ -426,8 +419,8 @@ `(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-selected-modified ((t (:background ,ui-bg-light :foreground ,ui-warning :weight bold)))) + `(centaur-tabs-unselected-modified ((t (:background ,ui-bg :foreground ,ui-warning)))) `(centaur-tabs-active-bar-face ((t (:background ,ui-accent)))) ;; === Fixed/variable pitch === @@ -450,14 +443,14 @@ ;; === 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)))) + `(isearch-group-1 ((t (:background ,ui-accent :foreground ,ui-bg :weight bold)))) + `(isearch-group-2 ((t (:background ,ui-link :foreground ,ui-bg :weight bold)))) ;; === HL-line === `(hl-line ((t (:background ,ui-bg-dark :extend t)))) ;; === HL-todo === - `(hl-todo ((t (:foreground ,ui-error :weight bold)))) + `(hl-todo ((t (:foreground ,ui-warning :weight bold)))) ;; === Trailing whitespace & linum === `(linum ((t (:foreground ,ui-border)))) @@ -465,7 +458,7 @@ `(linum-highlight-face ((t (:foreground ,ui-fg :weight normal)))) ;; === Outline (non-org) - rainbow cycle === - `(outline-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight ultra-bold :height ,h1)))) + `(outline-1 ((t (:inherit ,vpitch :foreground ,ui-accent :weight ultra-bold :height ,h1)))) `(outline-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2)))) `(outline-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3)))) `(outline-4 ((t (:inherit ,vpitch :foreground ,pal-green)))) @@ -473,7 +466,7 @@ `(outline-6 ((t (:inherit ,vpitch :foreground ,pal-blue)))) `(outline-7 ((t (:inherit ,vpitch :foreground ,pal-magenta)))) `(outline-8 ((t (:inherit ,vpitch :foreground ,pal-gray)))) - `(outline-minor-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight ultra-bold :height ,h1)))) + `(outline-minor-1 ((t (:inherit ,vpitch :foreground ,ui-accent :weight ultra-bold :height ,h1)))) `(outline-minor-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2)))) `(outline-minor-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3)))) `(outline-minor-4 ((t (:inherit ,vpitch :foreground ,pal-green)))) @@ -485,8 +478,8 @@ ;; === Org (missing faces) === `(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-checkbox-statistics-done ((t (:foreground ,ui-success :weight bold)))) + `(org-checkbox-statistics-todo ((t (:foreground ,ui-warning :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)))) @@ -496,7 +489,7 @@ `(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-warning ((t (:foreground ,ui-warning :weight bold)))) ;; === Org agenda === `(org-agenda-clocking ((t (:background ,ui-button-bg :foreground ,ui-button-fg)))) @@ -505,7 +498,7 @@ `(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-done ((t (:foreground ,ui-success)))) `(org-agenda-structure ((t (:foreground ,ui-fg :weight ultra-bold)))) `(org-imminent-deadline ((t (:foreground ,ui-error)))) `(org-scheduled ((t (:foreground ,ui-fg)))) @@ -529,22 +522,22 @@ ;; === Org journal === `(org-journal-calendar-entry-face ((t (:foreground ,ui-link :slant italic)))) - `(org-journal-calendar-scheduled-face ((t (:foreground ,ui-error :slant italic)))) + `(org-journal-calendar-scheduled-face ((t (:foreground ,ui-warning :slant italic)))) `(org-journal-highlight ((t (:foreground ,ui-info)))) ;; === Org pomodoro === - `(org-pomodoro-mode-line ((t (:foreground ,ui-error)))) - `(org-pomodoro-mode-line-overtime ((t (:foreground ,ui-link :weight bold)))) + `(org-pomodoro-mode-line ((t (:foreground ,ui-accent)))) + `(org-pomodoro-mode-line-overtime ((t (:foreground ,ui-warning :weight bold)))) ;; === Org ref === `(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)))) + `(org-ref-ref-face ((t (:foreground ,ui-link :underline t :weight bold)))) ;; === Ace-window === - `(aw-leading-char-face ((t (:foreground ,ui-error :height 500 :weight bold)))) + `(aw-leading-char-face ((t (:foreground ,ui-accent :height 500 :weight bold)))) `(aw-background-face ((t (:foreground ,ui-border)))) ;; === Alert === @@ -587,19 +580,19 @@ `(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-line-number ((t (:foreground ,ui-accent)))) + `(compilation-mode-line-exit ((t (:foreground ,ui-success)))) `(compilation-mode-line-fail ((t (:foreground ,ui-error :weight bold)))) - `(compilation-warning ((t (:foreground ,ui-link :slant italic)))) + `(compilation-warning ((t (:foreground ,ui-warning :slant italic)))) ;; === Consult === `(consult-file ((t (:foreground ,ui-fg-dim)))) - `(consult-bookmark ((t (:foreground ,pal-yellow)))) + `(consult-bookmark ((t (:foreground ,ui-accent)))) `(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-highlight-match ((t (:foreground ,ui-warning :weight bold)))) `(consult-preview-match ((t (:background ,ui-bg-light)))) `(consult-async-split ((t (:foreground ,syntax-keyword)))) `(consult-key ((t (:foreground ,syntax-keyword)))) @@ -630,7 +623,7 @@ `(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-saved ((t (:foreground ,ui-success :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)))) @@ -643,27 +636,27 @@ `(anzu-match-1 ((t (:foreground ,ui-bg :background ,pal-blue)))) `(anzu-match-2 ((t (:foreground ,ui-bg :background ,pal-cyan)))) `(anzu-match-3 ((t (:foreground ,ui-bg :background ,pal-orange)))) - `(anzu-mode-line ((t (:foreground ,pal-cyan :weight bold)))) + `(anzu-mode-line ((t (:foreground ,ui-info :weight bold)))) `(anzu-mode-line-no-match ((t (:foreground ,ui-error :weight bold)))) `(asciidoc-admonition-caution-face ((t (:background ,ui-bg-dark :extend t)))) - `(asciidoc-admonition-caution-label-face ((t (:foreground ,pal-yellow :weight bold)))) + `(asciidoc-admonition-caution-label-face ((t (:foreground ,ui-warning :weight bold)))) `(asciidoc-admonition-important-face ((t (:background ,ui-bg-dark :extend t)))) `(asciidoc-admonition-important-label-face ((t (:foreground ,syntax-keyword :weight bold)))) `(asciidoc-admonition-note-face ((t (:background ,ui-button-bg :extend t)))) - `(asciidoc-admonition-note-label-face ((t (:foreground ,pal-blue :weight bold)))) + `(asciidoc-admonition-note-label-face ((t (:foreground ,ui-info :weight bold)))) `(asciidoc-admonition-tip-face ((t (:background ,ui-tooltip-bg :extend t)))) `(asciidoc-admonition-tip-label-face ((t (:foreground ,ui-success :weight bold)))) `(asciidoc-admonition-warning-face ((t (:background ,ui-active-text-bg :extend t)))) - `(asciidoc-admonition-warning-label-face ((t (:foreground ,ui-error :weight bold)))) - `(asciidoc-anchor-face ((t (:foreground ,pal-magenta)))) - `(asciidoc-code-face ((t (:foreground ,pal-cyan :background ,ui-bg-dark :extend t)))) - `(asciidoc-cross-reference-face ((t (:foreground ,pal-magenta :underline t)))) - `(asciidoc-document-title-face ((t (:inherit ,vpitch :foreground ,ui-fg :weight bold :height ,h-doc)))) - `(asciidoc-footnote-marker-face ((t (:foreground ,pal-cyan)))) + `(asciidoc-admonition-warning-label-face ((t (:foreground ,ui-warning :weight bold)))) + `(asciidoc-anchor-face ((t (:foreground ,ui-link)))) + `(asciidoc-code-face ((t (:foreground ,ui-info :background ,ui-bg-dark :extend t)))) + `(asciidoc-cross-reference-face ((t (:foreground ,ui-link :underline t)))) + `(asciidoc-document-title-face ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h-doc)))) + `(asciidoc-footnote-marker-face ((t (:foreground ,ui-info)))) `(asciidoc-footnote-text-face ((t (:foreground ,ui-fg-dim)))) - `(asciidoc-highlight-face ((t (:foreground ,ui-bg :background ,pal-yellow)))) - `(asciidoc-link-face ((t (:foreground ,pal-blue :underline t)))) - `(asciidoc-link-mouse-face ((t (:foreground ,pal-blue :background ,ui-bg-light :underline t)))) + `(asciidoc-highlight-face ((t (:foreground ,ui-search-fg :background ,ui-search-bg)))) + `(asciidoc-link-face ((t (:foreground ,ui-link :underline t)))) + `(asciidoc-link-mouse-face ((t (:foreground ,ui-link :background ,ui-bg-light :underline t)))) `(asciidoc-markup-face ((t (:foreground ,ui-fg-dim)))) `(asciidoc-metadata-key-face ((t (:foreground ,ui-fg-dim)))) `(asciidoc-metadata-value-face ((t (:foreground ,ui-fg-dim)))) @@ -671,95 +664,95 @@ `(asciidoc-strike-through-face ((t (:foreground ,ui-fg-dim :strike-through t)))) `(asciidoc-subscript-face ((t (:foreground ,ui-fg :height 0.8)))) `(asciidoc-superscript-face ((t (:foreground ,ui-fg :height 0.8)))) - `(asciidoc-title-1-face ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1)))) + `(asciidoc-title-1-face ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h1)))) `(asciidoc-title-2-face ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2)))) `(asciidoc-title-3-face ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3)))) `(asciidoc-title-4-face ((t (:inherit ,vpitch :foreground ,pal-green :weight bold)))) `(asciidoc-title-5-face ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold)))) `(asciidoc-underline-face ((t (:underline t)))) - `(asciidoc-url-face ((t (:foreground ,pal-blue :underline t)))) + `(asciidoc-url-face ((t (:foreground ,ui-link :underline t)))) `(breadcrumb-face ((t (:foreground ,ui-fg-dim)))) `(breadcrumb-imenu-base-face ((t (:foreground ,ui-fg-dim :weight bold)))) `(breadcrumb-imenu-crumbs-face ((t (:foreground ,ui-fg-dim)))) - `(breadcrumb-imenu-leaf-face ((t (:foreground ,pal-blue :weight bold)))) + `(breadcrumb-imenu-leaf-face ((t (:foreground ,ui-accent :weight bold)))) `(breadcrumb-project-base-face ((t (:foreground ,ui-fg-dim :weight bold)))) `(breadcrumb-project-crumbs-face ((t (:foreground ,ui-fg-dim)))) `(breadcrumb-project-leaf-face ((t (:foreground ,ui-fg :weight bold)))) `(cider-debug-prompt-face ((t (:foreground ,syntax-keyword :weight bold)))) `(cider-fringe-bad-face ((t (:foreground ,ui-error)))) - `(cider-fringe-stale-face ((t (:foreground ,pal-yellow)))) + `(cider-fringe-stale-face ((t (:foreground ,ui-warning)))) `(cider-reader-conditional-face ((t (:foreground ,ui-fg-dim)))) - `(cider-repl-result-face ((t (:foreground ,pal-cyan)))) + `(cider-repl-result-face ((t (:foreground ,ui-info)))) `(clojure-character-face ((t (:foreground ,ui-success)))) `(clojure-discard-face ((t (:foreground ,ui-fg-dim :slant italic)))) - `(clojure-keyword-face ((t (:foreground ,pal-cyan)))) + `(clojure-keyword-face ((t (:foreground ,syntax-keyword)))) `(completion-preview ((t (:foreground ,ui-fg-dim)))) `(completion-preview-common ((t (:foreground ,ui-fg-dim)))) `(completion-preview-exact ((t (:foreground ,ui-fg-dim :underline t)))) `(copilot-overlay-face ((t (:foreground ,ui-fg-dim :slant italic)))) `(corfu-popupinfo ((t (:foreground ,ui-fg :background ,ui-bg-dark)))) - `(dictionary-button-face ((t (:foreground ,pal-blue :underline t :weight bold)))) + `(dictionary-button-face ((t (:foreground ,ui-link :underline t :weight bold)))) `(dictionary-reference-face ((t (:foreground ,ui-link :underline t)))) `(dictionary-word-definition-face ((t (:foreground ,ui-fg)))) - `(dictionary-word-entry-face ((t (:foreground ,pal-blue :weight bold)))) + `(dictionary-word-entry-face ((t (:foreground ,ui-accent :weight bold)))) `(easy-kill-origin ((t (:foreground ,ui-bg :background ,ui-error)))) `(easy-kill-selection ((t (:background ,ui-selection-bg :extend t)))) `(erlang-edoc-heading ((t (:foreground ,syntax-keyword :weight bold)))) - `(erlang-edoc-macro ((t (:foreground ,pal-magenta)))) + `(erlang-edoc-macro ((t (:foreground ,syntax-preprocessor)))) `(erlang-edoc-tag ((t (:foreground ,ui-fg-dim)))) `(erlang-edoc-todo ((t (:foreground ,ui-error :weight bold)))) - `(erlang-edoc-verbatim ((t (:foreground ,pal-cyan)))) - `(erlang-font-lock-exported-function-name-face ((t (:foreground ,pal-blue :weight bold)))) + `(erlang-edoc-verbatim ((t (:foreground ,ui-info)))) + `(erlang-font-lock-exported-function-name-face ((t (:foreground ,syntax-function :weight bold)))) `(font-latex-bold-face ((t (:foreground ,ui-fg :weight bold)))) `(font-latex-italic-face ((t (:foreground ,ui-fg :slant italic)))) - `(font-latex-math-face ((t (:foreground ,pal-cyan)))) - `(font-latex-script-char-face ((t (:foreground ,pal-orange)))) - `(font-latex-sectioning-0-face ((t (:inherit ,vpitch :foreground ,pal-red :height ,h1 :weight bold)))) + `(font-latex-math-face ((t (:foreground ,ui-info)))) + `(font-latex-script-char-face ((t (:foreground ,ui-warning)))) + `(font-latex-sectioning-0-face ((t (:inherit ,vpitch :foreground ,ui-accent :height ,h1 :weight bold)))) `(font-latex-sectioning-1-face ((t (:inherit ,vpitch :foreground ,pal-orange :height ,h2 :weight bold)))) `(font-latex-sectioning-2-face ((t (:inherit ,vpitch :foreground ,pal-yellow :height ,h3 :weight bold)))) `(font-latex-sectioning-3-face ((t (:inherit ,vpitch :foreground ,pal-green :weight bold)))) `(font-latex-sectioning-4-face ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold)))) `(font-latex-sectioning-5-face ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold)))) `(font-latex-sedate-face ((t (:foreground ,ui-fg-dim)))) - `(font-latex-slide-title-face ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold :height ,h1)))) + `(font-latex-slide-title-face ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h1)))) `(font-latex-string-face ((t (:foreground ,ui-success)))) `(font-latex-subscript-face ((t (:height 0.9)))) `(font-latex-superscript-face ((t (:height 0.9)))) - `(font-latex-verbatim-face ((t (:foreground ,pal-cyan :inherit fixed-pitch)))) - `(font-latex-warning-face ((t (:foreground ,pal-orange :weight bold)))) + `(font-latex-verbatim-face ((t (:foreground ,ui-info :inherit fixed-pitch)))) + `(font-latex-warning-face ((t (:foreground ,ui-warning :weight bold)))) `(font-latex-doctex-documentation-face ((t (:background ,ui-bg-dark)))) `(font-latex-doctex-preprocessor-face ((t (:foreground ,syntax-keyword)))) - `(git-timemachine-commit ((t (:foreground ,pal-orange :weight bold)))) - `(git-timemachine-minibuffer-author-face ((t (:foreground ,pal-blue)))) - `(git-timemachine-minibuffer-detail-face ((t (:foreground ,pal-cyan)))) + `(git-timemachine-commit ((t (:foreground ,ui-warning :weight bold)))) + `(git-timemachine-minibuffer-author-face ((t (:foreground ,ui-accent)))) + `(git-timemachine-minibuffer-detail-face ((t (:foreground ,ui-info)))) `(gptel-context-deletion-face ((t (:background ,ui-active-text-bg :extend t)))) `(gptel-context-highlight-face ((t (:background ,ui-bg-light :extend t)))) - `(gptel-response-fringe-highlight ((t (:foreground ,pal-blue)))) + `(gptel-response-fringe-highlight ((t (:foreground ,ui-accent)))) `(gptel-response-highlight ((t (:background ,ui-bg-dark :extend t)))) `(gptel-rewrite-highlight-face ((t (:background ,ui-button-bg :extend t)))) - `(haskell-constructor-face ((t (:foreground ,pal-yellow)))) - `(haskell-definition-face ((t (:foreground ,pal-blue)))) + `(haskell-constructor-face ((t (:foreground ,syntax-type)))) + `(haskell-definition-face ((t (:foreground ,syntax-function)))) `(haskell-error-face ((t (:underline (:style wave :color ,ui-error))))) - `(haskell-hole-face ((t (:foreground ,pal-yellow :weight bold)))) + `(haskell-hole-face ((t (:foreground ,ui-warning :weight bold)))) `(haskell-interactive-face-compile-error ((t (:foreground ,ui-error :weight bold)))) - `(haskell-interactive-face-compile-warning ((t (:foreground ,pal-yellow :weight bold)))) + `(haskell-interactive-face-compile-warning ((t (:foreground ,ui-warning :weight bold)))) `(haskell-interactive-face-garbage ((t (:foreground ,ui-fg-dim)))) - `(haskell-interactive-face-prompt ((t (:foreground ,pal-blue :weight bold)))) + `(haskell-interactive-face-prompt ((t (:foreground ,ui-accent :weight bold)))) `(haskell-interactive-face-prompt-cont ((t (:foreground ,ui-link)))) `(haskell-interactive-face-result ((t (:foreground ,ui-success)))) `(haskell-keyword-face ((t (:foreground ,syntax-keyword)))) `(haskell-literate-comment-face ((t (:foreground ,ui-fg-dim :slant italic)))) - `(haskell-operator-face ((t (:foreground ,pal-cyan)))) - `(haskell-pragma-face ((t (:foreground ,pal-magenta)))) + `(haskell-operator-face ((t (:foreground ,syntax-operator)))) + `(haskell-pragma-face ((t (:foreground ,syntax-annotation)))) `(haskell-quasi-quote-face ((t (:foreground ,ui-success)))) - `(haskell-type-face ((t (:foreground ,pal-yellow)))) - `(haskell-warning-face ((t (:underline (:style wave :color ,pal-yellow))))) + `(haskell-type-face ((t (:foreground ,syntax-type)))) + `(haskell-warning-face ((t (:underline (:style wave :color ,ui-warning))))) `(inf-ruby-result-overlay-face ((t (:foreground ,ui-success :background ,ui-bg-dark :box (:line-width -1 :color ,ui-bg-light))))) `(jinx-annotation ((t (:foreground ,ui-fg-dim)))) `(jinx-highlight ((t (:foreground ,ui-bg :background ,ui-error :weight bold)))) `(jinx-key ((t (:foreground ,syntax-keyword :weight bold)))) `(jinx-misspelled ((t (:underline (:style wave :color ,ui-error))))) - `(jinx-save ((t (:foreground ,pal-orange :weight bold)))) + `(jinx-save ((t (:foreground ,ui-warning :weight bold)))) `(mistty-fringe-face ((t (:foreground ,ui-border)))) `(nrepl-message-1-face ((t (:foreground ,ui-error)))) `(nrepl-message-2-face ((t (:foreground ,pal-orange)))) @@ -769,30 +762,30 @@ `(nrepl-message-6-face ((t (:foreground ,ui-link)))) `(nrepl-message-7-face ((t (:foreground ,pal-blue)))) `(nrepl-message-8-face ((t (:foreground ,pal-magenta)))) - `(shr-h1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1)))) + `(shr-h1 ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold :height ,h1)))) `(shr-h2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2)))) `(shr-h3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3)))) `(shr-h4 ((t (:inherit ,vpitch :foreground ,pal-green :weight bold)))) `(shr-h5 ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold)))) `(shr-h6 ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold)))) - `(shr-link ((t (:foreground ,pal-blue :underline t)))) - `(shr-selected-link ((t (:foreground ,pal-orange :underline t)))) - `(shr-code ((t (:foreground ,pal-cyan :background ,ui-bg-dark)))) - `(shr-mark ((t (:foreground ,ui-bg :background ,pal-yellow)))) + `(shr-link ((t (:foreground ,ui-link :underline t)))) + `(shr-selected-link ((t (:foreground ,ui-warning :underline t)))) + `(shr-code ((t (:foreground ,ui-info :background ,ui-bg-dark)))) + `(shr-mark ((t (:foreground ,ui-search-fg :background ,ui-search-bg)))) `(vundo-branch-stem ((t (:foreground ,ui-border)))) - `(vundo-diff-highlight ((t (:foreground ,pal-orange :weight bold)))) - `(vundo-highlight ((t (:foreground ,pal-blue :weight bold)))) + `(vundo-diff-highlight ((t (:foreground ,ui-warning :weight bold)))) + `(vundo-highlight ((t (:foreground ,ui-accent :weight bold)))) `(vundo-last-saved ((t (:foreground ,ui-success :weight bold)))) `(vundo-node ((t (:foreground ,ui-fg-dim)))) `(vundo-saved ((t (:foreground ,ui-success)))) `(vundo-stem ((t (:foreground ,ui-border)))) ;; === 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-today ((t (:foreground ,ui-accent :weight bold :underline t)))) + `(calendar-weekend-header ((t (:foreground ,ui-warning)))) + `(calendar-weekday-header ((t (:foreground ,ui-info)))) `(calendar-month-header ((t (:foreground ,syntax-keyword :weight bold)))) - `(holiday ((t (:foreground ,pal-orange)))) - `(diary ((t (:foreground ,pal-yellow)))) + `(holiday ((t (:foreground ,ui-warning)))) + `(diary ((t (:foreground ,ui-info)))) ;; === Eglot === `(eglot-highlight-symbol-face ((t (:background ,ui-bg-light :weight bold)))) @@ -802,8 +795,8 @@ ;; === 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-field-name ((t (:foreground ,ui-accent :weight bold)))) + `(epa-mark ((t (:foreground ,ui-warning :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)))) @@ -811,40 +804,40 @@ `(epa-validity-medium ((t (:foreground ,ui-warning)))) ;; === Proced === - `(proced-mark ((t (:foreground ,pal-orange :weight bold)))) + `(proced-mark ((t (:foreground ,ui-warning :weight bold)))) `(proced-marked ((t (:foreground ,syntax-keyword :weight bold)))) - `(proced-sort-header ((t (:foreground ,pal-blue :weight bold :underline t)))) + `(proced-sort-header ((t (:foreground ,ui-accent :weight bold :underline t)))) ;; === Speedbar === `(speedbar-button-face ((t (:foreground ,ui-success)))) - `(speedbar-directory-face ((t (:foreground ,pal-blue :weight bold)))) + `(speedbar-directory-face ((t (:foreground ,ui-accent :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-selected-face ((t (:foreground ,ui-warning :weight bold)))) `(speedbar-separator-face ((t (:foreground ,ui-border :background ,ui-bg-dark)))) - `(speedbar-tag-face ((t (:foreground ,pal-cyan)))) + `(speedbar-tag-face ((t (:foreground ,ui-info)))) ;; === 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-locked-state ((t (:foreground ,ui-warning :weight bold)))) `(vc-missing-state ((t (:foreground ,ui-error)))) - `(vc-needs-update-state ((t (:foreground ,pal-orange)))) + `(vc-needs-update-state ((t (:foreground ,ui-warning)))) `(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-file-header ((t (:foreground ,ui-accent :weight bold)))) `(xref-line-number ((t (:foreground ,ui-fg-dim)))) - `(xref-match ((t (:foreground ,pal-orange :weight bold)))) + `(xref-match ((t (:foreground ,ui-warning :weight bold)))) ;; === Man / Woman === - `(Man-overstrike ((t (:foreground ,pal-blue :weight bold)))) - `(Man-underline ((t (:foreground ,pal-cyan :underline t)))) + `(Man-overstrike ((t (:foreground ,ui-accent :weight bold)))) + `(Man-underline ((t (:foreground ,ui-info :underline t)))) `(Man-reverse ((t (:foreground ,ui-bg :background ,ui-fg)))) - `(woman-bold ((t (:foreground ,pal-blue :weight bold)))) + `(woman-bold ((t (:foreground ,ui-accent :weight bold)))) `(woman-italic ((t (:foreground ,syntax-keyword :slant italic)))) ;; === Pulse === @@ -854,52 +847,52 @@ `(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-changed ((t (:foreground ,ui-warning :background ,ui-button-bg :extend t)))) + `(diff-indicator-changed ((t (:foreground ,ui-warning :weight bold :background ,ui-button-bg :extend t)))) + `(diff-refine-changed ((t (:foreground ,ui-warning :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-file-header ((t (:foreground ,ui-accent :background ,ui-bg-dark :weight bold :extend t)))) + `(diff-hunk-header ((t (:foreground ,ui-warning :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 ,ui-link :background ,ui-button-bg)))) + `(diff-hl-change ((t (:foreground ,ui-warning :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)))) + `(diff-hl-insert ((t (:foreground ,ui-success :background ,ui-tooltip-bg)))) ;; === Dired (missing faces) === `(dired-mark ((t (:foreground ,ui-link :weight bold)))) - `(dired-perm-write ((t (:foreground ,ui-error :underline t)))) - `(dired-warning ((t (:foreground ,ui-link)))) + `(dired-perm-write ((t (:foreground ,ui-warning :underline t)))) + `(dired-warning ((t (:foreground ,ui-warning)))) ;; === Diredfl === `(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-compressed-file-name ((t (:foreground ,ui-success)))) + `(diredfl-compressed-file-suffix ((t (:foreground ,ui-success)))) `(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-exec-priv ((t (:foreground ,ui-accent)))) + `(diredfl-executable-tag ((t (:foreground ,ui-accent)))) `(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-number ((t (:foreground ,syntax-number)))) `(diredfl-other-priv ((t (:inherit diredfl-exec-priv)))) `(diredfl-rare-priv ((t (:inherit diredfl-exec-priv)))) - `(diredfl-read-priv ((t (:foreground ,pal-cyan)))) + `(diredfl-read-priv ((t (:foreground ,ui-info)))) `(diredfl-symlink ((t (:inherit dired-symlink)))) - `(diredfl-tagged-autofile-name ((t (:foreground ,pal-magenta)))) + `(diredfl-tagged-autofile-name ((t (:foreground ,syntax-annotation)))) `(diredfl-write-priv ((t (:foreground ,ui-error)))) ;; === Dired-subtree === @@ -911,12 +904,12 @@ `(dired-subtree-depth-6-face ((t (:background ,ui-bg-dark)))) ;; === Dired-k === - `(dired-k-added ((t (:foreground ,ui-info :weight bold)))) - `(dired-k-commited ((t (:foreground ,ui-info :weight bold)))) + `(dired-k-added ((t (:foreground ,ui-success :weight bold)))) + `(dired-k-commited ((t (:foreground ,ui-success :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)))) + `(dired-k-modified ((t (:foreground ,ui-warning :weight bold)))) + `(dired-k-untracked ((t (:foreground ,ui-info :weight bold)))) ;; === Doom-modeline === `(doom-modeline-bar ((t (:foreground ,ui-accent)))) @@ -924,11 +917,11 @@ `(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-insert-state ((t (:foreground ,ui-success :weight bold)))) + `(doom-modeline-evil-motion-state ((t (:foreground ,ui-info :weight bold)))) + `(doom-modeline-evil-normal-state ((t (:foreground ,ui-accent :weight bold)))) + `(doom-modeline-evil-operator-state ((t (:foreground ,ui-warning :weight bold)))) + `(doom-modeline-evil-replace-state ((t (:foreground ,ui-error :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)))) @@ -956,14 +949,14 @@ ;; === Elfeed === `(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-info-level-face ((t (:foreground ,ui-info)))) `(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-date-face ((t (:foreground ,ui-info)))) + `(elfeed-search-feed-face ((t (:foreground ,ui-accent)))) `(elfeed-search-filter-face ((t (:foreground ,syntax-keyword)))) - `(elfeed-search-tag-face ((t (:foreground ,pal-cyan)))) + `(elfeed-search-tag-face ((t (:foreground ,ui-info)))) `(elfeed-search-title-face ((t (:foreground ,ui-fg-dim)))) - `(elfeed-search-unread-count-face ((t (:foreground ,pal-blue :weight bold)))) + `(elfeed-search-unread-count-face ((t (:foreground ,ui-accent :weight bold)))) `(elfeed-search-unread-title-face ((t (:foreground ,ui-fg :weight bold)))) ;; === Cider === @@ -973,18 +966,18 @@ `(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-prompt-face ((t (:foreground ,ui-accent :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 ,ui-error :slant italic)))) + `(evil-ex-info ((t (:foreground ,ui-info :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-ex-substitute-replacement ((t (:background ,ui-bg-light :foreground ,ui-warning :weight bold)))) `(evil-search-highlight-persist-highlight-face ((t (:background ,ui-search-bg :foreground ,ui-search-fg :weight bold)))) ;; === Evil-goggles === @@ -997,26 +990,26 @@ `(evil-mc-region-face ((t (:background ,ui-bg-light :distant-foreground ,ui-bg :extend t)))) ;; === Evil-snipe === - `(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)))) + `(evil-snipe-first-match-face ((t (:foreground ,ui-accent :background ,ui-selection-bg :weight bold)))) + `(evil-snipe-matches-face ((t (:foreground ,ui-accent :underline t :weight bold)))) ;; === Flycheck (missing) === `(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-error-list-warning ((t (:foreground ,ui-warning)))) `(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)))) + `(flycheck-posframe-warning-face ((t (:background ,ui-bg-dark :foreground ,ui-warning)))) ;; === Flymake === `(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))))) + `(flymake-warning ((t (:underline (:style wave :color ,ui-warning))))) ;; === Flyspell === - `(flyspell-duplicate ((t (:underline (:style wave :color ,ui-link))))) + `(flyspell-duplicate ((t (:underline (:style wave :color ,ui-warning))))) `(flyspell-incorrect ((t (:underline (:style wave :color ,ui-error))))) ;; === Flx-ido === @@ -1044,15 +1037,15 @@ `(git-commit-summary ((t (:foreground ,ui-accent)))) ;; === Git-gutter === - `(git-gutter:added ((t (:foreground ,ui-info)))) + `(git-gutter:added ((t (:foreground ,ui-success)))) `(git-gutter:deleted ((t (:foreground ,ui-error)))) - `(git-gutter:modified ((t (:foreground ,ui-link)))) - `(git-gutter+-added ((t (:foreground ,ui-info)))) + `(git-gutter:modified ((t (:foreground ,ui-warning)))) + `(git-gutter+-added ((t (:foreground ,ui-success)))) `(git-gutter+-deleted ((t (:foreground ,ui-error)))) - `(git-gutter+-modified ((t (:foreground ,ui-link)))) - `(git-gutter-fr:added ((t (:foreground ,ui-info)))) + `(git-gutter+-modified ((t (:foreground ,ui-warning)))) + `(git-gutter-fr:added ((t (:foreground ,ui-success)))) `(git-gutter-fr:deleted ((t (:foreground ,ui-error)))) - `(git-gutter-fr:modified ((t (:foreground ,ui-link)))) + `(git-gutter-fr:modified ((t (:foreground ,ui-warning)))) ;; === Goggles === `(goggles-added ((t (:background ,ui-tooltip-bg)))) @@ -1115,27 +1108,24 @@ `(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-modified-buffer ((t (:weight bold :foreground ,ui-warning)))) `(ivy-virtual ((t (:slant italic :foreground ,ui-fg)))) `(ivy-posframe ((t (:background ,ui-bg-dark)))) - `(ivy-posframe-border ((t (:background ,ui-error)))) + `(ivy-posframe-border ((t (:background ,ui-border)))) ;; === Keycast === - `(keycast-command ((t (:foreground ,ui-error)))) - `(keycast-key ((t (:foreground ,ui-error :weight bold)))) + `(keycast-command ((t (:foreground ,ui-fg)))) + `(keycast-key ((t (:foreground ,ui-accent :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 ,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-doc-url ((t (:foreground ,ui-link :underline t)))) + `(lsp-ui-peek-filename ((t (:foreground ,ui-accent :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)))) @@ -1150,21 +1140,19 @@ ;; === Magit (missing faces) === `(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-bisect-good ((t (:foreground ,ui-success)))) + `(magit-bisect-skip ((t (:foreground ,ui-warning)))) + `(magit-blame-date ((t (:foreground ,ui-fg-dim)))) `(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-branch-current ((t (:foreground ,ui-accent :weight bold)))) + `(magit-branch-remote-head ((t (:foreground ,ui-success)))) `(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-added ((t (:foreground ,ui-success)))) `(magit-diffstat-removed ((t (:foreground ,ui-error)))) `(magit-dimmed ((t (:foreground ,ui-border)))) `(magit-filename ((t (:foreground ,ui-accent)))) @@ -1173,7 +1161,7 @@ `(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-process-ok ((t (:foreground ,ui-success)))) `(magit-reflog-amend ((t (:foreground ,ui-link)))) `(magit-reflog-checkout ((t (:foreground ,ui-accent)))) `(magit-reflog-cherry-pick ((t (:foreground ,ui-info)))) @@ -1190,13 +1178,13 @@ `(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-sequence-stop ((t (:foreground ,ui-warning)))) `(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-signature-expired ((t (:foreground ,ui-warning)))) + `(magit-signature-good ((t (:foreground ,ui-success)))) + `(magit-signature-revoked ((t (:foreground ,ui-error)))) + `(magit-signature-untrusted ((t (:foreground ,ui-warning)))) `(magit-tag ((t (:foreground ,ui-link)))) ;; === Make-mode === @@ -1207,7 +1195,7 @@ `(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-modified ((t (:foreground ,ui-warning)))) `(marginalia-file-priv-read ((t (:foreground ,ui-info)))) `(marginalia-file-priv-write ((t (:foreground ,ui-link)))) `(marginalia-file-priv-exec ((t (:foreground ,ui-error)))) @@ -1216,8 +1204,6 @@ `(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 (:inherit ,vpitch :foreground ,ui-accent :weight bold)))) - `(markdown-header-face-6 ((t (:inherit ,vpitch :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)))) @@ -1235,8 +1221,8 @@ `(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-cc ((t (:foreground ,ui-link :weight bold)))) + `(message-header-name ((t (:foreground ,ui-accent)))) `(message-header-newsgroups ((t (:foreground ,ui-link)))) `(message-header-other ((t (:foreground ,ui-accent)))) `(message-header-subject ((t (:foreground ,ui-accent :weight bold)))) @@ -1256,10 +1242,10 @@ `(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-root-dir-face ((t (:foreground ,ui-accent :background ,ui-bg)))) + `(neo-vc-added-face ((t (:foreground ,ui-success)))) + `(neo-vc-conflict-face ((t (:foreground ,ui-error :weight bold)))) + `(neo-vc-edited-face ((t (:foreground ,ui-warning)))) `(neo-vc-ignored-face ((t (:foreground ,ui-border)))) `(neo-vc-removed-face ((t (:foreground ,ui-error :strike-through t)))) @@ -1278,12 +1264,12 @@ `(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-flagged-face ((t (:foreground ,ui-warning)))) `(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 ,ui-info :weight normal)))) + `(notmuch-tag-added ((t (:foreground ,ui-success :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)))) @@ -1304,10 +1290,10 @@ `(notmuch-wash-toggle-button ((t (:foreground ,ui-fg)))) ;; === Orderless === - `(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)))) + `(orderless-match-face-0 ((t (:foreground ,ui-accent :weight bold :underline t)))) + `(orderless-match-face-1 ((t (:foreground ,syntax-keyword :weight bold :underline t)))) + `(orderless-match-face-2 ((t (:foreground ,ui-info :weight bold :underline t)))) + `(orderless-match-face-3 ((t (:foreground ,ui-warning :weight bold :underline t)))) ;; === Vertico === `(vertico-current ((t (:background ,ui-bg-light :extend t)))) @@ -1377,10 +1363,10 @@ `(term-color-bright-white ((t (:foreground "#ffffff" :background "#ffffff")))) ;; === Transient === - `(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-heading ((t (:foreground ,ui-accent :weight bold)))) + `(transient-key ((t (:foreground ,ui-link :weight bold :height 1.1)))) + `(transient-argument ((t (:foreground ,ui-success)))) + `(transient-value ((t (:foreground ,ui-success)))) `(transient-inactive-argument ((t (:foreground ,ui-fg-dim)))) `(transient-inactive-value ((t (:foreground ,ui-fg-dim)))) `(transient-unreachable ((t (:foreground ,ui-border)))) @@ -1406,17 +1392,17 @@ `(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-root-face ((t (:foreground ,ui-accent :weight bold :height 1.2)))) + `(treemacs-tags-face ((t (:foreground ,ui-info)))) `(treemacs-help-title-face ((t (:foreground ,syntax-keyword :weight bold)))) - `(treemacs-help-column-face ((t (:foreground ,pal-blue)))) + `(treemacs-help-column-face ((t (:foreground ,ui-accent)))) `(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 ,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.builtin ((t (:foreground ,syntax-function)))) `(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)))) @@ -1424,12 +1410,12 @@ `(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.builtin ((t (:foreground ,syntax-type)))) `(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.builtin ((t (:foreground ,syntax-variable)))) `(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)))) @@ -1443,13 +1429,13 @@ `(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:constant.builtin ((t (:foreground ,syntax-constant)))) `(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:punctuation.special ((t (:foreground ,syntax-keyword)))) + `(tree-sitter-hl-face:tag ((t (:foreground ,syntax-type)))) `(tree-sitter-hl-face:attribute ((t (:foreground ,syntax-attribute)))) ;; === Typescript-mode === @@ -1486,41 +1472,41 @@ `(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-builtin-face ((t (:foreground ,syntax-function)))) `(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-face ((t (:foreground ,syntax-type)))) + `(web-mode-html-tag-custom-face ((t (:foreground ,syntax-type)))) `(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-namespaced-face ((t (:foreground ,syntax-type)))) `(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-name-face ((t (:foreground ,syntax-attribute)))) + `(web-mode-html-attr-custom-face ((t (:foreground ,syntax-attribute :slant italic)))) + `(web-mode-html-attr-engine-face ((t (:foreground ,syntax-attribute)))) `(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-html-attr-value-face ((t (:foreground ,syntax-string)))) + `(web-mode-block-attr-name-face ((t (:foreground ,syntax-attribute)))) + `(web-mode-block-attr-value-face ((t (:foreground ,syntax-string)))) `(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-selector-face ((t (:foreground ,syntax-function)))) + `(web-mode-css-selector-class-face ((t (:foreground ,syntax-type)))) + `(web-mode-css-selector-tag-face ((t (:foreground ,syntax-function)))) + `(web-mode-css-pseudo-class-face ((t (:foreground ,syntax-keyword)))) `(web-mode-css-at-rule-face ((t (:foreground ,syntax-keyword)))) - `(web-mode-css-property-name-face ((t (:foreground ,pal-blue)))) + `(web-mode-css-property-name-face ((t (:foreground ,syntax-attribute)))) `(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-function-face ((t (:foreground ,syntax-function)))) `(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-filter-face ((t (:foreground ,syntax-function)))) `(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-key-face ((t (:foreground ,syntax-attribute)))) `(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)))) @@ -1531,13 +1517,13 @@ `(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-type-face ((t (:foreground ,syntax-type)))) + `(web-mode-annotation-value-face ((t (:foreground ,syntax-string)))) `(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-param-name-face ((t (:foreground ,syntax-variable)))) `(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)))) @@ -1553,7 +1539,7 @@ ;; === Wgrep === `(wgrep-delete-face ((t (:foreground ,ui-active-text-fg :background ,ui-active-text-bg)))) - `(wgrep-done-face ((t (:foreground ,ui-info)))) + `(wgrep-done-face ((t (:foreground ,ui-success)))) `(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)))) @@ -1562,7 +1548,6 @@ `(which-func ((t (:foreground ,ui-accent)))) ;; === Which-key (missing) === - `(which-key-local-map-description-face ((t (:foreground ,ui-link)))) ;; === Whitespace === `(whitespace-empty ((t (:background ,ui-line-highlight)))) @@ -1575,7 +1560,7 @@ ;; === Widget === `(widget-button ((t (:foreground ,ui-fg :weight bold)))) - `(widget-button-pressed ((t (:foreground ,ui-error)))) + `(widget-button-pressed ((t (:foreground ,ui-accent)))) `(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)))) @@ -1640,7 +1625,6 @@ `(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 ,ui-bg-light :foreground ,ui-fg)))) @@ -1652,26 +1636,26 @@ ;; === Spaceline === `(spaceline-evil-emacs ((t (:background ,ui-link)))) - `(spaceline-evil-insert ((t (:background ,ui-info)))) + `(spaceline-evil-insert ((t (:background ,ui-success)))) `(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)))) + `(spaceline-flycheck-warning ((t (:foreground ,ui-warning)))) ;; === Smart-mode-line === `(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/modified ((t (:foreground ,ui-warning)))) + `(sml/outside-modified ((t (:foreground ,ui-warning)))) `(sml/process ((t (:weight bold)))) `(sml/read-only ((t (:foreground ,ui-link)))) `(sml/sudo ((t (:foreground ,ui-error :weight bold)))) - `(sml/vc-edited ((t (:foreground ,ui-info)))) + `(sml/vc-edited ((t (:foreground ,ui-warning)))) ) |