Some face cleanup

- take advantage of things in inheritance
- add some gitcommit-related faces
- add lsp-headerline, magit-branch, and which-key faces
- lighten up spelling correction
This commit is contained in:
Greg Pfeil 2023-02-07 11:30:02 -07:00
parent a123207da9
commit 1b7734ae1f
No known key found for this signature in database
GPG Key ID: 1193ACD196ED61F2
1 changed files with 26 additions and 7 deletions

View File

@ -392,8 +392,7 @@ Inspired by `org-combine-plists'."
(diff-refine-added (,@fmt-none ,@fg-blue ,@bg-base02)) (diff-refine-added (,@fmt-none ,@fg-blue ,@bg-base02))
(diff-refine-changed (,@fmt-none ,@fg-blue ,@bg-base02)) (diff-refine-changed (,@fmt-none ,@fg-blue ,@bg-base02))
(diff-refine-removed (,@fmt-none ,@fg-blue ,@bg-base02)))))) ; sp-blue (diff-refine-removed (,@fmt-none ,@fg-blue ,@bg-base02)))))) ; sp-blue
(diff-file-header (,@fg-blue)) (diff-header (,@fg-base1))
(diff-header (,@fg-base1 ,@bg-back))
;; IDO ;; IDO
(ido-only-match (,@fg-green)) (ido-only-match (,@fg-green))
(ido-subdir (,@fg-blue)) (ido-subdir (,@fg-blue))
@ -410,7 +409,6 @@ Inspired by `org-combine-plists'."
(eshell-ls-special (,@fg-violet)) (eshell-ls-special (,@fg-violet))
(eshell-ls-symlink (,@fg-cyan)) (eshell-ls-symlink (,@fg-cyan))
(eshell-ls-unreadable (,@fg-base00)) (eshell-ls-unreadable (,@fg-base00))
(eshell-prompt (,@fmt-bold ,@fg-green))
;; font-lock ;; font-lock
(font-lock-builtin-face (,@fmt-none ,@fg-green ,@bg-none)) ; Statement (font-lock-builtin-face (,@fmt-none ,@fg-green ,@bg-none)) ; Statement
(font-lock-constant-face (,@fmt-none ,@fg-cyan ,@bg-none)) ; Constant (font-lock-constant-face (,@fmt-none ,@fg-cyan ,@bg-none)) ; Constant
@ -566,6 +564,11 @@ Inspired by `org-combine-plists'."
(jabber-roster-user-offline (,@fg-base01)) (jabber-roster-user-offline (,@fg-base01))
(jabber-roster-user-online (,@fmt-bold ,@fg-blue)) (jabber-roster-user-online (,@fmt-bold ,@fg-blue))
(jabber-roster-user-xa (,@fmt-ital ,@fg-magenta)) (jabber-roster-user-xa (,@fmt-ital ,@fg-magenta))
;; git-commit
(git-commit-branch-local (,@fmt-bold ,@fg-magenta ,@bg-none)) ; gitcommitBranch
(git-commit-branch-remote (,@fmt-bold ,@fg-magenta ,@bg-none)) ; gitcommitBranch
(git-commit-comment-file (,@fmt-bold ,@fg-base0 ,@bg-none)) ; gitcommitFile
(git-commit-comment-heading (,@fmt-ital ,@fg-base01 ,@bg-none)) ; gitcommitComment
;; git-gutter ;; git-gutter
(git-gutter:modified (,@fg-violet)) (git-gutter:modified (,@fg-violet))
(git-gutter:added (,@fg-green)) (git-gutter:added (,@fg-green))
@ -620,13 +623,13 @@ Inspired by `org-combine-plists'."
(helm-bookmark-man (,@fg-violet)) (helm-bookmark-man (,@fg-violet))
(helm-bookmark-w3m (,@fg-yellow)) (helm-bookmark-w3m (,@fg-yellow))
(helm-bookmarks-su (,@fg-orange)) (helm-bookmarks-su (,@fg-orange))
(helm-buffer-directory (,@bg-back ,@fg-blue))
(helm-buffer-not-saved (,@fg-orange)) (helm-buffer-not-saved (,@fg-orange))
(helm-buffer-process (,@fg-magenta)) (helm-buffer-process (,@fg-magenta))
(helm-buffer-saved-out (,@fmt-revr ,@fg-red ,@bg-back)) (helm-buffer-saved-out (,@fmt-revr ,@fg-red ,@bg-back))
(helm-buffer-size (,@fg-base01)) (helm-buffer-size (,@fg-base01))
(helm-candidate-number (,@fmt-bold ,@bg-base02 ,@fg-base1)) (helm-candidate-number (,@fmt-bold ,@bg-base02 ,@fg-base1))
(helm-emms-playlist (,@fmt-none ,@fg-base01)) (helm-emms-playlist (,@fmt-none ,@fg-base01))
(helm-ff-directory (,@bg-back ,@fg-blue))
(helm-ff-executable (,@fmt-bold ,@fg-green)) (helm-ff-executable (,@fmt-bold ,@fg-green))
(helm-ff-invalid-symlink (,@bg-base02 ,@fg-red)) (helm-ff-invalid-symlink (,@bg-base02 ,@fg-red))
(helm-ff-prefix (,@fmt-revr ,@fg-yellow)) (helm-ff-prefix (,@fmt-revr ,@fg-yellow))
@ -654,6 +657,15 @@ Inspired by `org-combine-plists'."
(helm-time-zone-current (,@fg-green)) (helm-time-zone-current (,@fg-green))
(helm-time-zone-home (,@fg-red)) (helm-time-zone-home (,@fg-red))
(helm-visible-mark (,@fmt-bold ,@bg-back ,@fg-magenta)) (helm-visible-mark (,@fmt-bold ,@bg-back ,@fg-magenta))
;; lsp-headerline
(lsp-headerline-breadcrumb-path-error-face (,@(fmt-curl sp-red)))
(lsp-headerline-breadcrumb-path-hint-face (,@(fmt-curl sp-green)))
(lsp-headerline-breadcrumb-path-info-face (,@(fmt-curl sp-green)))
(lsp-headerline-breadcrumb-path-warning-face (,@(fmt-curl sp-yellow)))
(lsp-headerline-breadcrumb-symbols-error-face (,@(fmt-curl sp-red)))
(lsp-headerline-breadcrumb-symbols-hint-face (,@(fmt-curl sp-green)))
(lsp-headerline-breadcrumb-symbols-info-face (,@(fmt-curl sp-green)))
(lsp-headerline-breadcrumb-symbols-warning-face (,@(fmt-curl sp-yellow)))
;; Message ;; Message
(message-mml (,@fg-blue)) (message-mml (,@fg-blue))
(message-cited-text (,@fg-base2)) (message-cited-text (,@fg-base2))
@ -688,6 +700,8 @@ Inspired by `org-combine-plists'."
(sp-wrap-tag-overlay-face (,@bg-base02)) (sp-wrap-tag-overlay-face (,@bg-base02))
(sp-show-pair-match-face (,@fg-magenta ,@bg-back)) (sp-show-pair-match-face (,@fg-magenta ,@bg-back))
(sp-show-pair-mismatch-face (,@bg-red ,@fg-base02)) (sp-show-pair-mismatch-face (,@bg-red ,@fg-base02))
;; which-key
(which-key-group-description-face (,@fg-yellow))
;; whitespace ;; whitespace
(whitespace-empty (,@fg-red)) (whitespace-empty (,@fg-red))
(whitespace-hspace (,@fg-orange)) (whitespace-hspace (,@fg-orange))
@ -714,8 +728,10 @@ Inspired by `org-combine-plists'."
(font-latex-warning-face (,@fg-red)) (font-latex-warning-face (,@fg-red))
(font-latex-sectioning-5-face (,@fg-violet)) (font-latex-sectioning-5-face (,@fg-violet))
;;flyspell ;;flyspell
(flyspell-incorrect (,@(fmt-curl sp-red) ,@fg-none ,@bg-none)) ; SpellBad ;; NB: kill inheritance here, to get rid of the overpowering
(flyspell-duplicate (,@(fmt-curl sp-yellow))) ;; error/warning faces from inheritance.
(flyspell-incorrect (,@(fmt-curl sp-red) ,@fg-none ,@bg-none :inherit ())) ; SpellBad
(flyspell-duplicate (,@(fmt-curl sp-yellow) ,@fg-none ,@bg-none :inherit ()))
;;ansi-color ;;ansi-color
(ansi-color-cyan (,@fg-cyan ,@bg-cyan)) (ansi-color-cyan (,@fg-cyan ,@bg-cyan))
(ansi-color-blue (,@fg-blue ,@bg-blue)) (ansi-color-blue (,@fg-blue ,@bg-blue))
@ -757,8 +773,11 @@ Inspired by `org-combine-plists'."
(guide-key/prefix-command-face (,@fg-blue)) (guide-key/prefix-command-face (,@fg-blue))
(guide-key/highlight-command-face (,@fg-orange)) (guide-key/highlight-command-face (,@fg-orange))
;; magit ;; magit
(magit-branch-local (,@fmt-bold ,@fg-magenta ,@bg-none)) ; gitcommitBranch
(magit-branch-remote ( ,@fg-green))
(magit-diff-file-heading (,@fmt-none ,@fg-base01 ,@bg-none)) ; gitcommitHeader
(magit-diff-revision-summary (,@fmt-ital ,@fg-base01 ,@bg-none)) ; gitcommitComment
(magit-log-sha1 (,@fg-red)) (magit-log-sha1 (,@fg-red))
(magit-branch (,@fg-yellow))
(magit-tag (,@fg-green)) (magit-tag (,@fg-green))
(magit-log-author (,@fg-cyan)) (magit-log-author (,@fg-cyan))
(magit-log-head-label-remote (,@fg-green)) (magit-log-head-label-remote (,@fg-green))