diff --git a/lychee-theme.el b/lychee-theme.el index c8e8c00..713548c 100644 --- a/lychee-theme.el +++ b/lychee-theme.el @@ -27,342 +27,340 @@ (deftheme lychee "chee -- i love you and colours") (defvar lychee/colors '(("background" . "#f9fcff") - ("foreground" . "#086F8A") - ("hot" . "#ee046f") - ("subtle" . "#bbccdd") - ("subtle2" . "#8899aa") - ("mint" . "#205B46") - ("lymint" . "#96E8CB") - ("uhoh" . "#F12D00") - ("wishy" . "#333333") - ("function" . "#DB4E80") - ("type" . "#0CADD6") - ("variable" . "#E85B3A") - ("myeyes" . "#9E3430") - ("sky" . "#3999FF")) + ("foreground" . "#086F8A") + ("hot" . "#ee046f") + ("subtle" . "#bbccdd") + ("subtle2" . "#8899aa") + ("mint" . "#205B46") + ("lymint" . "#96E8CB") + ("uhoh" . "#F12D00") + ("wishy" . "#333333") + ("function" . "#DB4E80") + ("type" . "#0CADD6") + ("variable" . "#E85B3A") + ("myeyes" . "#9E3430") + ("sky" . "#3999FF")) "colours for lychee-theme") ;; thanks to bbatsov for this macro (defmacro lychee/with-colors (&rest body) "lets bind colors" (declare (indent 0)) `(let ((class '((class color) (min-colors 89))) - ,@(mapcar (lambda (cons) - (list (intern (car cons)) (cdr cons))) - lychee/colors)) + ,@(mapcar (lambda (cons) + (list (intern (car cons)) (cdr cons))) + lychee/colors)) ,@body)) - (lychee/with-colors (custom-theme-set-faces - 'lychee - `(default - ((t (:foreground ,foreground - :background ,background)))) + 'lychee + `(default + ((t (:foreground ,foreground + :background ,background)))) + + `(cursor + ((t (:foreground "white" :background ,hot)))) - `(cursor - ((t (:foreground "white" :background ,hot)))) + `(font-lock-builtin-face + ((t (:foreground ,hot)))) - `(font-lock-builtin-face - ((t (:foreground ,hot)))) + `(font-lock-comment-delimiter-face + ((t (:foreground ,subtle2)))) - `(font-lock-comment-delimiter-face - ((t (:foreground ,subtle2)))) + `(font-lock-comment-face + ((t (:foreground ,subtle2 + :slant italic)))) - `(font-lock-comment-face - ((t (:foreground ,subtle2 - :slant italic)))) + `(font-lock-constant-face + ((t (:foreground ,wishy)))) - `(font-lock-constant-face - ((t (:foreground ,wishy)))) + `(font-lock-doc-face + ((t (:foreground ,wishy + :slant italic)))) - `(font-lock-doc-face - ((t (:foreground ,wishy - :slant italic)))) + `(font-lock-function-name-face + ((t (:foreground ,function)))) - `(font-lock-function-name-face - ((t (:foreground ,function)))) + `(font-lock-keyword-face + ((t (:foreground ,myeyes)))) - `(font-lock-keyword-face - ((t (:foreground ,myeyes)))) + `(font-lock-negation-char-face + ((t (:foreground ,uhoh)))) - `(font-lock-negation-char-face - ((t (:foreground ,uhoh)))) + `(font-lock-preprocessor-face + ((t (:foreground ,sky)))) - `(font-lock-preprocessor-face - ((t (:foreground ,sky)))) + `(font-lock-string-face + ((t (:foreground ,mint + :background ,lymint)))) - `(font-lock-string-face - ((t (:foreground ,mint - :background ,lymint)))) + `(font-lock-type-face + ((t (:foreground ,type)))) - `(font-lock-type-face - ((t (:foreground ,type)))) + `(font-lock-variable-name-face + ((t (:foreground ,variable)))) - `(font-lock-variable-name-face - ((t (:foreground ,variable)))) + `(font-lock-warning-face + ((t (:foreground ,uhoh)))) - `(font-lock-warning-face - ((t (:foreground ,uhoh)))) + `(fringe + ((t (:background ,background)))) - `(fringe - ((t (:background ,background)))) + '(header-line + ((t (:background "#303636" + :foreground "#eee")))) - '(header-line - ((t (:background "#303636" - :foreground "#eee")))) + `(mode-line + ((t (:inherit 'fringe + :foreground "#ccc" + :background ,subtle2 + :box ,subtle)))) - `(mode-line - ((t (:inherit 'fringe - :foreground "#ccc" - :background ,subtle2 - :box ,subtle)))) + '(mode-line-inactive + ((t (:inherit 'mode-line + :box nil)))) - '(mode-line-inactive - ((t (:inherit 'mode-line - :box nil)))) + '(mode-line-highlight + ((t (:box "#abb4a1" + :background "#012")))) - '(mode-line-highlight - ((t (:box "#abb4a1" - :background "#012")))) + `(mode-line-buffer-id + ((t (:foreground ,hot)))) - `(mode-line-buffer-id - ((t (:foreground ,hot)))) + `(show-paren-match + ((t (:background ,foreground + :foreground ,background)))) - `(show-paren-match - ((t (:background ,foreground - :foreground ,background)))) + '(show-paren-mismatch + ((t (:background "#FA2573")))) - '(show-paren-mismatch - ((t (:background "#FA2573")))) + `(minibuffer-prompt + ((t (:foreground ,hot)))) - `(minibuffer-prompt - ((t (:foreground ,hot)))) + `(highlight + ((t (:background ,subtle)))) - `(highlight - ((t (:background ,subtle)))) + `(hl-line + ((t (:background ,subtle)))) - `(hl-line - ((t (:background ,subtle)))) + `(linum + ((t (:inherit (shadow default background) + :foreground ,subtle2 + :slant oblique + :height 0.94)))) - `(linum - ((t (:inherit (shadow default background) - :foreground ,subtle2 - :slant oblique - :height 0.94)))) + `(region + ((t (:background ,hot)))) - `(region - ((t (:background ,hot)))) + '(trailing-whitespace + ((t (:background "#571C0E" + :foreground "#331C10" )))) - '(trailing-whitespace - ((t (:background "#571C0E" - :foreground "#331C10" )))) + ;; + ;; ISearch + ;; + `(isearch + ((t (:background ,foreground + :box "white")))) - ;; - ;; ISearch - ;; - `(isearch - ((t (:background ,foreground - :box "white")))) + `(isearch-fail + ((t (:background "#382323" + :foreground ,uhoh)))) - `(isearch-fail - ((t (:background "#382323" - :foreground ,uhoh)))) + ;; + ;; Twittering mode + ;; + '(twittering-uri-face + ((t (:foreground "#729FCF")))) - ;; - ;; Twittering mode - ;; - '(twittering-uri-face - ((t (:foreground "#729FCF")))) + '(twittering-username-face + ((t (:foreground "#FC951E")))) - '(twittering-username-face - ((t (:foreground "#FC951E")))) + ;; + ;; Usual UI stuffs + ;; + `(widget-field + ((t (:background ,foreground + :foreground "white")))) - ;; - ;; Usual UI stuffs - ;; - `(widget-field - ((t (:background ,foreground - :foreground "white")))) + '(custom-group-tag-face + ((t (:foreground "#67D9F0" + :height 1.2)))) - '(custom-group-tag-face - ((t (:foreground "#67D9F0" - :height 1.2)))) + '(custom-variable-tag-face + ((t (:foreground "#729FCF")))) - '(custom-variable-tag-face - ((t (:foreground "#729FCF")))) + '(custom-state-face + ((t (:foreground "#A6E32D")))) - '(custom-state-face - ((t (:foreground "#A6E32D")))) + '(link + ((t (:foreground "#729FCF" + :underline nil)))) - '(link - ((t (:foreground "#729FCF" - :underline nil)))) + ;; + ;; JS2 stuff + ;; + `(js2-function-param-face + ((t (:foreground ,variable)))) - ;; - ;; JS2 stuff - ;; - `(js2-function-param-face - ((t (:foreground ,variable)))) + '(js3-function-param-face + ((t (:inherit 'js2-function-param-face)))) - '(js3-function-param-face - ((t (:inherit 'js2-function-param-face)))) + ;; + ;; Diff + ;; + '(diff-added + ((t (:foreground "#A6E32D")))) + + '(ediff-odd-diff-C + ((t (:background "#A6E32D")))) - ;; - ;; Diff - ;; - '(diff-added - ((t (:foreground "#A6E32D")))) - - '(diff-changed - ((t (:foreground "#67D9F0")))) + '(diff-changed + ((t (:foreground "#67D9F0")))) - '(diff-removed - ((t (:foreground "#FA2573")))) + '(ediff-even-diff-C + ((t (:background "#FA2573")))) - '(diff-header - ((t (:background "#555753")))) + '(diff-header + ((t (:background "#555753")))) - '(diff-file-header - ((t (:background "#555753" )))) + '(diff-file-header + ((t (:background "#555753" )))) - '(diff-context - ((t (:foreground "#EEEEEE")))) + '(diff-context + ((t (:foreground "#EEEEEE")))) - ;; - ;; Whitespace mode - ;; - `(whitespace-indentation - ((t (:background ,background - :foreground "#82996A")))) - - `(whitespace-line - ((t (:background ,background - :foreground "#7A6D89")))) - - `(whitespace-newline - ((t (:foreground ,background - :weight normal)))) - - `(whitespace-space - ((t (:background ,background - :foreground ,background)))) - - `(whitespace-tab - ((t (:background ,background - :foreground ,background)))) - - '(whitespace-space-after-tab - ((t (:background "#303636" - :foreground "#82996A")))) - - '(whitespace-space-before-tab - ((t (:background "#382323" - :foreground "#82996A")))) - - '(whitespace-trailing - ((t (:inherit 'trailing-whitespace)))) - - '(whitespace-empty - ((t (:background "#382323" - :foreground "#624935")))) - - '(whitespace-hspace - ((t (:background "#382323" - :foreground "#82996A")))) - - ;; - ;; Flyspell stuff - ;; - '(flyspell-duplicate - ((t (:background "#382323" - :underline "#FC951E")))) - - '(flyspell-incorrect - ((t (:background "#382323" - :underline "#E52222")))) - - ;; - ;; ERC - ;; - '(erc-notice-face - ((t (:foreground "#75766A")))) - - '(erc-current-nick-face - ((t (:foreground "#FA2573")))) - - '(erc-input-face - ((t (:foreground "#ABB4A1")))) - - '(erc-nick-default-face - ((t (:foreground "#729FCF")))) - - '(erc-prompt-face - ((t (:foreground "#FC951E" - :background nil)))) - - '(erc-timestamp-face - ((t (:foreground "#75766A")))) - - ;; - ;; ReStructuredText - ;; - '(rst-level-1-face - ((t (:foreground "#729FCF" - :background nil)))) - - '(rst-level-2-face - ((t (:inherit 'rst-level-1-face)))) - - '(rst-level-3-face - ((t (:inherit 'rst-level-2-face)))) - - '(rst-level-4-face - ((t (:inherit 'rst-level-3-face)))) - - '(rst-level-5-face - ((t (:inherit 'rst-level-4-face)))) - - '(rst-level-6-face - ((t (:inherit 'rst-level-5-face)))) - - ;; - ;; Outline - ;; - '(outline-1 - ((t (:foreground "#437BA5")))) - '(outline-2 - ((t (:foreground "#729bb6")))) - '(outline-3 - ((t (:foreground "#a2bcc8")))) - '(outline-4 - ((t (:foreground "#d1dcd9")))) - '(outline-5 - ((t (:foreground "#437ba5")))) - '(outline-6 - ((t (:foreground "#729bb6")))) - '(outline-7 - ((t (:foreground "#a2bcc8")))) - '(outline-8 - ((t (:foreground "#d1dcd9")))) - - ;; - ;; ORG Mode - ;; - '(org-hide - ((t (:foreground "#303636")))) - '(org-special-keyword - ((t (:inherit 'font-lock-type-face)))) - - ;; - ;; Perspective mode - ;; - '(persp-selected-face - ((t (:foreground "#eeeeee" - :background "#382323" - :box "#382323")))) - ;; - ;; Yasnippet - ;; - '(yas/field-highlight-face - ((t (:background "#586045" - :box "#ACAE95")))))) + ;; + ;; Whitespace mode + ;; + `(whitespace-indentation + ((t (:background ,background + :foreground "#82996A")))) + + `(whitespace-line + ((t (:background ,background + :foreground "#7A6D89")))) + + `(whitespace-newline + ((t (:foreground ,background + :weight normal)))) + + `(whitespace-space + ((t (:background ,background + :foreground ,background)))) + + `(whitespace-tab + ((t (:background ,background + :foreground ,background)))) + + '(whitespace-space-after-tab + ((t (:background "#303636" + :foreground "#82996A")))) + + '(whitespace-space-before-tab + ((t (:background "#382323" + :foreground "#82996A")))) + + '(whitespace-trailing + ((t (:inherit 'trailing-whitespace)))) + + '(whitespace-empty + ((t (:background "#382323" + :foreground "#624935")))) + + '(whitespace-hspace + ((t (:background "#382323" + :foreground "#82996A")))) + + ;; + ;; Flyspell stuff + ;; + '(flyspell-duplicate + ((t (:background "#382323" + :underline "#FC951E")))) + + '(flyspell-incorrect + ((t (:background "#382323" + :underline "#E52222")))) + + ;; + ;; ERC + ;; + '(erc-notice-face + ((t (:foreground "#75766A")))) + + '(erc-current-nick-face + ((t (:foreground "#FA2573")))) + + '(erc-input-face + ((t (:foreground "#ABB4A1")))) + + '(erc-nick-default-face + ((t (:foreground "#729FCF")))) + + '(erc-prompt-face + ((t (:foreground "#FC951E" + :background nil)))) + + '(erc-timestamp-face + ((t (:foreground "#75766A")))) + + ;; + ;; ReStructuredText + ;; + '(rst-level-1-face + ((t (:foreground "#729FCF" + :background nil)))) + + '(rst-level-2-face + ((t (:inherit 'rst-level-1-face)))) + + '(rst-level-3-face + ((t (:inherit 'rst-level-2-face)))) + + '(rst-level-4-face + ((t (:inherit 'rst-level-3-face)))) + + '(rst-level-5-face + ((t (:inherit 'rst-level-4-face)))) + + '(rst-level-6-face + ((t (:inherit 'rst-level-5-face)))) + + ;; org/outline + '(outline-1 + ((t (:foreground "#033B65")))) + '(outline-2 + ((t (:foreground "#225b86")))) + '(outline-3 + ((t (:foreground "#427ca8")))) + '(outline-4 + ((t (:foreground "#6f9dc7")))) + '(outline-5 + ((t (:foreground "#8fbfef")))) + '(outline-6 + ((t (:foreground "#6090c0")))) + '(outline-7 + ((t (:foreground "#427ba6")))) + '(outline-8 + ((t (:foreground "#235b85")))) + + '(org-hide + ((t (:foreground "#303636")))) + '(org-special-keyword + ((t (:inherit 'font-lock-type-face)))) + + ;; + ;; Perspective mode + ;; + '(persp-selected-face + ((t (:foreground "#eeeeee" + :background "#382323" + :box "#382323")))) + + ;; + ;; Yasnippet + ;; + '(yas/field-highlight-face + ((t (:background "#586045" + :box "#ACAE95"))))))