branch: elpa/gruvbox-theme commit 5cc7e7354a778d5e9df5ee6850e2fdd8e02851d1 Author: jasonm23 <jason...@gmail.com> Commit: jasonm23 <jason...@gmail.com>
Recheck and update Author roll. --- gruvbox-dark-hard-theme.el | 15 +++---- gruvbox-dark-medium-theme.el | 12 +++--- gruvbox-dark-soft-theme.el | 15 +++---- gruvbox-light-hard-theme.el | 15 +++---- gruvbox-light-medium-theme.el | 15 +++---- gruvbox-light-soft-theme.el | 13 +++--- gruvbox.el | 93 ++++++++++++++++++++++++++++++++++++------- 7 files changed, 125 insertions(+), 53 deletions(-) diff --git a/gruvbox-dark-hard-theme.el b/gruvbox-dark-hard-theme.el index 7858ce3e3e..ee19af2243 100644 --- a/gruvbox-dark-hard-theme.el +++ b/gruvbox-dark-hard-theme.el @@ -2,17 +2,19 @@ ;; Copyright (c) 2013 Lee Machin ;; Copyright (c) 2013-2016 Eduardo Lavaque -;; Copyright (c) 2016-2017 Jason Milkins +;; Copyright (c) 2016-2022 Jason Milkins ;; Copyright (c) 2017-2018 Martijn Terpstra ;; Author: Jason Milkins <jason...@gmail.com> ;; (current maintainer) ;; -;; Author-list: Lee Machin <ljmac...@gmail.com>, -;; Eduardo Lavaque <m...@greduan.com> +;; Author-list: Jason Milkins <jason...@gmail.com>, +;; Martijn Terpstra, +;; Eduardo Lavaque <m...@greduan.com>, +;; Lee Machin <ljmac...@gmail.com> ;; ;; URL: http://github.com/greduan/emacs-theme-gruvbox -;; Version: 1.27.0 +;; Version: 1.29.0 ;; Package-Requires: ((autothemer "0.2")) @@ -141,8 +143,7 @@ (gruvbox-ediff-fine-diff-Ancestor "#12129d" "#12129d") (gruvbox-bg gruvbox-dark0_hard) - (gruvbox-bg_inactive gruvbox-dark0) - ) + (gruvbox-bg_inactive gruvbox-dark0)) (custom-theme-set-variables 'gruvbox-dark-hard `(ansi-color-names-vector @@ -154,7 +155,7 @@ ,gruvbox-bright_purple ,gruvbox-bright_aqua ,gruvbox-light1]) - `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) + `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) ;;;###autoload (and load-file-name diff --git a/gruvbox-dark-medium-theme.el b/gruvbox-dark-medium-theme.el index 805497b74f..cee33ab400 100644 --- a/gruvbox-dark-medium-theme.el +++ b/gruvbox-dark-medium-theme.el @@ -2,17 +2,19 @@ ;; Copyright (c) 2013 Lee Machin ;; Copyright (c) 2013-2016 Eduardo Lavaque -;; Copyright (c) 2016-2017 Jason Milkins +;; Copyright (c) 2016-2022 Jason Milkins ;; Copyright (c) 2017-2018 Martijn Terpstra ;; Author: Jason Milkins <jason...@gmail.com> ;; (current maintainer) ;; -;; Author-list: Lee Machin <ljmac...@gmail.com>, -;; Eduardo Lavaque <m...@greduan.com> +;; Author-list: Jason Milkins <jason...@gmail.com>, +;; Martijn Terpstra, +;; Eduardo Lavaque <m...@greduan.com>, +;; Lee Machin <ljmac...@gmail.com> ;; ;; URL: http://github.com/greduan/emacs-theme-gruvbox -;; Version: 1.27.0 +;; Version: 1.29.0 ;; Package-Requires: ((autothemer "0.2")) @@ -155,7 +157,7 @@ ,gruvbox-bright_purple ,gruvbox-bright_aqua ,gruvbox-light1]) - `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) + `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) ;;;###autoload (and load-file-name diff --git a/gruvbox-dark-soft-theme.el b/gruvbox-dark-soft-theme.el index d20a6e3df6..8013700ff9 100644 --- a/gruvbox-dark-soft-theme.el +++ b/gruvbox-dark-soft-theme.el @@ -2,17 +2,19 @@ ;; Copyright (c) 2013 Lee Machin ;; Copyright (c) 2013-2016 Eduardo Lavaque -;; Copyright (c) 2016-2017 Jason Milkins +;; Copyright (c) 2016-2022 Jason Milkins ;; Copyright (c) 2017-2018 Martijn Terpstra ;; Author: Jason Milkins <jason...@gmail.com> ;; (current maintainer) ;; -;; Author-list: Lee Machin <ljmac...@gmail.com>, -;; Eduardo Lavaque <m...@greduan.com> +;; Author-list: Jason Milkins <jason...@gmail.com>, +;; Martijn Terpstra, +;; Eduardo Lavaque <m...@greduan.com>, +;; Lee Machin <ljmac...@gmail.com> ;; ;; URL: http://github.com/greduan/emacs-theme-gruvbox -;; Version: 1.27.0 +;; Version: 1.29.0 ;; Package-Requires: ((autothemer "0.2")) @@ -141,8 +143,7 @@ (gruvbox-ediff-fine-diff-Ancestor "#12129d" "#12129d") (gruvbox-bg gruvbox-dark0_soft) - (gruvbox-bg_inactive gruvbox-dark1) - ) + (gruvbox-bg_inactive gruvbox-dark1)) (custom-theme-set-variables 'gruvbox-dark-soft `(ansi-color-names-vector @@ -154,7 +155,7 @@ ,gruvbox-bright_purple ,gruvbox-bright_aqua ,gruvbox-light1]) - `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) + `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) ;;;###autoload (and load-file-name diff --git a/gruvbox-light-hard-theme.el b/gruvbox-light-hard-theme.el index 3713208018..13a14e502a 100644 --- a/gruvbox-light-hard-theme.el +++ b/gruvbox-light-hard-theme.el @@ -2,17 +2,19 @@ ;; Copyright (c) 2013 Lee Machin ;; Copyright (c) 2013-2016 Eduardo Lavaque -;; Copyright (c) 2016-2017 Jason Milkins +;; Copyright (c) 2016-2022 Jason Milkins ;; Copyright (c) 2017-2018 Martijn Terpstra ;; Author: Jason Milkins <jason...@gmail.com> ;; (current maintainer) ;; -;; Author-list: Lee Machin <ljmac...@gmail.com>, -;; Eduardo Lavaque <m...@greduan.com> +;; Author-list: Jason Milkins <jason...@gmail.com>, +;; Martijn Terpstra, +;; Eduardo Lavaque <m...@greduan.com>, +;; Lee Machin <ljmac...@gmail.com> ;; ;; URL: http://github.com/greduan/emacs-theme-gruvbox -;; Version: 1.27.0 +;; Version: 1.29.0 ;; Package-Requires: ((autothemer "0.2")) @@ -141,8 +143,7 @@ (gruvbox-ediff-fine-diff-Ancestor "#b6b0d6" "#b6b0d6") (gruvbox-bg gruvbox-dark0_hard) - (gruvbox-bg_inactive gruvbox-dark0) - ) + (gruvbox-bg_inactive gruvbox-dark0)) (custom-theme-set-variables 'gruvbox-light-hard `(ansi-color-names-vector @@ -154,7 +155,7 @@ ,gruvbox-faded_purple ,gruvbox-faded_aqua ,gruvbox-light1]) - `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) + `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) ;;;###autoload (and load-file-name diff --git a/gruvbox-light-medium-theme.el b/gruvbox-light-medium-theme.el index 5e19ccb07c..889b277eff 100644 --- a/gruvbox-light-medium-theme.el +++ b/gruvbox-light-medium-theme.el @@ -2,17 +2,19 @@ ;; Copyright (c) 2013 Lee Machin ;; Copyright (c) 2013-2016 Eduardo Lavaque -;; Copyright (c) 2016-2017 Jason Milkins +;; Copyright (c) 2016-2022 Jason Milkins ;; Copyright (c) 2017-2018 Martijn Terpstra ;; Author: Jason Milkins <jason...@gmail.com> ;; (current maintainer) ;; -;; Author-list: Lee Machin <ljmac...@gmail.com>, -;; Eduardo Lavaque <m...@greduan.com> +;; Author-list: Jason Milkins <jason...@gmail.com>, +;; Martijn Terpstra, +;; Eduardo Lavaque <m...@greduan.com>, +;; Lee Machin <ljmac...@gmail.com> ;; ;; URL: http://github.com/greduan/emacs-theme-gruvbox -;; Version: 1.27.0 +;; Version: 1.29.0 ;; Package-Requires: ((autothemer "0.2")) @@ -141,8 +143,7 @@ (gruvbox-ediff-fine-diff-Ancestor "#b6b0d6" "#b6b0d6") (gruvbox-bg gruvbox-dark0) - (gruvbox-bg_inactive gruvbox-dark0_soft) - ) + (gruvbox-bg_inactive gruvbox-dark0_soft)) (custom-theme-set-variables 'gruvbox-light-medium `(ansi-color-names-vector @@ -154,7 +155,7 @@ ,gruvbox-faded_purple ,gruvbox-faded_aqua ,gruvbox-light1]) - `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) + `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) ;;;###autoload (and load-file-name diff --git a/gruvbox-light-soft-theme.el b/gruvbox-light-soft-theme.el index 9dd4fb71e6..e518f2f12d 100644 --- a/gruvbox-light-soft-theme.el +++ b/gruvbox-light-soft-theme.el @@ -8,11 +8,13 @@ ;; Author: Jason Milkins <jason...@gmail.com> ;; (current maintainer) ;; -;; Author-list: Lee Machin <ljmac...@gmail.com>, -;; Eduardo Lavaque <m...@greduan.com> +;; Author-list: Jason Milkins <jason...@gmail.com>, +;; Martijn Terpstra, +;; Eduardo Lavaque <m...@greduan.com>, +;; Lee Machin <ljmac...@gmail.com> ;; ;; URL: http://github.com/greduan/emacs-theme-gruvbox -;; Version: 1.27.0 +;; Version: 1.29.0 ;; Package-Requires: ((autothemer "0.2")) @@ -141,8 +143,7 @@ (gruvbox-ediff-fine-diff-Ancestor "#b6b0d6" "#b6b0d6") (gruvbox-bg gruvbox-dark0_soft) - (gruvbox-bg_inactive gruvbox-dark1) - ) + (gruvbox-bg_inactive gruvbox-dark1)) (custom-theme-set-variables 'gruvbox-light-soft `(ansi-color-names-vector @@ -154,7 +155,7 @@ ,gruvbox-bright_purple ,gruvbox-bright_aqua ,gruvbox-light1]) - `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) + `(pdf-view-midnight-colors '(,gruvbox-light0 . ,gruvbox-bg)))) ;;;###autoload (and load-file-name diff --git a/gruvbox.el b/gruvbox.el index 0a7846a44d..13f9da60bb 100644 --- a/gruvbox.el +++ b/gruvbox.el @@ -2,17 +2,19 @@ ;; Copyright (c) 2013 Lee Machin ;; Copyright (c) 2013-2016 Eduardo Lavaque -;; Copyright (c) 2016-2017 Jason Milkins +;; Copyright (c) 2016-2022 Jason Milkins ;; Copyright (c) 2017 Martijn Terpstra ;; Author: Jason Milkins <jason...@gmail.com> ;; (current maintainer) ;; -;; Author-list: Lee Machin <ljmac...@gmail.com>, -;; Eduardo Lavaque <m...@greduan.com> +;; Author-list: Jason Milkins <jason...@gmail.com>, +;; Martijn Terpstra, +;; Eduardo Lavaque <m...@greduan.com>, +;; Lee Machin <ljmac...@gmail.com> ;; ;; URL: http://github.com/greduan/emacs-theme-gruvbox -;; Version: 1.27.0 +;; Version: 1.29.0 ;; Package-Requires: ((autothemer "0.2")) @@ -57,6 +59,7 @@ (unless (>= emacs-major-version 24) (error "Requires Emacs 24 or later")) + ;;;###autoload (and load-file-name (boundp 'custom-theme-load-path) @@ -127,6 +130,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (match (:foreground gruvbox-dark0 :background gruvbox-bright_blue)) ;; Customize faces + (widget-field (:background gruvbox-dark3)) (custom-group-tag (:foreground gruvbox-bright_blue :weight 'bold)) (custom-variable-tag (:foreground gruvbox-bright_blue :weight 'bold)) @@ -160,8 +164,8 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (rainbow-delimiters-depth-12-face (:foreground gruvbox-delimiter-four)) (rainbow-delimiters-unmatched-face (:background nil :foreground gruvbox-light0)) - ;; line numbers + (line-number (:foreground gruvbox-dark4 :background gruvbox-dark1)) (line-number-current-line (:foreground gruvbox-bright_orange :background gruvbox-dark2)) (linum (:foreground gruvbox-dark4 :background gruvbox-dark1)) @@ -169,27 +173,30 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (linum-relative-current-face (:foreground gruvbox-bright_orange :background gruvbox-dark2)) ;; Highlight indentation mode + (highlight-indentation-current-column-face (:background gruvbox-dark2)) (highlight-indentation-face (:background gruvbox-dark1)) ;; smartparens + (sp-pair-overlay-face (:background gruvbox-dark2)) (sp-show-pair-match-face (:background gruvbox-dark2)) ;; Pair tags highlight (sp-show-pair-mismatch-face (:background gruvbox-bright_red)) ;; Highlight for bracket without pair - ;;(sp-wrap-overlay-face (:inherit 'sp-wrap-overlay-face)) - ;;(sp-wrap-tag-overlay-face (:inherit 'sp-wrap-overlay-face)) ;; elscreen + (elscreen-tab-background-face (:background gruvbox-bg :box nil)) ;; Tab bar, not the tabs (elscreen-tab-control-face (:background gruvbox-dark2 :foreground gruvbox-bright_red :underline nil :box nil)) ;; The controls (elscreen-tab-current-screen-face (:background gruvbox-dark4 :foreground gruvbox-dark0 :box nil)) ;; Current tab (elscreen-tab-other-screen-face (:background gruvbox-dark2 :foreground gruvbox-light4 :underline nil :box nil)) ;; Inactive tab ;; ag (The Silver Searcher) + (ag-hit-face (:foreground gruvbox-bright_blue)) (ag-match-face (:foreground gruvbox-bright_red)) ;; Diffs + (diff-header (:background gruvbox-dark1)) (diff-file-header (:background gruvbox-dark2)) (diff-hunk-header (:background gruvbox-dark2)) @@ -203,6 +210,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (diff-indicator-removed (:inherit 'diff-removed)) ;; Ediff + (ediff-even-diff-A (:background gruvbox-dark1)) (ediff-even-diff-B (:background gruvbox-dark1)) (ediff-even-diff-C (:background gruvbox-dark1)) @@ -224,7 +232,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (js2-warning (:underline (:color gruvbox-bright_yellow :style 'wave))) (js2-error (:underline (:color gruvbox-bright_red :style 'wave))) (js2-external-variable (:underline (:color gruvbox-bright_aqua :style 'wave))) - (js2-jsdoc-tag (:background nil :foreground gruvbox-gray )) + (js2-jsdoc-tag (:background nil :foreground gruvbox-gray)) (js2-jsdoc-type (:background nil :foreground gruvbox-light4)) (js2-jsdoc-value (:background nil :foreground gruvbox-light3)) (js2-function-param (:background nil :foreground gruvbox-bright_aqua)) @@ -236,13 +244,15 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (js2-jsdoc-html-tag-delimiter (:background nil :foreground gruvbox-light3)) ;; popup + (popup-face (:underline nil :foreground gruvbox-light1 :background gruvbox-dark1)) (popup-menu-mouse-face (:underline nil :foreground gruvbox-light0 :background gruvbox-faded_green)) (popup-menu-selection-face (:underline nil :foreground gruvbox-light0 :background gruvbox-faded_green)) (popup-tip-face (:underline nil :foreground gruvbox-light2 :background gruvbox-dark2)) ;; helm - (helm-M-x-key (:foreground gruvbox-bright_orange )) + + (helm-M-x-key (:foreground gruvbox-bright_orange)) (helm-action (:foreground gruvbox-light0_hard :underline t)) (helm-bookmark-addressbook (:foreground gruvbox-bright_red)) (helm-bookmark-directory (:foreground gruvbox-bright_purple)) @@ -288,6 +298,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (helm-visible-mark (:foreground gruvbox-black :background gruvbox-light3)) ;; helm-rg + (helm-rg-preview-line-highlight (:foreground gruvbox-black :background gruvbox-bright_green)) (helm-rg-base-rg-cmd-face (:foreground gruvbox-light2)) (helm-rg-extra-arg-face (:foreground gruvbox-bright_yellow)) @@ -303,6 +314,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (helm-rg-match-text-face (:foreground gruvbox-white :background gruvbox-bright_purple)) ;; hi-lock-mode + (hi-black-b (:foreground gruvbox-black :weight 'bold)) (hi-black-hb (:foreground gruvbox-black :weight 'bold :height 1.5)) (hi-blue (:foreground gruvbox-dark0 :background gruvbox-bright_blue)) @@ -314,6 +326,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (hi-yellow (:foreground gruvbox-dark0 :background gruvbox-faded_yellow)) ;; company-mode + (company-scrollbar-bg (:background gruvbox-dark2)) (company-scrollbar-fg (:background gruvbox-dark1)) (company-tooltip (:background gruvbox-dark1)) @@ -329,18 +342,22 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (company-echo-common (:foreground gruvbox-faded_red)) ;; tool tips + (tooltip (:foreground gruvbox-light1 :background gruvbox-dark1)) ;; marginalia + (marginalia-documentation (:italic t :foreground gruvbox-light3)) ;; corfu + (corfu-default (:inherit 'tooltip)) (corfu-current (:foreground gruvbox-bright_purple :background gruvbox-dark2)) (corfu-bar (:background gruvbox-dark2)) (corfu-border (:background gruvbox-dark1)) ;; term + (term-color-black (:foreground gruvbox-dark2 :background gruvbox-dark1)) (term-color-blue (:foreground gruvbox-bright_blue :background gruvbox-bright_blue)) (term-color-cyan (:foreground gruvbox-bright_aqua :background gruvbox-bright_aqua)) @@ -353,6 +370,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (term-default-bg-color (:background gruvbox-bg)) ;; message-mode + (message-header-to (:inherit 'font-lock-variable-name-face)) (message-header-cc (:inherit 'font-lock-variable-name-face)) (message-header-subject (:foreground gruvbox-bright_orange :weight 'bold)) @@ -365,6 +383,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (message-mml (:foreground gruvbox-faded_green :weight 'bold)) ;; org-mode + (org-hide (:foreground gruvbox-dark0)) (org-level-1 (:foreground gruvbox-bright_blue)) (org-level-2 (:foreground gruvbox-bright_yellow)) @@ -409,6 +428,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (org-latex-and-related (:foreground gruvbox-bright_blue)) ;; org-habit + (org-habit-clear-face (:background gruvbox-faded_blue)) (org-habit-clear-future-face (:background gruvbox-bright_blue)) (org-habit-ready-face (:background gruvbox-faded_green)) @@ -419,6 +439,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (org-habit-overdue-future-face (:background gruvbox-bright_red)) ;; elfeed + (elfeed-search-title-face (:foreground gruvbox-gray)) (elfeed-search-unread-title-face (:foreground gruvbox-light1 :weight 'bold)) (elfeed-search-tag-face (:foreground gruvbox-burlywood4)) @@ -429,6 +450,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (elfeed-search-filter-face (:inherit 'font-lock-string-face)) ;; smart-mode-line + (sml/global (:foreground gruvbox-light4 :inverse-video nil)) (sml/modes (:foreground gruvbox-bright_green)) (sml/filename (:foreground gruvbox-bright_red :weight 'bold)) @@ -437,6 +459,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (persp-selected-face (:foreground gruvbox-bright_orange)) ;; powerline + (powerline-active0 (:background gruvbox-dark4 :foreground gruvbox-light0)) (powerline-active1 (:background gruvbox-dark3 :foreground gruvbox-light0)) (powerline-active2 (:background gruvbox-dark2 :foreground gruvbox-light0)) @@ -445,11 +468,13 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (powerline-inactive2 (:background gruvbox-dark0 :foreground gruvbox-light4)) ;; isearch + (isearch (:foreground gruvbox-black :background gruvbox-bright_orange)) (lazy-highlight (:foreground gruvbox-black :background gruvbox-bright_yellow)) (isearch-fail (:foreground gruvbox-light0 :background gruvbox-bright_red)) ;; markdown-mode + (markdown-header-face-1 (:foreground gruvbox-bright_blue)) (markdown-header-face-2 (:foreground gruvbox-bright_yellow)) (markdown-header-face-3 (:foreground gruvbox-bright_purple)) @@ -458,6 +483,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (markdown-header-face-6 (:foreground gruvbox-bright_aqua)) ;; anzu-mode + (anzu-mode-line (:foreground gruvbox-bright_yellow :weight 'bold)) (anzu-match-1 (:background gruvbox-bright_green)) (anzu-match-2 (:background gruvbox-faded_yellow)) @@ -466,18 +492,22 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (anzu-replace-highlight (:inherit 'isearch)) ;; ace-jump-mode + (ace-jump-face-background (:foreground gruvbox-light4 :background gruvbox-bg :inverse-video nil)) (ace-jump-face-foreground (:foreground gruvbox-bright_red :background gruvbox-bg :inverse-video nil)) ;; ace-window + (aw-background-face (:foreground gruvbox-light1 :background gruvbox-bg :inverse-video nil)) (aw-leading-char-face (:foreground gruvbox-bright_red :background gruvbox-bg :height 4.0)) ;; show-paren + (show-paren-match (:background gruvbox-dark3 :foreground gruvbox-bright_blue :weight 'bold)) (show-paren-mismatch (:background gruvbox-bright_red :foreground gruvbox-dark3 :weight 'bold)) ;; ivy + (ivy-current-match (:foreground gruvbox-light0_hard :weight 'bold :underline t)) (ivy-minibuffer-match-face-1 (:foreground gruvbox-bright_orange)) (ivy-minibuffer-match-face-2 (:foreground gruvbox-bright_yellow)) @@ -485,17 +515,20 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (ivy-minibuffer-match-face-4 (:foreground gruvbox-faded_yellow)) ;; ido + (ido-only-match (:inherit 'success)) (ido-first-match (:foreground gruvbox-light0_hard :weight 'bold :underline t)) (ido-subdir (:inherit 'dired-directory)) ;; orderless + (orderless-match-face-0 (:foreground gruvbox-bright_yellow)) (orderless-match-face-1 (:foreground gruvbox-bright_orange)) (orderless-match-face-2 (:foreground gruvbox-bright_blue)) (orderless-match-face-3 (:foreground gruvbox-bright_purple)) ;; magit + (magit-bisect-bad (:foreground gruvbox-faded_red)) (magit-bisect-good (:foreground gruvbox-faded_green)) (magit-bisect-skip (:foreground gruvbox-faded_yellow)) @@ -552,6 +585,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (magit-tag (:foreground gruvbox-bright_yellow)) ;; cider + (cider-debug-code-overlay-face (:background gruvbox-dark2 :foreground gruvbox-light0)) (cider-deprecated-face (:background gruvbox-dark2 :foreground gruvbox-bright_orange)) (cider-enlightened-local-face (:foreground gruvbox-bright_orange :weight 'bold)) @@ -566,34 +600,41 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (cider-warning-highlight-face (:foreground gruvbox-bright_yellow :underline t :style 'wave)) ;; git-gutter + (git-gutter:modified (:background gruvbox-faded_blue :foreground gruvbox-faded_blue)) (git-gutter:added (:background gruvbox-faded_green :foreground gruvbox-faded_green)) (git-gutter:deleted (:background gruvbox-faded_red :foreground gruvbox-faded_red)) ;; git-gutter+ + (git-gutter+-modified (:foreground gruvbox-faded_blue :background gruvbox-faded_blue)) (git-gutter+-added (:foreground gruvbox-faded_green :background gruvbox-faded_green)) (git-gutter+-deleted (:foreground gruvbox-faded_red :background gruvbox-faded_red)) ;; git-gutter-fringe + (git-gutter-fr:modified (:inherit 'git-gutter:modified)) (git-gutter-fr:added (:inherit 'git-gutter:added)) (git-gutter-fr:deleted (:inherit 'git-gutter:deleted)) ;; diff-hl + (diff-hl-change (:background gruvbox-faded_blue :foreground gruvbox-faded_blue)) (diff-hl-delete (:background gruvbox-faded_red :foreground gruvbox-faded_red)) (diff-hl-insert (:background gruvbox-faded_green :foreground gruvbox-faded_green)) ;; flyspell + (flyspell-duplicate (:underline (:color gruvbox-light4 :style 'line))) (flyspell-incorrect (:underline (:color gruvbox-bright_red :style 'line))) ;; langtool + (langtool-errline (:foreground gruvbox-dark0 :background gruvbox-bright_red)) (langtool-correction-face (:foreground gruvbox-bright_yellow :weight 'bold)) ;; latex + (font-latex-bold-face (:foreground gruvbox-faded_green :bold t)) (font-latex-italic-face (:foreground gruvbox-bright_green :underline t)) (font-latex-math-face (:foreground gruvbox-light3)) @@ -606,6 +647,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (preview-face (:background gruvbox-dark1)) ;; lsp + (lsp-lsp-flycheck-warning-unnecessary-face (:underline (:color gruvbox-bright_orange :style 'wave) :foreground gruvbox-burlywood4)) (lsp-ui-doc-background (:background gruvbox-dark3)) @@ -616,15 +658,18 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (lsp-ui-sideline-symbol (:foreground gruvbox-gray)) ;; mu4e - (mu4e-header-key-face (:foreground gruvbox-bright_green :weight 'bold )) - (mu4e-unread-face (:foreground gruvbox-bright_blue :weight 'bold )) + + (mu4e-header-key-face (:foreground gruvbox-bright_green :weight 'bold)) + (mu4e-unread-face (:foreground gruvbox-bright_blue :weight 'bold)) (mu4e-highlight-face (:foreground gruvbox-bright_green)) ;; shell script + (sh-quoted-exec (:foreground gruvbox-bright_purple)) (sh-heredoc (:foreground gruvbox-bright_orange)) ;; undo-tree + (undo-tree-visualizer-active-branch-face (:foreground gruvbox-light0)) (undo-tree-visualizer-current-face (:foreground gruvbox-bright_red)) (undo-tree-visualizer-default-face (:foreground gruvbox-dark4)) @@ -632,12 +677,14 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (undo-tree-visualizer-unmodified-face (:foreground gruvbox-bright_aqua)) ;; widget faces + (widget-button-pressed-face (:foreground gruvbox-bright_red)) (widget-documentation-face (:foreground gruvbox-faded_green)) (widget-field (:foreground gruvbox-light0 :background gruvbox-dark2)) (widget-single-line-field (:foreground gruvbox-light0 :background gruvbox-dark2)) ;; dired+ + (diredp-file-name (:foreground gruvbox-light2)) (diredp-file-suffix (:foreground gruvbox-light4)) (diredp-compressed-file-suffix (:foreground gruvbox-faded_blue)) @@ -685,6 +732,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (diredfl-tagged-autofile-name (:foreground gruvbox-light4)) ;; neotree + (neo-banner-face (:foreground gruvbox-bright_purple :bold t)) (neo-dir-link-face (:foreground gruvbox-bright_yellow)) (neo-expand-btn-face (:foreground gruvbox-bright_orange)) @@ -693,6 +741,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (neo-root-dir-face (:foreground gruvbox-bright_purple :bold t)) ;; eshell + (eshell-prompt (:foreground gruvbox-bright_aqua)) (eshell-ls-archive (:foreground gruvbox-light3)) (eshell-ls-backup (:foreground gruvbox-light4)) @@ -707,6 +756,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (eshell-ls-unreadable (:foreground gruvbox-bright_red :bold t)) ;; tabbar + (tabbar-default (:foreground gruvbox-light0 :background gruvbox-dark3 :bold nil :height 1.0 :box (:line-width -5 :color gruvbox-dark3))) (tabbar-separator (:foreground gruvbox-light0 :background gruvbox-dark3)) (tabbar-highlight (:inherit 'highlight)) @@ -719,6 +769,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (tabbar-selected-modified (:inherit 'tabbar-selected)) ;; wgrep + (wgrep-delete-face (:strike-through gruvbox-bright_red)) (wgrep-done-face (:foreground gruvbox-turquoise4)) (wgrep-face (:underline (:color gruvbox-bright_yellow :style 'line))) @@ -726,6 +777,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (wgrep-reject-face (:foreground gruvbox-bright_red :bold t)) ;; hydra + (hydra-face-red (:foreground gruvbox-bright_red :weight 'bold)) (hydra-face-blue (:foreground gruvbox-bright_blue :weight 'bold)) (hydra-face-amaranth (:foreground gruvbox-bright_yellow :weight 'bold)) @@ -733,12 +785,15 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (hydra-face-teal (:foreground gruvbox-bright_aqua :weight 'bold)) ;; which-function-mode + (which-func (:foreground gruvbox-faded_blue)) ;; auto-dim-other-buffers + (auto-dim-other-buffers-face (:background gruvbox-bg_inactive)) ;; flycheck + (flycheck-warning (:underline (:style 'wave :color gruvbox-bright_yellow))) (flycheck-error (:underline (:style 'wave :color gruvbox-bright_red))) (flycheck-info (:underline (:style 'wave :color gruvbox-bright_blue))) @@ -750,11 +805,13 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (flycheck-error-list-info (:foreground gruvbox-bright_blue :bold t)) ;; tab-bar + (tab-bar-tab-inactive (:background gruvbox-bg :foreground gruvbox-light0)) (tab-bar-tab (:background gruvbox-dark2 :foreground gruvbox-light0)) (tab-bar (:background gruvbox-bg :foreground gruvbox-light0)) ;; circe + (circe-prompt-face (:foreground gruvbox-turquoise4)) (circe-fool (:foreground gruvbox-dark2)) (circe-highlight-nick-face (:foreground gruvbox-bright_yellow)) @@ -763,6 +820,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (lui-time-stamp-face (:foreground gruvbox-bright_blue)) ;; erc + (erc-action-face (:inherit 'erc-default-face)) (erc-bold-face (:weight 'bold)) (erc-current-nick-face (:foreground gruvbox-aquamarine4)) @@ -784,6 +842,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (erc-button (:weight 'bold :underline t)) ;; gnus + (gnus-group-mail-1 (:weight 'bold :foreground gruvbox-light0)) (gnus-group-mail-2 (:inherit 'gnus-group-mail-1)) (gnus-group-mail-3 (:inherit 'gnus-group-mail-1)) @@ -834,6 +893,7 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (gnus-x-face (:background gruvbox-dark4 :foreground gruvbox-light0)) ;; web-mode + (web-mode-doctype-face (:foreground gruvbox-bright_blue)) (web-mode-html-tag-bracket-face (:foreground gruvbox-bright_blue)) (web-mode-html-tag-face (:foreground gruvbox-bright_blue)) @@ -842,14 +902,16 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (web-mode-html-attr-value-face (:foreground gruvbox-bright_green)) ;; Coq + (coq-solve-tactics-face (:inherit 'font-lock-constant-face)) (coq-cheat-face (:box (:line-width -1 :color gruvbox-bright_red :style nil) - :foreground gruvbox-bright_red)) + :foreground gruvbox-bright_red)) (coq-button-face (:background gruvbox-bg_inactive)) (coq-button-face-active (:background gruvbox-dark1)) (coq-button-face-pressed (:background gruvbox-bg_inactive)) ;; Proof General + (proof-active-area-face (:underline t)) (proof-tacticals-name-face (:inherit 'font-lock-constant-face)) (proof-tactics-name-face (:inherit 'font-lock-constant-face)) @@ -859,22 +921,25 @@ Should contain 2 %s constructs to allow for theme name and directory/prefix") (proof-error-face (:background gruvbox-bg :foreground gruvbox-faded_red)) ;; ledger-mode + (ledger-font-xact-highlight-face (:background gruvbox-dark1)) ;; Solaire + (solaire-default-face (:background gruvbox-dark0_soft)) (solaire-minibuffer-face (:background gruvbox-dark0_soft)) (solaire-hl-line-face (:background gruvbox-dark0_soft)) (solaire-org-hide-face (:background gruvbox-dark0_soft)) ;; avy + (avy-background-face (:foreground gruvbox-gray)) (avy-lead-face (:foreground gruvbox-dark0 :background gruvbox-neutral_red)) (avy-lead-face-0 (:foreground gruvbox-dark0 :background gruvbox-neutral_blue)) (avy-lead-face-1 (:foreground gruvbox-dark0 :background gruvbox-neutral_aqua)) - (avy-lead-face-2 (:foreground gruvbox-dark0 :background gruvbox-neutral_purple)) + (avy-lead-face-2 (:foreground gruvbox-dark0 :background gruvbox-neutral_purple))) - ),@body)) + ,@body)) (provide 'gruvbox)