branch: elpa/gruvbox-theme commit 250df251d0972aecd259144ad1ad3daf33c97cb2 Author: Martijn Terpstra <bigmart...@gmail.com> Commit: Jason Milkins <jason...@users.noreply.github.com>
Moved face definitions to a single file Now each variant only has to define its palette --- gruvbox-dark-theme.el | 321 +--------------------------------------------- gruvbox-light-theme.el | 321 +--------------------------------------------- gruvbox-theme.el | 336 ++----------------------------------------------- gruvbox.el | 335 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 345 insertions(+), 968 deletions(-) diff --git a/gruvbox-dark-theme.el b/gruvbox-dark-theme.el index 2d3e2f8017..1bc8df1977 100644 --- a/gruvbox-dark-theme.el +++ b/gruvbox-dark-theme.el @@ -49,7 +49,7 @@ (require 'gruvbox) -(autothemer-deftheme +(gruvbox-deftheme gruvbox-dark "A retro-groove colour theme (dark version)" @@ -121,325 +121,6 @@ ;; Medium by default. (t gruvbox-dark0)))) - ;; UI - ((default (:background gruvbox-bg :foreground gruvbox-light0)) - (cursor (:background gruvbox-light0)) - (mode-line (:background gruvbox-dark2 :foreground gruvbox-light2 :box nil)) - (mode-line-inactive (:background gruvbox-dark1 :foreground gruvbox-light4 :box nil)) - (fringe (:background gruvbox-bg)) - (linum (:background gruvbox-bg :foreground gruvbox-dark4)) - (hl-line (:background gruvbox-dark1)) - (region (:background gruvbox-dark2)) ;;selection - (secondary-selection (:background gruvbox-dark1)) - (minibuffer-prompt (:background gruvbox-bg :foreground gruvbox-neutral_green :bold t)) - (vertical-border (:foreground gruvbox-dark2)) - (link (:foreground gruvbox-faded_blue :underline t)) - (shadow (:foreground gruvbox-dark4)) - - ;; Built-in syntax - (font-lock-builtin-face (:foreground gruvbox-neutral_orange)) - (font-lock-constant-face (:foreground gruvbox-neutral_purple)) - (font-lock-comment-face (:foreground gruvbox-dark4)) - (font-lock-function-name-face (:foreground gruvbox-neutral_yellow)) - (font-lock-keyword-face (:foreground gruvbox-neutral_red)) - (font-lock-string-face (:foreground gruvbox-neutral_green)) - (font-lock-variable-name-face (:foreground gruvbox-neutral_blue)) - (font-lock-type-face (:foreground gruvbox-neutral_purple)) - (font-lock-warning-face (:foreground gruvbox-neutral_red :bold t)) - - ;; whitespace-mode - (whitespace-space (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-hspace (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-tab (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-newline (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-trailing (:background gruvbox-dark1 :foreground gruvbox-neutral_red)) - (whitespace-line (:background gruvbox-dark1 :foreground gruvbox-neutral_red)) - (whitespace-space-before-tab (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-indentation (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-empty (:background nil :foreground nil)) - (whitespace-space-after-tab (:background gruvbox-bg :foreground gruvbox-dark4)) - - ;; RainbowDelimiters - (rainbow-delimiters-depth-1-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-2-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-3-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-4-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-depth-5-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-6-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-7-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-8-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-depth-9-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-10-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-11-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-12-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-unmatched-face (:background nil :foreground gruvbox-light0)) - - ;; linum-relative - (linum-relative-current-face (:background gruvbox-dark1 :foreground gruvbox-light4)) - - ;; Highlight indentation mode - (highlight-indentation-current-column-face (:background gruvbox-dark2)) - (highlight-indentation-face (:background gruvbox-dark1)) - - ;; Highlight linum - (linum-highlight-face (:background gruvbox-dark1 :foreground gruvbox-neutral_yellow)) - - ;; 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-neutral_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-neutral_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-neutral_blue)) - (ag-match-face (:foreground gruvbox-neutral_red)) - - ;; Diffs - (diff-changed (:background nil :foreground gruvbox-light1)) - (diff-added (:background nil :foreground gruvbox-neutral_green)) - (diff-removed (:background nil :foreground gruvbox-neutral_red)) - (diff-indicator-changed (:inherit 'diff-changed)) - (diff-indicator-added (:inherit 'diff-added)) - (diff-indicator-removed (:inherit 'diff-removed)) - - (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-type (:background nil :foreground gruvbox-light4)) - (js2-jsdoc-value (:background nil :foreground gruvbox-light3)) - (js2-function-param (:background nil :foreground gruvbox-bright_aqua)) - (js2-function-call (:background nil :foreground gruvbox-bright_blue)) - (js2-instance-member (:background nil :foreground gruvbox-bright_orange)) - (js2-private-member (:background nil :foreground gruvbox-faded_yellow)) - (js2-private-function-call (:background nil :foreground gruvbox-faded_aqua)) - (js2-jsdoc-html-tag-name (:background nil :foreground gruvbox-light4)) - (js2-jsdoc-html-tag-delimiter (:background nil :foreground gruvbox-light3)) - - ;; popup - (popup-face (:foreground gruvbox-light1 :background gruvbox-dark1)) - (popup-menu-mouse-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) - (popup-menu-selection-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) - (popup-tip-face (:foreground gruvbox-light2 :background gruvbox-dark2)) - - ;; helm - (helm-M-x-key (:foreground gruvbox-neutral_orange )) - (helm-action (:foreground gruvbox-white :underline t)) - (helm-bookmark-addressbook (:foreground gruvbox-neutral_red)) - (helm-bookmark-directory (:foreground gruvbox-bright_purple)) - (helm-bookmark-file (:foreground gruvbox-faded_blue)) - (helm-bookmark-gnus (:foreground gruvbox-faded_purple)) - (helm-bookmark-info (:foreground gruvbox-turquoise4)) - (helm-bookmark-man (:foreground gruvbox-sienna)) - (helm-bookmark-w3m (:foreground gruvbox-neutral_yellow)) - (helm-buffer-directory (:foreground gruvbox-white :background gruvbox-bright_blue)) - (helm-buffer-not-saved (:foreground gruvbox-faded_red)) - (helm-buffer-process (:foreground gruvbox-burlywood4)) - (helm-buffer-saved-out (:foreground gruvbox-bright_red)) - (helm-buffer-size (:foreground gruvbox-bright_purple)) - (helm-candidate-number (:foreground gruvbox-neutral_green)) - (helm-ff-directory (:foreground gruvbox-neutral_purple)) - (helm-ff-executable (:foreground gruvbox-turquoise4)) - (helm-ff-file (:foreground gruvbox-sienna)) - (helm-ff-invalid-symlink (:foreground gruvbox-white :background gruvbox-bright_red)) - (helm-ff-prefix (:foreground gruvbox-black :background gruvbox-neutral_yellow)) - (helm-ff-symlink (:foreground gruvbox-neutral_orange)) - (helm-grep-cmd-line (:foreground gruvbox-neutral_green)) - (helm-grep-file (:foreground gruvbox-faded_purple)) - (helm-grep-finish (:foreground gruvbox-turquoise4)) - (helm-grep-lineno (:foreground gruvbox-neutral_orange)) - (helm-grep-match (:foreground gruvbox-neutral_yellow)) - (helm-grep-running (:foreground gruvbox-neutral_red)) - (helm-header (:foreground gruvbox-aquamarine4)) - (helm-helper (:foreground gruvbox-aquamarine4)) - (helm-history-deleted (:foreground gruvbox-black :background gruvbox-bright_red)) - (helm-history-remote (:foreground gruvbox-faded_red)) - (helm-lisp-completion-info (:foreground gruvbox-faded_orange)) - (helm-lisp-show-completion (:foreground gruvbox-bright_red)) - (helm-locate-finish (:foreground gruvbox-white :background gruvbox-aquamarine4)) - (helm-match (:foreground gruvbox-neutral_orange)) - (helm-moccur-buffer (:foreground gruvbox-bright_aqua :underline t)) - (helm-prefarg (:foreground gruvbox-turquoise4)) - (helm-selection (:foreground gruvbox-white :background gruvbox-dark2)) - (helm-selection-line (:foreground gruvbox-white :background gruvbox-dark2)) - (helm-separator (:foreground gruvbox-faded_red)) - (helm-source-header (:foreground gruvbox-light2)) - (helm-visible-mark (:foreground gruvbox-black :background gruvbox-light3)) - - ;; company-mode - (company-scrollbar-bg (:background gruvbox-dark1)) - (company-scrollbar-fg (:background gruvbox-dark0_soft)) - (company-tooltip (:background gruvbox-dark0_soft)) - (company-tooltip-annotation (:foreground gruvbox-neutral_green)) - (company-tooltip-selection (:foreground gruvbox-neutral_purple)) - (company-tooltip-common (:foreground gruvbox-neutral_blue :underline t)) - (company-tooltip-common-selection (:foreground gruvbox-neutral_blue :underline t)) - (company-preview-common (:foreground gruvbox-neutral_purple)) - - ;; Term - (term-color-black (:foreground gruvbox-dark2 :background gruvbox-dark1)) - (term-color-blue (:foreground gruvbox-bright_blue :background gruvbox-neutral_blue)) - (term-color-cyan (:foreground gruvbox-bright_aqua :background gruvbox-neutral_aqua)) - (term-color-green (:foreground gruvbox-bright_green :background gruvbox-neutral_green)) - (term-color-magenta (:foreground gruvbox-bright_purple :background gruvbox-neutral_purple)) - (term-color-red (:foreground gruvbox-bright_red :background gruvbox-neutral_red)) - (term-color-white (:foreground gruvbox-light1 :background gruvbox-light1)) - (term-color-yellow (:foreground gruvbox-bright_yellow :background gruvbox-neutral_yellow)) - (term-default-fg-color (:foreground gruvbox-light0)) - (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-neutral_orange :weight 'bold)) - (message-header-newsgroups (:foreground gruvbox-neutral_yellow :weight 'bold)) - (message-header-other (:inherit 'font-lock-variable-name-face)) - (message-header-name (:inherit 'font-lock-keyword-face)) - (message-header-xheader (:foreground gruvbox-faded_blue)) - (message-separator (:inherit 'font-lock-comment-face)) - (message-cited-text (:inherit 'font-lock-comment-face)) - (message-mml (:foreground gruvbox-faded_green :weight 'bold)) - - ;; org-mode - (org-hide (:foreground gruvbox-dark0)) - (org-level-1 (:foreground gruvbox-neutral_blue)) - (org-level-2 (:foreground gruvbox-neutral_yellow)) - (org-level-3 (:foreground gruvbox-neutral_purple)) - (org-level-4 (:foreground gruvbox-neutral_red)) - (org-level-5 (:foreground gruvbox-neutral_green)) - (org-level-6 (:foreground gruvbox-neutral_aqua)) - (org-level-7 (:foreground gruvbox-faded_blue)) - (org-level-8 (:foreground gruvbox-neutral_orange)) - (org-special-keyword (:inherit 'font-lock-comment-face)) - (org-drawer (:inherit 'font-lock-function-face)) - (org-column (:background gruvbox-dark0)) - (org-column-title (:background gruvbox-dark0 :underline t :weight 'bold)) - (org-warning (:foreground gruvbox-neutral_red :weight 'bold :underline nil :bold t)) - (org-archived (:foreground gruvbox-light0 :weight 'bold)) - (org-link (:foreground gruvbox-faded_aqua :underline t)) - (org-footnote (:foreground gruvbox-neutral_aqua :underline t)) - (org-ellipsis (:foreground gruvbox-light4 :underline t)) - (org-date (:foreground gruvbox-neutral_blue :underline t)) - (org-sexp-date (:foreground gruvbox-faded_blue :underline t)) - (org-tag (:bold t :weight 'bold)) - (org-list-dt (:bold t :weight 'bold)) - (org-todo (:foreground gruvbox-neutral_red :weight 'bold :bold t)) - (org-done (:foreground gruvbox-neutral_aqua :weight 'bold :bold t)) - (org-agenda-done (:foreground gruvbox-neutral_aqua)) - (org-headline-done (:foreground gruvbox-neutral_aqua)) - (org-table (:foreground gruvbox-neutral_blue)) - (org-formula (:foreground gruvbox-neutral_yellow)) - (org-document-title (:foreground gruvbox-faded_blue)) - (org-document-info (:foreground gruvbox-faded_blue)) - (org-agenda-structure (:inherit 'font-lock-comment-face)) - (org-agenda-date-today (:foreground gruvbox-light0 :weight 'bold :italic t)) - (org-scheduled (:foreground gruvbox-neutral_yellow)) - (org-scheduled-today (:foreground gruvbox-neutral_blue)) - (org-scheduled-previously (:foreground gruvbox-faded_red)) - (org-upcoming-deadline (:inherit 'font-lock-keyword-face)) - (org-deadline-announce (:foreground gruvbox-faded_red)) - (org-time-grid (:foreground gruvbox-faded_orange)) - - ;; org-habit - (org-habit-clear-face (:background gruvbox-faded_blue)) - (org-habit-clear-future-face (:background gruvbox-neutral_blue)) - (org-habit-ready-face (:background gruvbox-faded_green)) - (org-habit-ready-future-face (:background gruvbox-neutral_green)) - (org-habit-alert-face (:background gruvbox-faded_yellow)) - (org-habit-alert-future-face (:background gruvbox-neutral_yellow)) - (org-habit-overdue-face (:background gruvbox-faded_red)) - (org-habit-overdue-future-face (:background gruvbox-neutral_red)) - - ;; elfeed - (elfeed-search-title-face (:foreground gruvbox-gray )) - (elfeed-search-unread-title-face (:foreground gruvbox-light0)) - (elfeed-search-date-face (:inherit 'font-lock-builtin-face :underline t)) - (elfeed-search-feed-face (:inherit 'font-lock-variable-name-face)) - (elfeed-search-tag-face (:inherit 'font-lock-keyword-face)) - (elfeed-search-last-update-face (:inherit 'font-lock-comment-face)) - (elfeed-search-unread-count-face (:inherit 'font-lock-comment-face)) - (elfeed-search-filter-face (:inherit 'font-lock-string-face)) - - ;; Smart-mode-line - (sml/global (:foreground gruvbox-burlywood4 :inverse-video nil)) - (sml/modes (:foreground gruvbox-bright_green)) - (sml/filename (:foreground gruvbox-bright_red :weight 'bold)) - (sml/prefix (:foreground gruvbox-light1)) - (sml/read-only (:foreground gruvbox-neutral_blue)) - (persp-selected-face (:foreground gruvbox-neutral_orange)) - - ;;isearch - (isearch (:foreground gruvbox-black :background gruvbox-neutral_orange)) - (lazy-highlight (:foreground gruvbox-black :background gruvbox-neutral_yellow)) - (isearch-fail (:foreground gruvbox-light0 :background gruvbox-bright_red)) - - ;; markdown-mode - (markdown-header-face-1 (:foreground gruvbox-neutral_blue)) - (markdown-header-face-2 (:foreground gruvbox-neutral_yellow)) - (markdown-header-face-3 (:foreground gruvbox-neutral_purple)) - (markdown-header-face-4 (:foreground gruvbox-neutral_red)) - (markdown-header-face-5 (:foreground gruvbox-neutral_green)) - (markdown-header-face-6 (:foreground gruvbox-neutral_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)) - (anzu-match-3 (:background gruvbox-aquamarine4)) - (anzu-replace-to (:foreground gruvbox-bright_yellow)) - (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 :box 1)) - - ;; Ace-window - (aw-background-face (:forground gruvbox-light1 :background gruvbox-bg :inverse-video nil)) - (aw-leading-char-face (:foreground gruvbox-bright_orange :background gruvbox-bg :height 4.0 :box (:line-width 1 :color gruvbox-bright_orange))) - - ;; show-paren - (show-paren-match (:background gruvbox-dark3 :weight 'bold)) - (show-paren-mismatch (:background gruvbox-bright_red :foreground gruvbox-dark3 :weight 'bold)) - - ;; ivy - (ivy-current-match (:foreground gruvbox-white :weight 'bold :underline t)) - (ivy-minibuffer-match-face-1 (:foreground gruvbox-neutral_orange)) - (ivy-minibuffer-match-face-2 (:foreground gruvbox-neutral_yellow)) - (ivy-minibuffer-match-face-3 (:foreground gruvbox-faded_orange)) - (ivy-minibuffer-match-face-4 (:foreground gruvbox-faded_yellow)) - - ;; mu4e - (mu4e-header-key-face (:foreground gruvbox-bright_green :weight 'bold )) - (mu4e-unread-face (:foreground gruvbox-bright_blue :weight 'bold )) - (mu4e-highlight-face (:foreground gruvbox-neutral_green)) - - ;; MODE SUPPORT: dired+ - (diredp-file-name (:foreground gruvbox-light2)) - (diredp-file-suffix (:foreground gruvbox-light4)) - (diredp-compressed-file-suffix (:foreground gruvbox-faded_blue)) - (diredp-dir-name (:foreground gruvbox-faded_blue)) - (diredp-dir-heading (:foreground gruvbox-bright_blue)) - (diredp-symlink (:foreground gruvbox-bright_orange)) - (diredp-date-time (:foreground gruvbox-light3)) - (diredp-number (:foreground gruvbox-faded_blue)) - (diredp-no-priv (:foreground gruvbox-dark4)) - (diredp-other-priv (:foreground gruvbox-dark2)) - (diredp-rare-priv (:foreground gruvbox-dark4)) - (diredp-ignored-file-name (:foreground gruvbox-dark4)) - - (diredp-dir-priv (:foreground gruvbox-faded_blue :background gruvbox-dark_blue)) - (diredp-exec-priv (:foreground gruvbox-faded_blue :background gruvbox-dark_blue)) - (diredp-link-priv (:foreground gruvbox-faded_aqua :background gruvbox-dark_aqua)) - (diredp-read-priv (:foreground gruvbox-bright_red :background gruvbox-dark_red)) - (diredp-write-priv (:foreground gruvbox-bright_aqua :background gruvbox-dark_aqua))) - (custom-theme-set-variables 'gruvbox-dark `(ansi-color-names-vector [,gruvbox-dark1 diff --git a/gruvbox-light-theme.el b/gruvbox-light-theme.el index d59f7960e0..a46e71308e 100644 --- a/gruvbox-light-theme.el +++ b/gruvbox-light-theme.el @@ -49,7 +49,7 @@ (require 'gruvbox) -(autothemer-deftheme +(gruvbox-deftheme gruvbox-light "A retro-groove colour theme (light version)" @@ -121,325 +121,6 @@ ;; Medium by default. (t gruvbox-dark0)))) - ;; UI - ((default (:background gruvbox-bg :foreground gruvbox-light0)) - (cursor (:background gruvbox-light0)) - (mode-line (:background gruvbox-dark2 :foreground gruvbox-light2 :box nil)) - (mode-line-inactive (:background gruvbox-dark1 :foreground gruvbox-light4 :box nil)) - (fringe (:background gruvbox-bg)) - (linum (:background gruvbox-bg :foreground gruvbox-dark4)) - (hl-line (:background gruvbox-dark1)) - (region (:background gruvbox-dark2)) ;;selection - (secondary-selection (:background gruvbox-dark1)) - (minibuffer-prompt (:background gruvbox-bg :foreground gruvbox-neutral_green :bold t)) - (vertical-border (:foreground gruvbox-dark2)) - (link (:foreground gruvbox-faded_blue :underline t)) - (shadow (:foreground gruvbox-dark4)) - - ;; Built-in syntax - (font-lock-builtin-face (:foreground gruvbox-neutral_orange)) - (font-lock-constant-face (:foreground gruvbox-neutral_purple)) - (font-lock-comment-face (:foreground gruvbox-dark4)) - (font-lock-function-name-face (:foreground gruvbox-neutral_yellow)) - (font-lock-keyword-face (:foreground gruvbox-neutral_red)) - (font-lock-string-face (:foreground gruvbox-neutral_green)) - (font-lock-variable-name-face (:foreground gruvbox-neutral_blue)) - (font-lock-type-face (:foreground gruvbox-neutral_purple)) - (font-lock-warning-face (:foreground gruvbox-neutral_red :bold t)) - - ;; whitespace-mode - (whitespace-space (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-hspace (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-tab (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-newline (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-trailing (:background gruvbox-dark1 :foreground gruvbox-neutral_red)) - (whitespace-line (:background gruvbox-dark1 :foreground gruvbox-neutral_red)) - (whitespace-space-before-tab (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-indentation (:background gruvbox-bg :foreground gruvbox-dark4)) - (whitespace-empty (:background nil :foreground nil)) - (whitespace-space-after-tab (:background gruvbox-bg :foreground gruvbox-dark4)) - - ;; RainbowDelimiters - (rainbow-delimiters-depth-1-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-2-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-3-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-4-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-depth-5-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-6-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-7-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-8-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-depth-9-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-10-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-11-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-12-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-unmatched-face (:background nil :foreground gruvbox-light0)) - - ;; linum-relative - (linum-relative-current-face (:background gruvbox-dark1 :foreground gruvbox-light4)) - - ;; Highlight indentation mode - (highlight-indentation-current-column-face (:background gruvbox-dark2)) - (highlight-indentation-face (:background gruvbox-dark1)) - - ;; Highlight linum - (linum-highlight-face (:background gruvbox-dark1 :foreground gruvbox-neutral_yellow)) - - ;; 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-neutral_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-neutral_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-neutral_blue)) - (ag-match-face (:foreground gruvbox-neutral_red)) - - ;; Diffs - (diff-changed (:background nil :foreground gruvbox-light1)) - (diff-added (:background nil :foreground gruvbox-neutral_green)) - (diff-removed (:background nil :foreground gruvbox-neutral_red)) - (diff-indicator-changed (:inherit 'diff-changed)) - (diff-indicator-added (:inherit 'diff-added)) - (diff-indicator-removed (:inherit 'diff-removed)) - - (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-type (:background nil :foreground gruvbox-light4)) - (js2-jsdoc-value (:background nil :foreground gruvbox-light3)) - (js2-function-param (:background nil :foreground gruvbox-bright_aqua)) - (js2-function-call (:background nil :foreground gruvbox-bright_blue)) - (js2-instance-member (:background nil :foreground gruvbox-bright_orange)) - (js2-private-member (:background nil :foreground gruvbox-faded_yellow)) - (js2-private-function-call (:background nil :foreground gruvbox-faded_aqua)) - (js2-jsdoc-html-tag-name (:background nil :foreground gruvbox-light4)) - (js2-jsdoc-html-tag-delimiter (:background nil :foreground gruvbox-light3)) - - ;; popup - (popup-face (:foreground gruvbox-light1 :background gruvbox-dark1)) - (popup-menu-mouse-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) - (popup-menu-selection-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) - (popup-tip-face (:foreground gruvbox-light2 :background gruvbox-dark2)) - - ;; helm - (helm-M-x-key (:foreground gruvbox-neutral_orange )) - (helm-action (:foreground gruvbox-white :underline t)) - (helm-bookmark-addressbook (:foreground gruvbox-neutral_red)) - (helm-bookmark-directory (:foreground gruvbox-bright_purple)) - (helm-bookmark-file (:foreground gruvbox-faded_blue)) - (helm-bookmark-gnus (:foreground gruvbox-faded_purple)) - (helm-bookmark-info (:foreground gruvbox-turquoise4)) - (helm-bookmark-man (:foreground gruvbox-sienna)) - (helm-bookmark-w3m (:foreground gruvbox-neutral_yellow)) - (helm-buffer-directory (:foreground gruvbox-white :background gruvbox-bright_blue)) - (helm-buffer-not-saved (:foreground gruvbox-faded_red)) - (helm-buffer-process (:foreground gruvbox-burlywood4)) - (helm-buffer-saved-out (:foreground gruvbox-bright_red)) - (helm-buffer-size (:foreground gruvbox-bright_purple)) - (helm-candidate-number (:foreground gruvbox-neutral_green)) - (helm-ff-directory (:foreground gruvbox-neutral_purple)) - (helm-ff-executable (:foreground gruvbox-turquoise4)) - (helm-ff-file (:foreground gruvbox-sienna)) - (helm-ff-invalid-symlink (:foreground gruvbox-white :background gruvbox-bright_red)) - (helm-ff-prefix (:foreground gruvbox-black :background gruvbox-neutral_yellow)) - (helm-ff-symlink (:foreground gruvbox-neutral_orange)) - (helm-grep-cmd-line (:foreground gruvbox-neutral_green)) - (helm-grep-file (:foreground gruvbox-faded_purple)) - (helm-grep-finish (:foreground gruvbox-turquoise4)) - (helm-grep-lineno (:foreground gruvbox-neutral_orange)) - (helm-grep-match (:foreground gruvbox-neutral_yellow)) - (helm-grep-running (:foreground gruvbox-neutral_red)) - (helm-header (:foreground gruvbox-aquamarine4)) - (helm-helper (:foreground gruvbox-aquamarine4)) - (helm-history-deleted (:foreground gruvbox-black :background gruvbox-bright_red)) - (helm-history-remote (:foreground gruvbox-faded_red)) - (helm-lisp-completion-info (:foreground gruvbox-faded_orange)) - (helm-lisp-show-completion (:foreground gruvbox-bright_red)) - (helm-locate-finish (:foreground gruvbox-white :background gruvbox-aquamarine4)) - (helm-match (:foreground gruvbox-neutral_orange)) - (helm-moccur-buffer (:foreground gruvbox-bright_aqua :underline t)) - (helm-prefarg (:foreground gruvbox-turquoise4)) - (helm-selection (:foreground gruvbox-white :background gruvbox-dark2)) - (helm-selection-line (:foreground gruvbox-white :background gruvbox-dark2)) - (helm-separator (:foreground gruvbox-faded_red)) - (helm-source-header (:foreground gruvbox-light2)) - (helm-visible-mark (:foreground gruvbox-black :background gruvbox-light3)) - - ;; company-mode - (company-scrollbar-bg (:background gruvbox-dark1)) - (company-scrollbar-fg (:background gruvbox-dark0_soft)) - (company-tooltip (:background gruvbox-dark0_soft)) - (company-tooltip-annotation (:foreground gruvbox-neutral_green)) - (company-tooltip-selection (:foreground gruvbox-neutral_purple)) - (company-tooltip-common (:foreground gruvbox-neutral_blue :underline t)) - (company-tooltip-common-selection (:foreground gruvbox-neutral_blue :underline t)) - (company-preview-common (:foreground gruvbox-neutral_purple)) - - ;; Term - (term-color-black (:foreground gruvbox-dark2 :background gruvbox-dark1)) - (term-color-blue (:foreground gruvbox-bright_blue :background gruvbox-neutral_blue)) - (term-color-cyan (:foreground gruvbox-bright_aqua :background gruvbox-neutral_aqua)) - (term-color-green (:foreground gruvbox-bright_green :background gruvbox-neutral_green)) - (term-color-magenta (:foreground gruvbox-bright_purple :background gruvbox-neutral_purple)) - (term-color-red (:foreground gruvbox-bright_red :background gruvbox-neutral_red)) - (term-color-white (:foreground gruvbox-light1 :background gruvbox-light1)) - (term-color-yellow (:foreground gruvbox-bright_yellow :background gruvbox-neutral_yellow)) - (term-default-fg-color (:foreground gruvbox-light0)) - (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-neutral_orange :weight 'bold)) - (message-header-newsgroups (:foreground gruvbox-neutral_yellow :weight 'bold)) - (message-header-other (:inherit 'font-lock-variable-name-face)) - (message-header-name (:inherit 'font-lock-keyword-face)) - (message-header-xheader (:foreground gruvbox-faded_blue)) - (message-separator (:inherit 'font-lock-comment-face)) - (message-cited-text (:inherit 'font-lock-comment-face)) - (message-mml (:foreground gruvbox-faded_green :weight 'bold)) - - ;; org-mode - (org-hide (:foreground gruvbox-dark0)) - (org-level-1 (:foreground gruvbox-neutral_blue)) - (org-level-2 (:foreground gruvbox-neutral_yellow)) - (org-level-3 (:foreground gruvbox-neutral_purple)) - (org-level-4 (:foreground gruvbox-neutral_red)) - (org-level-5 (:foreground gruvbox-neutral_green)) - (org-level-6 (:foreground gruvbox-neutral_aqua)) - (org-level-7 (:foreground gruvbox-faded_blue)) - (org-level-8 (:foreground gruvbox-neutral_orange)) - (org-special-keyword (:inherit 'font-lock-comment-face)) - (org-drawer (:inherit 'font-lock-function-face)) - (org-column (:background gruvbox-dark0)) - (org-column-title (:background gruvbox-dark0 :underline t :weight 'bold)) - (org-warning (:foreground gruvbox-neutral_red :weight 'bold :underline nil :bold t)) - (org-archived (:foreground gruvbox-light0 :weight 'bold)) - (org-link (:foreground gruvbox-faded_aqua :underline t)) - (org-footnote (:foreground gruvbox-neutral_aqua :underline t)) - (org-ellipsis (:foreground gruvbox-light4 :underline t)) - (org-date (:foreground gruvbox-neutral_blue :underline t)) - (org-sexp-date (:foreground gruvbox-faded_blue :underline t)) - (org-tag (:bold t :weight 'bold)) - (org-list-dt (:bold t :weight 'bold)) - (org-todo (:foreground gruvbox-neutral_red :weight 'bold :bold t)) - (org-done (:foreground gruvbox-neutral_aqua :weight 'bold :bold t)) - (org-agenda-done (:foreground gruvbox-neutral_aqua)) - (org-headline-done (:foreground gruvbox-neutral_aqua)) - (org-table (:foreground gruvbox-neutral_blue)) - (org-formula (:foreground gruvbox-neutral_yellow)) - (org-document-title (:foreground gruvbox-faded_blue)) - (org-document-info (:foreground gruvbox-faded_blue)) - (org-agenda-structure (:inherit 'font-lock-comment-face)) - (org-agenda-date-today (:foreground gruvbox-light0 :weight 'bold :italic t)) - (org-scheduled (:foreground gruvbox-neutral_yellow)) - (org-scheduled-today (:foreground gruvbox-neutral_blue)) - (org-scheduled-previously (:foreground gruvbox-faded_red)) - (org-upcoming-deadline (:inherit 'font-lock-keyword-face)) - (org-deadline-announce (:foreground gruvbox-faded_red)) - (org-time-grid (:foreground gruvbox-faded_orange)) - - ;; org-habit - (org-habit-clear-face (:background gruvbox-faded_blue)) - (org-habit-clear-future-face (:background gruvbox-neutral_blue)) - (org-habit-ready-face (:background gruvbox-faded_green)) - (org-habit-ready-future-face (:background gruvbox-neutral_green)) - (org-habit-alert-face (:background gruvbox-faded_yellow)) - (org-habit-alert-future-face (:background gruvbox-neutral_yellow)) - (org-habit-overdue-face (:background gruvbox-faded_red)) - (org-habit-overdue-future-face (:background gruvbox-neutral_red)) - - ;; elfeed - (elfeed-search-title-face (:foreground gruvbox-gray )) - (elfeed-search-unread-title-face (:foreground gruvbox-light0)) - (elfeed-search-date-face (:inherit 'font-lock-builtin-face :underline t)) - (elfeed-search-feed-face (:inherit 'font-lock-variable-name-face)) - (elfeed-search-tag-face (:inherit 'font-lock-keyword-face)) - (elfeed-search-last-update-face (:inherit 'font-lock-comment-face)) - (elfeed-search-unread-count-face (:inherit 'font-lock-comment-face)) - (elfeed-search-filter-face (:inherit 'font-lock-string-face)) - - ;; Smart-mode-line - (sml/global (:foreground gruvbox-burlywood4 :inverse-video nil)) - (sml/modes (:foreground gruvbox-bright_green)) - (sml/filename (:foreground gruvbox-bright_red :weight 'bold)) - (sml/prefix (:foreground gruvbox-light1)) - (sml/read-only (:foreground gruvbox-neutral_blue)) - (persp-selected-face (:foreground gruvbox-neutral_orange)) - - ;;isearch - (isearch (:foreground gruvbox-black :background gruvbox-neutral_orange)) - (lazy-highlight (:foreground gruvbox-black :background gruvbox-neutral_yellow)) - (isearch-fail (:foreground gruvbox-light0 :background gruvbox-bright_red)) - - ;; markdown-mode - (markdown-header-face-1 (:foreground gruvbox-neutral_blue)) - (markdown-header-face-2 (:foreground gruvbox-neutral_yellow)) - (markdown-header-face-3 (:foreground gruvbox-neutral_purple)) - (markdown-header-face-4 (:foreground gruvbox-neutral_red)) - (markdown-header-face-5 (:foreground gruvbox-neutral_green)) - (markdown-header-face-6 (:foreground gruvbox-neutral_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)) - (anzu-match-3 (:background gruvbox-aquamarine4)) - (anzu-replace-to (:foreground gruvbox-bright_yellow)) - (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 :box 1)) - - ;; Ace-window - (aw-background-face (:forground gruvbox-light1 :background gruvbox-bg :inverse-video nil)) - (aw-leading-char-face (:foreground gruvbox-bright_orange :background gruvbox-bg :height 4.0 :box (:line-width 1 :color gruvbox-bright_orange))) - - ;; show-paren - (show-paren-match (:background gruvbox-dark3 :weight 'bold)) - (show-paren-mismatch (:background gruvbox-bright_red :foreground gruvbox-dark3 :weight 'bold)) - - ;; ivy - (ivy-current-match (:foreground gruvbox-white :weight 'bold :underline t)) - (ivy-minibuffer-match-face-1 (:foreground gruvbox-neutral_orange)) - (ivy-minibuffer-match-face-2 (:foreground gruvbox-neutral_yellow)) - (ivy-minibuffer-match-face-3 (:foreground gruvbox-faded_orange)) - (ivy-minibuffer-match-face-4 (:foreground gruvbox-faded_yellow)) - - ;; mu4e - (mu4e-header-key-face (:foreground gruvbox-bright_green :weight 'bold )) - (mu4e-unread-face (:foreground gruvbox-bright_blue :weight 'bold )) - (mu4e-highlight-face (:foreground gruvbox-neutral_green)) - - ;; MODE SUPPORT: dired+ - (diredp-file-name (:foreground gruvbox-light2)) - (diredp-file-suffix (:foreground gruvbox-light4)) - (diredp-compressed-file-suffix (:foreground gruvbox-faded_blue)) - (diredp-dir-name (:foreground gruvbox-faded_blue)) - (diredp-dir-heading (:foreground gruvbox-bright_blue)) - (diredp-symlink (:foreground gruvbox-bright_orange)) - (diredp-date-time (:foreground gruvbox-light3)) - (diredp-number (:foreground gruvbox-faded_blue)) - (diredp-no-priv (:foreground gruvbox-dark4)) - (diredp-other-priv (:foreground gruvbox-dark2)) - (diredp-rare-priv (:foreground gruvbox-dark4)) - (diredp-ignored-file-name (:foreground gruvbox-dark4)) - - (diredp-dir-priv (:foreground gruvbox-faded_blue :background gruvbox-dark_blue)) - (diredp-exec-priv (:foreground gruvbox-faded_blue :background gruvbox-dark_blue)) - (diredp-link-priv (:foreground gruvbox-faded_aqua :background gruvbox-dark_aqua)) - (diredp-read-priv (:foreground gruvbox-bright_red :background gruvbox-dark_red)) - (diredp-write-priv (:foreground gruvbox-bright_aqua :background gruvbox-dark_aqua))) - (custom-theme-set-variables 'gruvbox-light `(ansi-color-names-vector [,gruvbox-dark1 diff --git a/gruvbox-theme.el b/gruvbox-theme.el index 606f2a51a3..f70e092773 100644 --- a/gruvbox-theme.el +++ b/gruvbox-theme.el @@ -49,20 +49,20 @@ (require 'gruvbox) -(autothemer-deftheme +(gruvbox-deftheme gruvbox "A retro-groove colour theme (dark version)" ((((class color) (min-colors #xFFFFFF)) ; col 1 GUI/24bit ((class color) (min-colors #xFF))) ; col 2 Xterm/256 - (gruvbox0_hard "#1d2021" "#1c1c1c") - (gruvbox0 "#282828" "#262626") - (gruvbox0_soft "#32302f" "#303030") - (gruvbox1 "#3c3836" "#3a3a3a") - (gruvbox2 "#504945" "#4e4e4e") - (gruvbox3 "#665c54" "#626262") - (gruvbox4 "#7c6f64" "#767676") + (gruvbox-dark0_hard "#1d2021" "#1c1c1c") + (gruvbox-dark0 "#282828" "#262626") + (gruvbox-dark0_soft "#32302f" "#303030") + (gruvbox-dark1 "#3c3836" "#3a3a3a") + (gruvbox-dark2 "#504945" "#4e4e4e") + (gruvbox-dark3 "#665c54" "#626262") + (gruvbox-dark4 "#7c6f64" "#767676") (gruvbox-gray "#928374" "#8a8a8a") @@ -121,325 +121,6 @@ ;; Medium by default. (t gruvbox0)))) - ;; UI - ((default (:background gruvbox-bg :foreground gruvbox-light0)) - (cursor (:background gruvbox-light0)) - (mode-line (:background gruvbox2 :foreground gruvbox-light2 :box nil)) - (mode-line-inactive (:background gruvbox1 :foreground gruvbox-light4 :box nil)) - (fringe (:background gruvbox-bg)) - (linum (:background gruvbox-bg :foreground gruvbox4)) - (hl-line (:background gruvbox1)) - (region (:background gruvbox2)) ;;selection - (secondary-selection (:background gruvbox1)) - (minibuffer-prompt (:background gruvbox-bg :foreground gruvbox-neutral_green :bold t)) - (vertical-border (:foreground gruvbox2)) - (link (:foreground gruvbox-faded_blue :underline t)) - (shadow (:foreground gruvbox4)) - - ;; Built-in syntax - (font-lock-builtin-face (:foreground gruvbox-neutral_orange)) - (font-lock-constant-face (:foreground gruvbox-neutral_purple)) - (font-lock-comment-face (:foreground gruvbox4)) - (font-lock-function-name-face (:foreground gruvbox-neutral_yellow)) - (font-lock-keyword-face (:foreground gruvbox-neutral_red)) - (font-lock-string-face (:foreground gruvbox-neutral_green)) - (font-lock-variable-name-face (:foreground gruvbox-neutral_blue)) - (font-lock-type-face (:foreground gruvbox-neutral_purple)) - (font-lock-warning-face (:foreground gruvbox-neutral_red :bold t)) - - ;; whitespace-mode - (whitespace-space (:background gruvbox-bg :foreground gruvbox4)) - (whitespace-hspace (:background gruvbox-bg :foreground gruvbox4)) - (whitespace-tab (:background gruvbox-bg :foreground gruvbox4)) - (whitespace-newline (:background gruvbox-bg :foreground gruvbox4)) - (whitespace-trailing (:background gruvbox1 :foreground gruvbox-neutral_red)) - (whitespace-line (:background gruvbox1 :foreground gruvbox-neutral_red)) - (whitespace-space-before-tab (:background gruvbox-bg :foreground gruvbox4)) - (whitespace-indentation (:background gruvbox-bg :foreground gruvbox4)) - (whitespace-empty (:background nil :foreground nil)) - (whitespace-space-after-tab (:background gruvbox-bg :foreground gruvbox4)) - - ;; RainbowDelimiters - (rainbow-delimiters-depth-1-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-2-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-3-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-4-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-depth-5-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-6-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-7-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-8-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-depth-9-face (:foreground gruvbox-delimiter-one)) - (rainbow-delimiters-depth-10-face (:foreground gruvbox-delimiter-two)) - (rainbow-delimiters-depth-11-face (:foreground gruvbox-delimiter-three)) - (rainbow-delimiters-depth-12-face (:foreground gruvbox-delimiter-four)) - (rainbow-delimiters-unmatched-face (:background nil :foreground gruvbox-light0)) - - ;; linum-relative - (linum-relative-current-face (:background gruvbox1 :foreground gruvbox-light4)) - - ;; Highlight indentation mode - (highlight-indentation-current-column-face (:background gruvbox2)) - (highlight-indentation-face (:background gruvbox1)) - - ;; Highlight linum - (linum-highlight-face (:background gruvbox1 :foreground gruvbox-neutral_yellow)) - - ;; Smartparens - (sp-pair-overlay-face (:background gruvbox2)) - (sp-show-pair-match-face (:background gruvbox2)) ;; Pair tags highlight - (sp-show-pair-mismatch-face (:background gruvbox-neutral_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 gruvbox2 :foreground gruvbox-neutral_red :underline nil :box nil)) ;; The controls - (elscreen-tab-current-screen-face (:background gruvbox4 :foreground gruvbox0 :box nil)) ;; Current tab - (elscreen-tab-other-screen-face (:background gruvbox2 :foreground gruvbox-light4 :underline nil :box nil)) ;; Inactive tab - - ;; ag (The Silver Searcher) - (ag-hit-face (:foreground gruvbox-neutral_blue)) - (ag-match-face (:foreground gruvbox-neutral_red)) - - ;; Diffs - (diff-changed (:background nil :foreground gruvbox-light1)) - (diff-added (:background nil :foreground gruvbox-neutral_green)) - (diff-removed (:background nil :foreground gruvbox-neutral_red)) - (diff-indicator-changed (:inherit 'diff-changed)) - (diff-indicator-added (:inherit 'diff-added)) - (diff-indicator-removed (:inherit 'diff-removed)) - - (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-type (:background nil :foreground gruvbox-light4)) - (js2-jsdoc-value (:background nil :foreground gruvbox-light3)) - (js2-function-param (:background nil :foreground gruvbox-bright_aqua)) - (js2-function-call (:background nil :foreground gruvbox-bright_blue)) - (js2-instance-member (:background nil :foreground gruvbox-bright_orange)) - (js2-private-member (:background nil :foreground gruvbox-faded_yellow)) - (js2-private-function-call (:background nil :foreground gruvbox-faded_aqua)) - (js2-jsdoc-html-tag-name (:background nil :foreground gruvbox-light4)) - (js2-jsdoc-html-tag-delimiter (:background nil :foreground gruvbox-light3)) - - ;; popup - (popup-face (:foreground gruvbox-light1 :background gruvbox1)) - (popup-menu-mouse-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) - (popup-menu-selection-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) - (popup-tip-face (:foreground gruvbox-light2 :background gruvbox2)) - - ;; helm - (helm-M-x-key (:foreground gruvbox-neutral_orange )) - (helm-action (:foreground gruvbox-white :underline t)) - (helm-bookmark-addressbook (:foreground gruvbox-neutral_red)) - (helm-bookmark-directory (:foreground gruvbox-bright_purple)) - (helm-bookmark-file (:foreground gruvbox-faded_blue)) - (helm-bookmark-gnus (:foreground gruvbox-faded_purple)) - (helm-bookmark-info (:foreground gruvbox-turquoise4)) - (helm-bookmark-man (:foreground gruvbox-sienna)) - (helm-bookmark-w3m (:foreground gruvbox-neutral_yellow)) - (helm-buffer-directory (:foreground gruvbox-white :background gruvbox-bright_blue)) - (helm-buffer-not-saved (:foreground gruvbox-faded_red)) - (helm-buffer-process (:foreground gruvbox-burlywood4)) - (helm-buffer-saved-out (:foreground gruvbox-bright_red)) - (helm-buffer-size (:foreground gruvbox-bright_purple)) - (helm-candidate-number (:foreground gruvbox-neutral_green)) - (helm-ff-directory (:foreground gruvbox-neutral_purple)) - (helm-ff-executable (:foreground gruvbox-turquoise4)) - (helm-ff-file (:foreground gruvbox-sienna)) - (helm-ff-invalid-symlink (:foreground gruvbox-white :background gruvbox-bright_red)) - (helm-ff-prefix (:foreground gruvbox-black :background gruvbox-neutral_yellow)) - (helm-ff-symlink (:foreground gruvbox-neutral_orange)) - (helm-grep-cmd-line (:foreground gruvbox-neutral_green)) - (helm-grep-file (:foreground gruvbox-faded_purple)) - (helm-grep-finish (:foreground gruvbox-turquoise4)) - (helm-grep-lineno (:foreground gruvbox-neutral_orange)) - (helm-grep-match (:foreground gruvbox-neutral_yellow)) - (helm-grep-running (:foreground gruvbox-neutral_red)) - (helm-header (:foreground gruvbox-aquamarine4)) - (helm-helper (:foreground gruvbox-aquamarine4)) - (helm-history-deleted (:foreground gruvbox-black :background gruvbox-bright_red)) - (helm-history-remote (:foreground gruvbox-faded_red)) - (helm-lisp-completion-info (:foreground gruvbox-faded_orange)) - (helm-lisp-show-completion (:foreground gruvbox-bright_red)) - (helm-locate-finish (:foreground gruvbox-white :background gruvbox-aquamarine4)) - (helm-match (:foreground gruvbox-neutral_orange)) - (helm-moccur-buffer (:foreground gruvbox-bright_aqua :underline t)) - (helm-prefarg (:foreground gruvbox-turquoise4)) - (helm-selection (:foreground gruvbox-white :background gruvbox2)) - (helm-selection-line (:foreground gruvbox-white :background gruvbox2)) - (helm-separator (:foreground gruvbox-faded_red)) - (helm-source-header (:foreground gruvbox-light2)) - (helm-visible-mark (:foreground gruvbox-black :background gruvbox-light3)) - - ;; company-mode - (company-scrollbar-bg (:background gruvbox1)) - (company-scrollbar-fg (:background gruvbox0_soft)) - (company-tooltip (:background gruvbox0_soft)) - (company-tooltip-annotation (:foreground gruvbox-neutral_green)) - (company-tooltip-selection (:foreground gruvbox-neutral_purple)) - (company-tooltip-common (:foreground gruvbox-neutral_blue :underline t)) - (company-tooltip-common-selection (:foreground gruvbox-neutral_blue :underline t)) - (company-preview-common (:foreground gruvbox-neutral_purple)) - - ;; Term - (term-color-black (:foreground gruvbox2 :background gruvbox1)) - (term-color-blue (:foreground gruvbox-bright_blue :background gruvbox-neutral_blue)) - (term-color-cyan (:foreground gruvbox-bright_aqua :background gruvbox-neutral_aqua)) - (term-color-green (:foreground gruvbox-bright_green :background gruvbox-neutral_green)) - (term-color-magenta (:foreground gruvbox-bright_purple :background gruvbox-neutral_purple)) - (term-color-red (:foreground gruvbox-bright_red :background gruvbox-neutral_red)) - (term-color-white (:foreground gruvbox-light1 :background gruvbox-light1)) - (term-color-yellow (:foreground gruvbox-bright_yellow :background gruvbox-neutral_yellow)) - (term-default-fg-color (:foreground gruvbox-light0)) - (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-neutral_orange :weight 'bold)) - (message-header-newsgroups (:foreground gruvbox-neutral_yellow :weight 'bold)) - (message-header-other (:inherit 'font-lock-variable-name-face)) - (message-header-name (:inherit 'font-lock-keyword-face)) - (message-header-xheader (:foreground gruvbox-faded_blue)) - (message-separator (:inherit 'font-lock-comment-face)) - (message-cited-text (:inherit 'font-lock-comment-face)) - (message-mml (:foreground gruvbox-faded_green :weight 'bold)) - - ;; org-mode - (org-hide (:foreground gruvbox0)) - (org-level-1 (:foreground gruvbox-neutral_blue)) - (org-level-2 (:foreground gruvbox-neutral_yellow)) - (org-level-3 (:foreground gruvbox-neutral_purple)) - (org-level-4 (:foreground gruvbox-neutral_red)) - (org-level-5 (:foreground gruvbox-neutral_green)) - (org-level-6 (:foreground gruvbox-neutral_aqua)) - (org-level-7 (:foreground gruvbox-faded_blue)) - (org-level-8 (:foreground gruvbox-neutral_orange)) - (org-special-keyword (:inherit 'font-lock-comment-face)) - (org-drawer (:inherit 'font-lock-function-face)) - (org-column (:background gruvbox0)) - (org-column-title (:background gruvbox0 :underline t :weight 'bold)) - (org-warning (:foreground gruvbox-neutral_red :weight 'bold :underline nil :bold t)) - (org-archived (:foreground gruvbox-light0 :weight 'bold)) - (org-link (:foreground gruvbox-faded_aqua :underline t)) - (org-footnote (:foreground gruvbox-neutral_aqua :underline t)) - (org-ellipsis (:foreground gruvbox-light4 :underline t)) - (org-date (:foreground gruvbox-neutral_blue :underline t)) - (org-sexp-date (:foreground gruvbox-faded_blue :underline t)) - (org-tag (:bold t :weight 'bold)) - (org-list-dt (:bold t :weight 'bold)) - (org-todo (:foreground gruvbox-neutral_red :weight 'bold :bold t)) - (org-done (:foreground gruvbox-neutral_aqua :weight 'bold :bold t)) - (org-agenda-done (:foreground gruvbox-neutral_aqua)) - (org-headline-done (:foreground gruvbox-neutral_aqua)) - (org-table (:foreground gruvbox-neutral_blue)) - (org-formula (:foreground gruvbox-neutral_yellow)) - (org-document-title (:foreground gruvbox-faded_blue)) - (org-document-info (:foreground gruvbox-faded_blue)) - (org-agenda-structure (:inherit 'font-lock-comment-face)) - (org-agenda-date-today (:foreground gruvbox-light0 :weight 'bold :italic t)) - (org-scheduled (:foreground gruvbox-neutral_yellow)) - (org-scheduled-today (:foreground gruvbox-neutral_blue)) - (org-scheduled-previously (:foreground gruvbox-faded_red)) - (org-upcoming-deadline (:inherit 'font-lock-keyword-face)) - (org-deadline-announce (:foreground gruvbox-faded_red)) - (org-time-grid (:foreground gruvbox-faded_orange)) - - ;; org-habit - (org-habit-clear-face (:background gruvbox-faded_blue)) - (org-habit-clear-future-face (:background gruvbox-neutral_blue)) - (org-habit-ready-face (:background gruvbox-faded_green)) - (org-habit-ready-future-face (:background gruvbox-neutral_green)) - (org-habit-alert-face (:background gruvbox-faded_yellow)) - (org-habit-alert-future-face (:background gruvbox-neutral_yellow)) - (org-habit-overdue-face (:background gruvbox-faded_red)) - (org-habit-overdue-future-face (:background gruvbox-neutral_red)) - - ;; elfeed - (elfeed-search-title-face (:foreground gruvbox-gray )) - (elfeed-search-unread-title-face (:foreground gruvbox-light0)) - (elfeed-search-date-face (:inherit 'font-lock-builtin-face :underline t)) - (elfeed-search-feed-face (:inherit 'font-lock-variable-name-face)) - (elfeed-search-tag-face (:inherit 'font-lock-keyword-face)) - (elfeed-search-last-update-face (:inherit 'font-lock-comment-face)) - (elfeed-search-unread-count-face (:inherit 'font-lock-comment-face)) - (elfeed-search-filter-face (:inherit 'font-lock-string-face)) - - ;; Smart-mode-line - (sml/global (:foreground gruvbox-burlywood4 :inverse-video nil)) - (sml/modes (:foreground gruvbox-bright_green)) - (sml/filename (:foreground gruvbox-bright_red :weight 'bold)) - (sml/prefix (:foreground gruvbox-light1)) - (sml/read-only (:foreground gruvbox-neutral_blue)) - (persp-selected-face (:foreground gruvbox-neutral_orange)) - - ;;isearch - (isearch (:foreground gruvbox-black :background gruvbox-neutral_orange)) - (lazy-highlight (:foreground gruvbox-black :background gruvbox-neutral_yellow)) - (isearch-fail (:foreground gruvbox-light0 :background gruvbox-bright_red)) - - ;; markdown-mode - (markdown-header-face-1 (:foreground gruvbox-neutral_blue)) - (markdown-header-face-2 (:foreground gruvbox-neutral_yellow)) - (markdown-header-face-3 (:foreground gruvbox-neutral_purple)) - (markdown-header-face-4 (:foreground gruvbox-neutral_red)) - (markdown-header-face-5 (:foreground gruvbox-neutral_green)) - (markdown-header-face-6 (:foreground gruvbox-neutral_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)) - (anzu-match-3 (:background gruvbox-aquamarine4)) - (anzu-replace-to (:foreground gruvbox-bright_yellow)) - (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 :box 1)) - - ;; Ace-window - (aw-background-face (:forground gruvbox-light1 :background gruvbox-bg :inverse-video nil)) - (aw-leading-char-face (:foreground gruvbox-bright_orange :background gruvbox-bg :height 4.0 :box (:line-width 1 :color gruvbox-bright_orange))) - - ;; show-paren - (show-paren-match (:background gruvbox3 :weight 'bold)) - (show-paren-mismatch (:background gruvbox-bright_red :foreground gruvbox3 :weight 'bold)) - - ;; ivy - (ivy-current-match (:foreground gruvbox-white :weight 'bold :underline t)) - (ivy-minibuffer-match-face-1 (:foreground gruvbox-neutral_orange)) - (ivy-minibuffer-match-face-2 (:foreground gruvbox-neutral_yellow)) - (ivy-minibuffer-match-face-3 (:foreground gruvbox-faded_orange)) - (ivy-minibuffer-match-face-4 (:foreground gruvbox-faded_yellow)) - - ;; mu4e - (mu4e-header-key-face (:foreground gruvbox-bright_green :weight 'bold )) - (mu4e-unread-face (:foreground gruvbox-bright_blue :weight 'bold )) - (mu4e-highlight-face (:foreground gruvbox-neutral_green)) - - ;; MODE SUPPORT: dired+ - (diredp-file-name (:foreground gruvbox-light2)) - (diredp-file-suffix (:foreground gruvbox-light4)) - (diredp-compressed-file-suffix (:foreground gruvbox-faded_blue)) - (diredp-dir-name (:foreground gruvbox-faded_blue)) - (diredp-dir-heading (:foreground gruvbox-bright_blue)) - (diredp-symlink (:foreground gruvbox-bright_orange)) - (diredp-date-time (:foreground gruvbox-light3)) - (diredp-number (:foreground gruvbox-faded_blue)) - (diredp-no-priv (:foreground gruvbox4)) - (diredp-other-priv (:foreground gruvbox2)) - (diredp-rare-priv (:foreground gruvbox4)) - (diredp-ignored-file-name (:foreground gruvbox4)) - - (diredp-dir-priv (:foreground gruvbox-faded_blue :background gruvbox_blue)) - (diredp-exec-priv (:foreground gruvbox-faded_blue :background gruvbox_blue)) - (diredp-link-priv (:foreground gruvbox-faded_aqua :background gruvbox_aqua)) - (diredp-read-priv (:foreground gruvbox-bright_red :background gruvbox_red)) - (diredp-write-priv (:foreground gruvbox-bright_aqua :background gruvbox_aqua))) - (custom-theme-set-variables 'gruvbox `(ansi-color-names-vector [,gruvbox1 @@ -451,6 +132,7 @@ ,gruvbox-neutral_aqua ,gruvbox-light1]))) + ;;;###autoload (and load-file-name (boundp 'custom-theme-load-path) diff --git a/gruvbox.el b/gruvbox.el index f04f2cdfc2..6fc8f72af6 100644 --- a/gruvbox.el +++ b/gruvbox.el @@ -70,6 +70,340 @@ Valid options are \"soft\", \"medium\" and \"hard\"" (file-name-as-directory (file-name-directory load-file-name)))) + + +(defmacro gruvbox-deftheme (name description palette reduced-specs &rest body) + `(autothemer-deftheme + ,name + ,description + ,palette + +( + (default (:background gruvbox-bg :foreground gruvbox-light0)) + (cursor (:background gruvbox-light0)) + (mode-line (:background gruvbox-dark2 :foreground gruvbox-light2 :box nil)) + (mode-line-inactive (:background gruvbox-dark1 :foreground gruvbox-light4 :box nil)) + (fringe (:background gruvbox-bg)) + (linum (:background gruvbox-bg :foreground gruvbox-dark4)) + (hl-line (:background gruvbox-dark1)) + (region (:background gruvbox-dark2)) ;;selection + + (secondary-selection (:background gruvbox-dark1)) + (minibuffer-prompt (:background gruvbox-bg :foreground gruvbox-neutral_green :bold t)) + (vertical-border (:foreground gruvbox-dark2)) + (link (:foreground gruvbox-faded_blue :underline t)) + (shadow (:foreground gruvbox-dark4)) + + ;; Built-in syntax + + (font-lock-builtin-face (:foreground gruvbox-neutral_orange)) + (font-lock-constant-face (:foreground gruvbox-neutral_purple)) + (font-lock-comment-face (:foreground gruvbox-dark4)) + (font-lock-function-name-face (:foreground gruvbox-neutral_yellow)) + (font-lock-keyword-face (:foreground gruvbox-neutral_red)) + (font-lock-string-face (:foreground gruvbox-neutral_green)) + (font-lock-variable-name-face (:foreground gruvbox-neutral_blue)) + (font-lock-type-face (:foreground gruvbox-neutral_purple)) + (font-lock-warning-face (:foreground gruvbox-neutral_red :bold t)) + + ;; whitespace-mode + + (whitespace-space (:background gruvbox-bg :foreground gruvbox-dark4)) + (whitespace-hspace (:background gruvbox-bg :foreground gruvbox-dark4)) + (whitespace-tab (:background gruvbox-bg :foreground gruvbox-dark4)) + (whitespace-newline (:background gruvbox-bg :foreground gruvbox-dark4)) + (whitespace-trailing (:background gruvbox-dark1 :foreground gruvbox-neutral_red)) + (whitespace-line (:background gruvbox-dark1 :foreground gruvbox-neutral_red)) + (whitespace-space-before-tab (:background gruvbox-bg :foreground gruvbox-dark4)) + (whitespace-indentation (:background gruvbox-bg :foreground gruvbox-dark4)) + (whitespace-empty (:background nil :foreground nil)) + (whitespace-space-after-tab (:background gruvbox-bg :foreground gruvbox-dark4)) + + ;; RainbowDelimiters + + (rainbow-delimiters-depth-1-face (:foreground gruvbox-delimiter-one)) + (rainbow-delimiters-depth-2-face (:foreground gruvbox-delimiter-two)) + (rainbow-delimiters-depth-3-face (:foreground gruvbox-delimiter-three)) + (rainbow-delimiters-depth-4-face (:foreground gruvbox-delimiter-four)) + (rainbow-delimiters-depth-5-face (:foreground gruvbox-delimiter-one)) + (rainbow-delimiters-depth-6-face (:foreground gruvbox-delimiter-two)) + (rainbow-delimiters-depth-7-face (:foreground gruvbox-delimiter-three)) + (rainbow-delimiters-depth-8-face (:foreground gruvbox-delimiter-four)) + (rainbow-delimiters-depth-9-face (:foreground gruvbox-delimiter-one)) + (rainbow-delimiters-depth-10-face (:foreground gruvbox-delimiter-two)) + (rainbow-delimiters-depth-11-face (:foreground gruvbox-delimiter-three)) + (rainbow-delimiters-depth-12-face (:foreground gruvbox-delimiter-four)) + (rainbow-delimiters-unmatched-face (:background nil :foreground gruvbox-light0)) + + ;; linum-relative + (linum-relative-current-face (:background gruvbox-dark1 :foreground gruvbox-light4)) + + ;; Highlight indentation mode + (highlight-indentation-current-column-face (:background gruvbox-dark2)) + (highlight-indentation-face (:background gruvbox-dark1)) + + ;; Highlight linum + (linum-highlight-face (:background gruvbox-dark1 :foreground gruvbox-neutral_yellow)) + + ;; 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-neutral_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-neutral_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-neutral_blue)) + (ag-match-face (:foreground gruvbox-neutral_red)) + + ;; Diffs + (diff-changed (:background nil :foreground gruvbox-light1)) + (diff-added (:background nil :foreground gruvbox-neutral_green)) + (diff-removed (:background nil :foreground gruvbox-neutral_red)) + (diff-indicator-changed (:inherit 'diff-changed)) + (diff-indicator-added (:inherit 'diff-added)) + (diff-indicator-removed (:inherit 'diff-removed)) + + (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-type (:background nil :foreground gruvbox-light4)) + (js2-jsdoc-value (:background nil :foreground gruvbox-light3)) + (js2-function-param (:background nil :foreground gruvbox-bright_aqua)) + (js2-function-call (:background nil :foreground gruvbox-bright_blue)) + (js2-instance-member (:background nil :foreground gruvbox-bright_orange)) + (js2-private-member (:background nil :foreground gruvbox-faded_yellow)) + (js2-private-function-call (:background nil :foreground gruvbox-faded_aqua)) + (js2-jsdoc-html-tag-name (:background nil :foreground gruvbox-light4)) + (js2-jsdoc-html-tag-delimiter (:background nil :foreground gruvbox-light3)) + + ;; popup + (popup-face (:foreground gruvbox-light1 :background gruvbox-dark1)) + (popup-menu-mouse-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) + (popup-menu-selection-face (:foreground gruvbox-light0 :background gruvbox-faded_green)) + (popup-tip-face (:foreground gruvbox-light2 :background gruvbox-dark2)) + + ;; helm + (helm-M-x-key (:foreground gruvbox-neutral_orange )) + (helm-action (:foreground gruvbox-white :underline t)) + (helm-bookmark-addressbook (:foreground gruvbox-neutral_red)) + (helm-bookmark-directory (:foreground gruvbox-bright_purple)) + (helm-bookmark-file (:foreground gruvbox-faded_blue)) + (helm-bookmark-gnus (:foreground gruvbox-faded_purple)) + (helm-bookmark-info (:foreground gruvbox-turquoise4)) + (helm-bookmark-man (:foreground gruvbox-sienna)) + (helm-bookmark-w3m (:foreground gruvbox-neutral_yellow)) + (helm-buffer-directory (:foreground gruvbox-white :background gruvbox-bright_blue)) + (helm-buffer-not-saved (:foreground gruvbox-faded_red)) + (helm-buffer-process (:foreground gruvbox-burlywood4)) + (helm-buffer-saved-out (:foreground gruvbox-bright_red)) + (helm-buffer-size (:foreground gruvbox-bright_purple)) + (helm-candidate-number (:foreground gruvbox-neutral_green)) + (helm-ff-directory (:foreground gruvbox-neutral_purple)) + (helm-ff-executable (:foreground gruvbox-turquoise4)) + (helm-ff-file (:foreground gruvbox-sienna)) + (helm-ff-invalid-symlink (:foreground gruvbox-white :background gruvbox-bright_red)) + (helm-ff-prefix (:foreground gruvbox-black :background gruvbox-neutral_yellow)) + (helm-ff-symlink (:foreground gruvbox-neutral_orange)) + (helm-grep-cmd-line (:foreground gruvbox-neutral_green)) + (helm-grep-file (:foreground gruvbox-faded_purple)) + (helm-grep-finish (:foreground gruvbox-turquoise4)) + (helm-grep-lineno (:foreground gruvbox-neutral_orange)) + (helm-grep-match (:foreground gruvbox-neutral_yellow)) + (helm-grep-running (:foreground gruvbox-neutral_red)) + (helm-header (:foreground gruvbox-aquamarine4)) + (helm-helper (:foreground gruvbox-aquamarine4)) + (helm-history-deleted (:foreground gruvbox-black :background gruvbox-bright_red)) + (helm-history-remote (:foreground gruvbox-faded_red)) + (helm-lisp-completion-info (:foreground gruvbox-faded_orange)) + (helm-lisp-show-completion (:foreground gruvbox-bright_red)) + (helm-locate-finish (:foreground gruvbox-white :background gruvbox-aquamarine4)) + (helm-match (:foreground gruvbox-neutral_orange)) + (helm-moccur-buffer (:foreground gruvbox-bright_aqua :underline t)) + (helm-prefarg (:foreground gruvbox-turquoise4)) + (helm-selection (:foreground gruvbox-white :background gruvbox-dark2)) + (helm-selection-line (:foreground gruvbox-white :background gruvbox-dark2)) + (helm-separator (:foreground gruvbox-faded_red)) + (helm-source-header (:foreground gruvbox-light2)) + (helm-visible-mark (:foreground gruvbox-black :background gruvbox-light3)) + + ;; company-mode + (company-scrollbar-bg (:background gruvbox-dark1)) + (company-scrollbar-fg (:background gruvbox-dark0_soft)) + (company-tooltip (:background gruvbox-dark0_soft)) + (company-tooltip-annotation (:foreground gruvbox-neutral_green)) + (company-tooltip-selection (:foreground gruvbox-neutral_purple)) + (company-tooltip-common (:foreground gruvbox-neutral_blue :underline t)) + (company-tooltip-common-selection (:foreground gruvbox-neutral_blue :underline t)) + (company-preview-common (:foreground gruvbox-neutral_purple)) + + ;; Term + (term-color-black (:foreground gruvbox-dark2 :background gruvbox-dark1)) + (term-color-blue (:foreground gruvbox-bright_blue :background gruvbox-neutral_blue)) + (term-color-cyan (:foreground gruvbox-bright_aqua :background gruvbox-neutral_aqua)) + (term-color-green (:foreground gruvbox-bright_green :background gruvbox-neutral_green)) + (term-color-magenta (:foreground gruvbox-bright_purple :background gruvbox-neutral_purple)) + (term-color-red (:foreground gruvbox-bright_red :background gruvbox-neutral_red)) + (term-color-white (:foreground gruvbox-light1 :background gruvbox-light1)) + (term-color-yellow (:foreground gruvbox-bright_yellow :background gruvbox-neutral_yellow)) + (term-default-fg-color (:foreground gruvbox-light0)) + (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-neutral_orange :weight 'bold)) + (message-header-newsgroups (:foreground gruvbox-neutral_yellow :weight 'bold)) + (message-header-other (:inherit 'font-lock-variable-name-face)) + (message-header-name (:inherit 'font-lock-keyword-face)) + (message-header-xheader (:foreground gruvbox-faded_blue)) + (message-separator (:inherit 'font-lock-comment-face)) + (message-cited-text (:inherit 'font-lock-comment-face)) + (message-mml (:foreground gruvbox-faded_green :weight 'bold)) + + ;; org-mode + (org-hide (:foreground gruvbox-dark0)) + (org-level-1 (:foreground gruvbox-neutral_blue)) + (org-level-2 (:foreground gruvbox-neutral_yellow)) + (org-level-3 (:foreground gruvbox-neutral_purple)) + (org-level-4 (:foreground gruvbox-neutral_red)) + (org-level-5 (:foreground gruvbox-neutral_green)) + (org-level-6 (:foreground gruvbox-neutral_aqua)) + (org-level-7 (:foreground gruvbox-faded_blue)) + (org-level-8 (:foreground gruvbox-neutral_orange)) + (org-special-keyword (:inherit 'font-lock-comment-face)) + (org-drawer (:inherit 'font-lock-function-face)) + (org-column (:background gruvbox-dark0)) + (org-column-title (:background gruvbox-dark0 :underline t :weight 'bold)) + (org-warning (:foreground gruvbox-neutral_red :weight 'bold :underline nil :bold t)) + (org-archived (:foreground gruvbox-light0 :weight 'bold)) + (org-link (:foreground gruvbox-faded_aqua :underline t)) + (org-footnote (:foreground gruvbox-neutral_aqua :underline t)) + (org-ellipsis (:foreground gruvbox-light4 :underline t)) + (org-date (:foreground gruvbox-neutral_blue :underline t)) + (org-sexp-date (:foreground gruvbox-faded_blue :underline t)) + (org-tag (:bold t :weight 'bold)) + (org-list-dt (:bold t :weight 'bold)) + (org-todo (:foreground gruvbox-neutral_red :weight 'bold :bold t)) + (org-done (:foreground gruvbox-neutral_aqua :weight 'bold :bold t)) + (org-agenda-done (:foreground gruvbox-neutral_aqua)) + (org-headline-done (:foreground gruvbox-neutral_aqua)) + (org-table (:foreground gruvbox-neutral_blue)) + (org-formula (:foreground gruvbox-neutral_yellow)) + (org-document-title (:foreground gruvbox-faded_blue)) + (org-document-info (:foreground gruvbox-faded_blue)) + (org-agenda-structure (:inherit 'font-lock-comment-face)) + (org-agenda-date-today (:foreground gruvbox-light0 :weight 'bold :italic t)) + (org-scheduled (:foreground gruvbox-neutral_yellow)) + (org-scheduled-today (:foreground gruvbox-neutral_blue)) + (org-scheduled-previously (:foreground gruvbox-faded_red)) + (org-upcoming-deadline (:inherit 'font-lock-keyword-face)) + (org-deadline-announce (:foreground gruvbox-faded_red)) + (org-time-grid (:foreground gruvbox-faded_orange)) + + ;; org-habit + (org-habit-clear-face (:background gruvbox-faded_blue)) + (org-habit-clear-future-face (:background gruvbox-neutral_blue)) + (org-habit-ready-face (:background gruvbox-faded_green)) + (org-habit-ready-future-face (:background gruvbox-neutral_green)) + (org-habit-alert-face (:background gruvbox-faded_yellow)) + (org-habit-alert-future-face (:background gruvbox-neutral_yellow)) + (org-habit-overdue-face (:background gruvbox-faded_red)) + (org-habit-overdue-future-face (:background gruvbox-neutral_red)) + + ;; elfeed + (elfeed-search-title-face (:foreground gruvbox-gray )) + (elfeed-search-unread-title-face (:foreground gruvbox-light0)) + (elfeed-search-date-face (:inherit 'font-lock-builtin-face :underline t)) + (elfeed-search-feed-face (:inherit 'font-lock-variable-name-face)) + (elfeed-search-tag-face (:inherit 'font-lock-keyword-face)) + (elfeed-search-last-update-face (:inherit 'font-lock-comment-face)) + (elfeed-search-unread-count-face (:inherit 'font-lock-comment-face)) + (elfeed-search-filter-face (:inherit 'font-lock-string-face)) + + ;; Smart-mode-line + (sml/global (:foreground gruvbox-burlywood4 :inverse-video nil)) + (sml/modes (:foreground gruvbox-bright_green)) + (sml/filename (:foreground gruvbox-bright_red :weight 'bold)) + (sml/prefix (:foreground gruvbox-light1)) + (sml/read-only (:foreground gruvbox-neutral_blue)) + (persp-selected-face (:foreground gruvbox-neutral_orange)) + + ;;isearch + (isearch (:foreground gruvbox-black :background gruvbox-neutral_orange)) + (lazy-highlight (:foreground gruvbox-black :background gruvbox-neutral_yellow)) + (isearch-fail (:foreground gruvbox-light0 :background gruvbox-bright_red)) + + ;; markdown-mode + (markdown-header-face-1 (:foreground gruvbox-neutral_blue)) + (markdown-header-face-2 (:foreground gruvbox-neutral_yellow)) + (markdown-header-face-3 (:foreground gruvbox-neutral_purple)) + (markdown-header-face-4 (:foreground gruvbox-neutral_red)) + (markdown-header-face-5 (:foreground gruvbox-neutral_green)) + (markdown-header-face-6 (:foreground gruvbox-neutral_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)) + (anzu-match-3 (:background gruvbox-aquamarine4)) + (anzu-replace-to (:foreground gruvbox-bright_yellow)) + (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 :box 1)) + + ;; Ace-window + (aw-background-face (:forground gruvbox-light1 :background gruvbox-bg :inverse-video nil)) + (aw-leading-char-face (:foreground gruvbox-bright_orange :background gruvbox-bg :height 4.0 :box (:line-width 1 :color gruvbox-bright_orange))) + + ;; show-paren + (show-paren-match (:background gruvbox-dark3 :weight 'bold)) + (show-paren-mismatch (:background gruvbox-bright_red :foreground gruvbox-dark3 :weight 'bold)) + + ;; ivy + (ivy-current-match (:foreground gruvbox-white :weight 'bold :underline t)) + (ivy-minibuffer-match-face-1 (:foreground gruvbox-neutral_orange)) + (ivy-minibuffer-match-face-2 (:foreground gruvbox-neutral_yellow)) + (ivy-minibuffer-match-face-3 (:foreground gruvbox-faded_orange)) + (ivy-minibuffer-match-face-4 (:foreground gruvbox-faded_yellow)) + + ;; mu4e + (mu4e-header-key-face (:foreground gruvbox-bright_green :weight 'bold )) + (mu4e-unread-face (:foreground gruvbox-bright_blue :weight 'bold )) + (mu4e-highlight-face (:foreground gruvbox-neutral_green)) + + ;; MODE SUPPORT: dired+ + (diredp-file-name (:foreground gruvbox-light2)) + (diredp-file-suffix (:foreground gruvbox-light4)) + (diredp-compressed-file-suffix (:foreground gruvbox-faded_blue)) + (diredp-dir-name (:foreground gruvbox-faded_blue)) + (diredp-dir-heading (:foreground gruvbox-bright_blue)) + (diredp-symlink (:foreground gruvbox-bright_orange)) + (diredp-date-time (:foreground gruvbox-light3)) + (diredp-number (:foreground gruvbox-faded_blue)) + (diredp-no-priv (:foreground gruvbox-dark4)) + (diredp-other-priv (:foreground gruvbox-dark2)) + (diredp-rare-priv (:foreground gruvbox-dark4)) + (diredp-ignored-file-name (:foreground gruvbox-dark4)) + + (diredp-dir-priv (:foreground gruvbox-faded_blue :background gruvbox-dark_blue)) + (diredp-exec-priv (:foreground gruvbox-faded_blue :background gruvbox-dark_blue)) + (diredp-link-priv (:foreground gruvbox-faded_aqua :background gruvbox-dark_aqua)) + (diredp-read-priv (:foreground gruvbox-bright_red :background gruvbox-dark_red)) + (diredp-write-priv (:foreground gruvbox-bright_aqua :background gruvbox-dark_aqua))) + ,@body)) + +(provide 'gruvbox) + ;; Local Variables: ;; eval: (when (fboundp 'rainbow-mode) (rainbow-mode +1)) ;; End: @@ -77,4 +411,3 @@ Valid options are \"soft\", \"medium\" and \"hard\"" ;;; gruvbox-dark-theme.el ends here -(provide 'gruvbox)