Polish/refactor doom-one theme
This commit is contained in:
Henrik Lissner
parent
739f4ef919
commit
44bd8a8956
1 changed files with 62 additions and 60 deletions
|
|
@ -8,15 +8,6 @@
|
|||
(bold doom-enable-bold)
|
||||
(italic doom-enable-italic)
|
||||
|
||||
(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")
|
||||
|
|
@ -30,7 +21,7 @@
|
|||
(magenta "#DC79DC")
|
||||
(violet "#9C91E4")
|
||||
(violet-d "#7C71C4")
|
||||
(cyan "#00b8c3")
|
||||
(cyan "#46D9FF")
|
||||
(cyan-d "#8FA1B3")
|
||||
(blue "#00B3EF")
|
||||
(blue-l "#40D3FF")
|
||||
|
|
@ -38,40 +29,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")
|
||||
;; elements
|
||||
(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 black)
|
||||
(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))
|
||||
|
|
@ -86,60 +82,61 @@
|
|||
`(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
|
||||
;; 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 :foreground ,comments))))
|
||||
`(region ((,c (:background ,selection :foreground ,white))))
|
||||
`(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 ,orange))))
|
||||
`(match ((,c (:foreground ,magenta :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))))
|
||||
`(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-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 warning :bold ,bold))))
|
||||
`(mode-line-vcs-warning ((,c (:inherit error :bold ,bold))))
|
||||
;; Search
|
||||
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
|
||||
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
|
||||
|
|
@ -148,6 +145,11 @@
|
|||
;; Plugins
|
||||
;;
|
||||
|
||||
;; 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))))
|
||||
;; hide-show
|
||||
`(hs-face ((,c (:foreground ,comments :background ,black))))
|
||||
`(hs-fringe-face ((,c (:foreground ,blue))))
|
||||
|
|
@ -196,8 +198,8 @@
|
|||
`(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-ex-substitute-replacement ((,c (:inherit match))))
|
||||
`(evil-search-highlight-persist-highlight-face ((,c (:inherit isearch-lazy-highlight-face))))
|
||||
;; evil-snipe
|
||||
`(evil-snipe-first-match-face ((,c (:foreground ,search-fg :background ,search-bg))))
|
||||
`(evil-snipe-matches-face ((,c (:foreground ,search-bg :underline t))))
|
||||
|
|
@ -218,11 +220,11 @@
|
|||
`(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-match ((,c (:foreground ,magenta :bold ,bold))))
|
||||
`(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))))
|
||||
|
|
@ -231,10 +233,10 @@
|
|||
`(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))))
|
||||
`(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))))
|
||||
;; which-key
|
||||
`(which-key-key-face ((,c (:foreground ,green))))
|
||||
`(which-key-group-description-face ((,c (:foreground ,violet))))
|
||||
|
|
@ -261,7 +263,7 @@
|
|||
`(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))))
|
||||
|
|
@ -289,8 +291,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))))
|
||||
|
|
@ -310,7 +312,7 @@
|
|||
`(org-date ((,c (:foreground ,violet))))
|
||||
`(org-todo ((,c (:foreground ,yellow :bold inherit))))
|
||||
`(org-done ((,c (:foreground ,green :bold inherit))))
|
||||
`(org-headline-done ((,c (:foreground ,grey-l :bold nil :strike-through t))))
|
||||
`(org-headline-done ((,c (:foreground ,grey-l :bold nil :strike-through t))))
|
||||
`(org-special-keyword ((,c (:foreground ,magenta))))
|
||||
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
|
||||
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue