Update doom-one-theme

This commit is contained in:
Henrik Lissner 2016-05-26 18:43:57 -04:00
parent 56e6a3289a
commit f14f427744

View file

@ -16,10 +16,10 @@
(doom-name-to-rgb color2))))
(defun doom-darken (color alpha)
(doom-blend color "#000000" alpha))
(doom-blend color "#000000" (- 1 alpha)))
(defun doom-lighten (color alpha)
(doom-blend color "#FFFFFF" alpha))
(doom-blend color "#FFFFFF" (- 1 alpha)))
(when (display-graphic-p)
@ -27,10 +27,6 @@
"Face for source code windows."
:group 'doom)
(defface doom-fringe '((t (:inherit doom-default)))
"Face for source code window fringes."
:group 'doom)
(defface doom-minibuffer-active '((t (:inherit mode-line)))
"Face for active minibuffer. See `doom-enable-bright-minibuffer'."
:group 'doom)
@ -66,15 +62,6 @@
(bold t)
(italic t)
(bg "#262c34")
(bg-d "#1f252b")
(bg-l "#2b323a")
(fg "#d5dae0")
(subtle "#aab6c7")
(vsubtle "#556172")
(vvsubtle "#354152")
(dim-highlight "#3f4b56")
(black "#141a22")
(white "#FFFFFF")
(grey "#C0C5CF")
@ -88,7 +75,7 @@
(magenta "#DC79DC")
(violet "#9C91E4")
(violet-d "#7C71C4")
(cyan "#00b8c3")
(cyan "#46D9FF")
(cyan-d "#8FA1B3")
(blue "#00B3EF")
(blue-l "#40D3FF")
@ -96,40 +83,45 @@
(green "#7bc275")
(green-d "#86B20E"))
(let* ((search-bg green)
(search-fg black)
(search-rest-bg violet)
(search-rest-fg black)
(let* ((bg "#262c34")
(bg-l "#2b323a")
(bg-d "#1f252b")
(fg "#d5dae0")
(highlight blue)
(vertical-bar black)
(current-line bg-d)
(selection blue-d)
(builtin magenta)
(comments grey-l)
(comments-l "#7F7F8A")
(doc-comments "#7F7F8A")
(constants green)
(delimiters violet)
(functions blue-l)
(functions cyan)
(keywords blue)
(methods cyan-d)
(operators magenta)
(type yellow)
(strings green)
(variables cyan)
;; main search regions
(search-bg blue)
(search-fg black)
;; other search regions
(search-rest-bg grey-d)
(search-rest-fg blue)
;; line number column
(linum-bg bg-d)
(linum-fg "#465263")
(linum-fg (doom-darken cyan-d 0.55))
(linum-hl-fg blue)
(linum-hl-bg bg-d)
;; mode line
(modeline-fg white)
(modeline-fg-2 blue-l)
(modeline-fg-3 blue)
(modeline-fg-l blue)
(modeline-bg bg-d)
(modeline-bg-hl bg-d)
(modeline-fg-inactive grey-l)
(modeline-bg-inactive grey-dd)
;; vcs
(vc-modified yellow-d)
(vc-added green)
(vc-deleted red))
@ -140,104 +132,79 @@
`(doom-default ((,c (:inherit default :background ,bg))))
`(doom-minibuffer-active ((,c (:background ,bg))))
`(doom-linum ((,c (:inherit linum :background ,bg))))
`(doom-nlinum-highlight ((,c (:inherit linum :foreground ,linum-hl-fg :background ,current-line))))
`(doom-nlinum-highlight ((,c (:background ,current-line :foreground ,linum-hl-fg :bold nil))))
`(doom-flycheck-error ((,c (:underline nil :foreground ,black :background ,red))))
`(doom-flycheck-warning ((,c (:underline nil :foreground ,black :background ,yellow))))
`(doom-flycheck-info ((,c (:underline nil :foreground ,black :background ,green))))
;; Text
`(default ((,c (:background ,bg-d :foreground ,fg))))
`(fringe ((,c (:inherit doom-default :foreground ,comments))))
`(region ((,c (:background ,selection :foreground ,white))))
`(highlight ((,c (:background ,blue :foreground ,black))))
;; Base
`(bold ((,c (:weight ,(if bold 'bold 'normal)))))
`(italic ((,c (:slant ,(if italic 'italic 'normal)))))
`(bold-italic ((,c (:weight ,(if bold 'bold 'normal) :slant ,(if italic 'italic 'normal) :foreground ,white))))
;; Global
`(default ((,c (:background ,bg-d :foreground ,fg))))
`(fringe ((,c (:inherit doom-default))))
`(region ((,c (:background ,blue-d :bold ,bold))))
`(highlight ((,c (:background ,blue :foreground ,black))))
`(hl-line ((,c (:background ,current-line))))
`(cursor ((,c (:background ,white))))
`(shadow ((,c (:foreground ,cyan))))
`(shadow ((,c (:foreground ,violet))))
`(minibuffer-prompt ((,c (:foreground ,blue))))
`(tooltip ((,c (:background ,black :foreground ,fg))))
`(error ((,c (:foreground ,red))))
`(warning ((,c (:foreground ,yellow))))
`(success ((,c (:foreground ,green))))
;; `(secondary-selection ((,c (:background ,orange))))
;; `(lazy-highlight ((,c (:background ,orange))))
;; `(match ((,c (:background ,magenta))))
`(bold ((,c (:weight bold :foreground ,white))))
`(italic ((,c (:slant italic :foreground ,subtle))))
`(bold-italic ((,c (:weight bold :slant italic :foreground ,white))))
`(trailing-whitespace ((,c (:background "#884444"))))
`(whitespace-tab ((,c (:foreground ,grey-d))))
`(whitespace-newline ((,c (:foreground ,grey-d))))
`(whitespace-trailing ((,c (:background ,grey-d))))
;;`(secondary-selection ((,c (:background ,orange))))
`(lazy-highlight ((,c (:background ,blue-d))))
`(match ((,c (:foreground ,green :background ,black :bold ,bold))))
`(trailing-whitespace ((,c (:background ,doc-comments))))
`(vertical-border ((,c (:foreground ,vertical-bar :background ,vertical-bar))))
`(show-paren-match ((,c (:foreground ,magenta :inverse-video t))))
`(linum ((,c (:foreground ,linum-fg :background ,bg-d :bold nil))))
`(show-paren-match ((,c (:foreground ,blue :inverse-video t))))
`(linum ((,c (:background ,bg-d :foreground ,linum-fg :bold nil))))
`(font-lock-builtin-face ((,c (:foreground ,builtin))))
`(font-lock-comment-face ((,c (:foreground ,comments))))
`(font-lock-comment-delimiter-face ((,c (:foreground ,comments))))
`(font-lock-doc-face ((,c (:foreground ,comments-l))))
`(font-lock-doc-string-face ((,c (:foreground ,comments-l))))
`(font-lock-doc-face ((,c (:foreground ,doc-comments))))
`(font-lock-doc-string-face ((,c (:foreground ,doc-comments))))
`(font-lock-constant-face ((,c (:foreground ,constants))))
`(font-lock-function-name-face ((,c (:foreground ,functions))))
`(font-lock-keyword-face ((,c (:foreground ,keywords))))
`(font-lock-string-face ((,c (:foreground ,strings))))
`(font-lock-type-face ((,c (:foreground ,type))))
`(font-lock-variable-name-face ((,c (:foreground ,variables))))
`(font-lock-warning-face ((,c (:foreground ,red))))
`(font-lock-negation-char-face ((,c (:foreground ,operators :bold t))))
`(font-lock-preprocessor-char-face ((,c (:foreground ,operators :bold t))))
`(font-lock-regexp-grouping-backslash ((,c (:foreground ,operators :bold t))))
`(font-lock-regexp-grouping-construct ((,c (:foreground ,operators :bold t))))
`(font-lock-warning-face ((,c (:inherit warning))))
`(font-lock-negation-char-face ((,c (:foreground ,operators :bold ,bold))))
`(font-lock-preprocessor-char-face ((,c (:foreground ,operators :bold ,bold))))
`(font-lock-regexp-grouping-backslash ((,c (:foreground ,operators :bold ,bold))))
`(font-lock-regexp-grouping-construct ((,c (:foreground ,operators :bold ,bold))))
;; Modeline
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
`(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
`(mode-line-is-modified ((,c (:foreground ,red :bold t))))
`(mode-line-buffer-file ((,c (:foreground ,modeline-fg :bold t))))
`(mode-line-buffer-path ((,c (:foreground ,modeline-fg-2))))
`(mode-line-count-face ((,c (:foreground ,black :background ,blue))))
`(spaceline-highlight-face ((,c (:foreground ,black :background ,yellow))))
`(powerline-active1 ((,c (:foreground ,modeline-fg-2 :background ,modeline-bg))))
`(powerline-active2 ((,c (:foreground ,modeline-fg-3 :background ,modeline-bg))))
`(powerline-active1 ((,c (:foreground ,modeline-fg-l :background ,modeline-bg))))
`(powerline-active2 ((,c (:foreground ,modeline-fg-l :background ,modeline-bg))))
`(powerline-inactive1 ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
`(powerline-inactive2 ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
;; Custom modeline faces
`(mode-line-is-modified ((,c (:foreground ,red :bold ,bold))))
`(mode-line-buffer-file ((,c (:foreground ,modeline-fg :bold ,bold))))
`(mode-line-buffer-path ((,c (:foreground ,modeline-fg-l))))
`(mode-line-count-face ((,c (:foreground ,black :background ,modeline-fg-l))))
`(mode-line-vcs-info ((,c (:inherit success))))
`(mode-line-vcs-warning ((,c (:inherit error))))
;; Search
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
`(isearch ((,c (:foreground ,search-bg :inverse-video t))))
`(isearch-lazy-highlight-face ((,c (:background ,search-rest-bg))))
`(yas-field-highlight-face ((,c (:inherit match))))
;;
;; Plugins
;;
;; hide-show
`(hs-face ((,c (:foreground ,comments :background ,black))))
`(hs-fringe-face ((,c (:foreground ,blue))))
;; flycheck
`(flycheck-error ((,c (:underline (:style wave :color ,red) :background ,bg-d))))
`(flycheck-warning ((,c (:underline (:style wave :color ,yellow) :background ,bg-d))))
`(flycheck-info ((,c (:underline (:style wave :color ,green) :background ,bg-d))))
`(flyspell-incorrect ((,c (:underline (:style wave :color ,red) :inherit unspecified))))
;; indent-guide, highlight-{quoted,numbers,indentation}-mode
`(indent-guide-face ((,c (:foreground "#2F2F38"))))
`(highlight-indentation-face ((,c (:background "#222830"))))
`(highlight-indentation-current-column-face ((,c (:background "#222830"))))
`(highlight-indentation-guides-odd-face ((,c (:background ,bg))))
`(highlight-indentation-guides-even-face ((,c (:background "#222830"))))
`(highlight-quoted-symbol ((,c (:foreground ,type))))
`(highlight-quoted-quote ((,c (:foreground ,operators))))
`(highlight-numbers-number ((,c (:foreground ,constants))))
;; re-builder
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
`(reb-match-3 ((,c (:foreground ,yellow :inverse-video t))))
;; workgroups2
`(wg-current-workgroup-face ((,c (:foreground ,black :background ,blue))))
`(wg-other-workgroup-face ((,c (:foreground ,grey-l :background ,current-line))))
`(wg-divider-face ((,c (:foreground ,grey-d))))
`(wg-brace-face ((,c (:foreground ,blue))))
;; neotree
`(neo-root-dir-face ((,c (:foreground ,green))))
`(neo-file-link-face ((,c (:foreground ,fg))))
`(neo-dir-link-face ((,c (:foreground ,blue))))
`(neo-expand-btn-face ((,c (:foreground ,blue))))
;; Avy
`(avy-lead-face-0 ((,c (:background ,search-bg :foreground ,search-fg))))
`(avy-lead-face-1 ((,c (:background ,search-bg :foreground ,search-fg))))
`(avy-lead-face-2 ((,c (:background ,search-bg :foreground ,search-fg))))
`(avy-lead-face ((,c (:background ,search-bg :foreground ,search-fg))))
;; company-mode
`(company-tooltip ((,c (:inherit tooltip))))
`(company-tooltip-common ((,c (:foreground ,blue))))
@ -250,54 +217,91 @@
`(company-preview ((,c (:foreground ,blue))))
`(company-preview-common ((,c (:foreground ,magenta :background ,grey-d))))
`(company-preview-search ((,c (:inherit company-tooltip-search))))
;; pos-tip
`(popup ((,c (:inherit tooltip))))
`(popup-tip-face ((,c (:inherit tooltip))))
;; evil-mode
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold ,bold))))
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
;; evil-snipe
`(evil-snipe-first-match-face ((,c (:foreground ,search-fg :background ,search-bg))))
`(evil-snipe-matches-face ((,c (:foreground ,search-bg :underline t))))
;; Volatile highlights
`(vhl/default-face ((,c (:background ,grey-d))))
;; VCS
;; diff-hl
`(diff-hl-change ((,c (:foreground ,vc-modified))))
`(diff-hl-delete ((,c (:foreground ,vc-deleted))))
`(diff-hl-insert ((,c (:foreground ,vc-added))))
;; evil-mode
`(evil-ex-substitute-matches ((,c (:background ,black :foreground ,red :strike-through t :bold ,bold))))
`(evil-ex-substitute-replacement ((,c (:background ,black :foreground ,green :bold ,bold))))
`(evil-search-highlight-persist-highlight-face ((,c (:inherit isearch-lazy-highlight-face))))
;; evil-snipe
`(evil-snipe-first-match-face ((,c (:foreground ,search-bg :background ,blue-d))))
`(evil-snipe-matches-face ((,c (:foreground ,search-bg :underline t :bold ,bold))))
;; flycheck
`(flycheck-error ((,c (:underline (:style wave :color ,red) :background ,bg-d))))
`(flycheck-warning ((,c (:underline (:style wave :color ,yellow) :background ,bg-d))))
`(flycheck-info ((,c (:underline (:style wave :color ,green) :background ,bg-d))))
`(flyspell-incorrect ((,c (:underline (:style wave :color ,red) :inherit unspecified))))
;; git-gutter
`(git-gutter:modified ((,c (:foreground ,vc-modified))))
`(git-gutter:added ((,c (:foreground ,vc-added))))
`(git-gutter:deleted ((,c (:foreground ,vc-deleted))))
`(git-gutter+-modified ((,c (:foreground ,vc-modified :background nil))))
`(git-gutter+-added ((,c (:foreground ,vc-added :background nil))))
`(git-gutter+-deleted ((,c (:foreground ,vc-deleted :background nil))))
`(git-gutter+-modified ((,c (:foreground ,vc-modified))))
`(git-gutter+-added ((,c (:foreground ,vc-added))))
`(git-gutter+-deleted ((,c (:foreground ,vc-deleted))))
;; Helm
`(helm-selection ((,c (:background ,selection))))
`(helm-match ((,c (:foreground ,blue :underline t))))
`(helm-source-header ((,c (:background ,current-line :foreground ,grey-l))))
`(helm-swoop-target-line-face ((,c (:foreground ,highlight :inverse-video t))))
`(helm-ff-file ((,c (:foreground ,fg))))
`(helm-ff-prefix ((,c (:foreground ,magenta))))
`(helm-ff-dotted-directory ((,c (:foreground ,grey-d))))
`(helm-ff-directory ((,c (:foreground ,orange))))
`(helm-ff-executable ((,c (:foreground ,white :slant italic))))
;; indent-guide, highlight-{quoted,numbers,indentation}-mode
`(indent-guide-face ((,c (:foreground "#2F2F38"))))
`(highlight-indentation-face ((,c (:background "#222830"))))
`(highlight-indentation-current-column-face ((,c (:background "#222830"))))
`(highlight-indentation-guides-odd-face ((,c (:background ,bg))))
`(highlight-indentation-guides-even-face ((,c (:background "#222830"))))
`(highlight-quoted-symbol ((,c (:foreground ,type))))
`(highlight-quoted-quote ((,c (:foreground ,operators))))
`(highlight-numbers-number ((,c (:foreground ,constants))))
;; hide-show
`(hs-face ((,c (:foreground ,comments :background ,black))))
`(hs-fringe-face ((,c (:foreground ,blue))))
;; iedit
`(iedit-occurrence ((,c (:foreground ,magenta :bold ,bold :inverse-video t))))
`(iedit-read-only-occurrence ((,c (:inherit region))))
;; neotree
`(neo-root-dir-face ((,c (:foreground ,green))))
`(neo-file-link-face ((,c (:foreground ,fg))))
`(neo-dir-link-face ((,c (:foreground ,blue))))
`(neo-expand-btn-face ((,c (:foreground ,blue))))
;; pos-tip
`(popup ((,c (:inherit tooltip))))
`(popup-tip-face ((,c (:inherit tooltip))))
;; Volatile highlights
`(vhl/default-face ((,c (:background ,grey-d))))
;; Rainbow delimiters
`(rainbow-delimiters-depth-1-face ((,c (:foreground ,blue))))
`(rainbow-delimiters-depth-2-face ((,c (:foreground ,magenta))))
`(rainbow-delimiters-depth-3-face ((,c (:foreground ,green))))
`(rainbow-delimiters-depth-4-face ((,c (:foreground ,orange))))
`(rainbow-delimiters-depth-5-face ((,c (:foreground ,orange))))
`(rainbow-delimiters-depth-5-face ((,c (:foreground ,violet))))
`(rainbow-delimiters-unmatched-face ((,c (:foreground ,red :inverse-video t))))
;; Helm
`(helm-selection ((,c (:background ,selection :foreground ,fg))))
`(helm-match ((,c (:foreground ,magenta :bold t))))
`(helm-source-header ((,c (:background ,current-line :foreground ,grey-l))))
`(helm-swoop-target-line-face ((,c (:foreground ,highlight :inverse-video t))))
`(helm-ff-file ((,c (:foreground ,fg))))
`(helm-ff-prefix ((,c (:foreground ,magenta))))
`(helm-ff-dotted-directory ((,c (:foreground ,grey-d))))
`(helm-ff-directory ((,c (:foreground ,orange))))
`(helm-ff-executable ((,c (:foreground ,white :slant italic))))
;; Avy
`(avy-lead-face-0 ((,c (:background ,highlight :foreground ,black))))
`(avy-lead-face-1 ((,c (:background ,highlight :foreground ,black))))
`(avy-lead-face-2 ((,c (:background ,highlight :foreground ,black))))
`(avy-lead-face ((,c (:background ,highlight :foreground ,black))))
;; re-builder
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
`(reb-match-3 ((,c (:foreground ,yellow :inverse-video t))))
;; which-key
`(which-key-key-face ((,c (:foreground ,green))))
`(which-key-group-description-face ((,c (:foreground ,violet))))
`(which-key-command-description-face ((,c (:foreground ,blue))))
`(which-key-local-map-description-face ((,c (:foreground ,magenta))))
;; whitespace
`(whitespace-tab ((,c (:foreground ,grey-d))))
`(whitespace-newline ((,c (:foreground ,grey-d))))
`(whitespace-trailing ((,c (:background ,grey-d))))
`(whitespace-line ((,c (:background ,current-line :foreground ,magenta))))
;; workgroups2
`(wg-current-workgroup-face ((,c (:foreground ,black :background ,blue))))
`(wg-other-workgroup-face ((,c (:foreground ,grey-l :background ,current-line))))
`(wg-divider-face ((,c (:foreground ,grey-d))))
`(wg-brace-face ((,c (:foreground ,blue))))
;;
;; Language-specific
@ -315,11 +319,11 @@
`(web-mode-html-tag-face ((,c (:foreground ,methods))))
`(web-mode-html-tag-bracket-face ((,c (:foreground ,methods))))
`(web-mode-html-attr-name-face ((,c (:foreground ,type))))
`(web-mode-html-entity-face ((,c (:foreground ,cyan :italic t))))
`(web-mode-html-entity-face ((,c (:foreground ,cyan :italic ,italic))))
`(web-mode-block-control-face ((,c (:foreground ,orange))))
;;`(web-mode-html-tag-bracket-face ((,c (:foreground ,operators))))
;; markdown-mode
`(markdown-header-face ((,c (:foreground ,blue :bold t))))
`(markdown-header-face ((,c (:foreground ,blue :bold ,bold))))
`(markdown-header-delimiter-face ((,c (:inherit markdown-header-face))))
`(markdown-blockquote-face ((,c (:foreground ,violet))))
`(markdown-markup-face ((,c (:foreground ,operators))))
@ -347,8 +351,8 @@
`(org-quote ((,c (:slant italic :foreground ,grey-l :background ,current-line))))
`(org-document-info ((,c (:foreground ,orange))))
`(org-document-info-keyword ((,c (:foreground ,grey-d))))
`(org-meta-line ((,c (:foreground ,vsubtle))))
`(org-block-begin-line ((,c (:background ,current-line :foreground ,vsubtle))))
`(org-meta-line ((,c (:foreground ,doc-comments))))
`(org-block-begin-line ((,c (:background ,current-line :foreground ,doc-comments))))
`(org-block-end-line ((,c (:inherit org-block-begin-line))))
`(org-block-background ((,c (:background ,current-line))))
`(org-archived ((,c (:foreground ,grey-l))))