Polish narf-dark-theme (major update)

This commit is contained in:
Henrik Lissner 2015-11-17 02:23:26 -05:00
parent f02b0a0284
commit 64c80af959

View file

@ -5,203 +5,241 @@
(custom-theme-set-variables 'narf-dark) (custom-theme-set-variables 'narf-dark)
(let* ((class '((class color))) (let* ((c '((class color)))
(background "#1E2021") (bg "#1E2021")
(foreground "#D6D6D4") (fg "#D6D6D4")
(subtle "#aab6c7") (subtle "#aab6c7")
(vsubtle "#556172") (vsubtle "#556172")
(vvsubtle "#354152") (vvsubtle "#354152")
(dim-highlight "#3f4b56") (dim-highlight "#3f4b56")
(black "#000000") (black "#000000")
(dark-grey "#525254") (grey "#C0C5CF")
(faded-grey "#36363A") (grey-.5 "#828284")
(grey "#C0C5CF") (grey-1 "#525254")
(white "#FFFFFF") (grey-2 "#36363A")
(off-white "#EAEADB") (white "#FFFFFF")
(yellow "#E2D770") (white-1 "#EAEADB")
(orange "#FD971F") (yellow "#E2C770")
(red "#DC322F") (orange "#FD971F")
(magenta "#F92672") (red "#e74c3c")
(violet "#6C71C4") (magenta "#F92672")
(blue "#268BD2") (violet "#9C91E4")
(steel-blue "#727280") (blue "#268BD2")
(cyan "#66D9EF") (blue+2 "#727280")
(green "#B6E23E") (cyan "#66D9EF")
(dark-cyan "#8fa1b3") (green "#B6E63E")
(light-cyan "#CBECFF") (green-3 "#86B20E")
(dark-cyan "#8fa1b3")
(light-cyan "#CBECFF")
(search-bg magenta) (search-bg magenta)
(search-fg black) (search-fg black)
(search-rest-bg orange) (search-rest-bg orange)
(search-rest-fg black) (search-rest-fg black)
(highlight orange) (highlight orange)
(vertical-bar black) (vertical-bar grey-2)
(current-line "#232526") (current-line "#232526")
(selection "#535556") (selection "#535556")
(builtin orange) (builtin orange)
(comments dark-grey) (comments grey-1)
(constants green) (constants green)
(delimiters "#c0c5ce") (delimiters "#c0c5ce")
(functions cyan) (functions cyan)
(keywords magenta) (keywords magenta)
(methods dark-cyan) (methods dark-cyan)
(operators grey) (operators grey)
(type cyan) (type cyan)
(strings green) (strings green)
(variables orange) (variables orange)
(error-highlight red) (error-highlight red)
(linum-bg current-line) (linum-bg current-line)
(linum-fg dark-grey) (linum-fg grey-1)
(linum-hl-fg orange) (linum-hl-fg orange)
(linum-hl-bg current-line) (linum-hl-bg current-line)
(modeline-fg white) (modeline-fg white)
(modeline-fg-2 orange) (modeline-fg-2 orange)
(modeline-fg-3 orange) (modeline-fg-3 orange)
(modeline-fg-inactive "#80858F") (modeline-fg-inactive "#80858F")
(modeline-bg-light faded-grey) (modeline-bg grey-2)
(modeline-bg-2 grey-2)
(modeline-bg-3 grey-2)
(modeline-bg-inactive black) (modeline-bg-inactive black)
(vc-modified "#55616A") (vc-modified grey-2)
(vc-added "#437f4b") (vc-added green-3)
(vc-deleted "#864253") (vc-deleted red))
)
(custom-theme-set-faces (custom-theme-set-faces
'narf-dark 'narf-dark
;; Text ;; Text
`(default ((,class (:foreground ,foreground :background ,background)))) `(default ((,c (:foreground ,fg :background ,bg))))
`(fringe ((,class (:background ,background :foreground ,magenta)))) `(fringe ((,c (:background ,bg :foreground ,grey-1))))
`(cursor ((,class (:background ,white)))) `(cursor ((,c (:background ,white))))
`(hl-line ((,class (:background ,current-line)))) `(hl-line ((,c (:background ,current-line))))
`(region ((,class (:foreground ,grey :inverse-video t)))) `(region ((,c (:background ,grey-2 :foreground ,white))))
`(highlight ((,class (:foreground ,yellow :inverse-video t)))) `(highlight ((,c (:foreground ,yellow :inverse-video t))))
`(shadow ((,c (:foreground ,cyan))))
;; `(secondary-selection ((,c (:background ,orange))))
;; `(lazy-highlight ((,c (:background ,orange))))
;; `(match ((,c (:background ,magenta))))
`(font-lock-builtin-face ((,class (:foreground ,builtin)))) `(error ((,c (:foreground ,red :bold t))))
`(font-lock-comment-delimiter-face ((,class (:foreground ,comments)))) `(warning ((,c (:foreground ,yellow :bold t))))
`(font-lock-comment-face ((,class (:foreground ,comments)))) `(success ((,c (:foreground ,green :bold t))))
`(font-lock-doc-face ((,class (:foreground ,steel-blue))))
`(font-lock-doc-string-face ((,class (:foreground ,steel-blue)))) `(hs-face ((,c (:foreground ,comments :background ,black))))
`(font-lock-constant-face ((,class (:foreground ,constants)))) `(hs-fringe-face ((,c (:foreground ,grey :background ,current-line))))
`(font-lock-function-name-face ((,class (:foreground ,functions))))
`(font-lock-keyword-face ((,class (:foreground ,keywords)))) `(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 ,blue+2))))
`(font-lock-doc-string-face ((,c (:foreground ,blue+2))))
`(font-lock-constant-face ((,c (:foreground ,constants))))
`(font-lock-function-name-face ((,c (:foreground ,functions))))
`(font-lock-keyword-face ((,c (:foreground ,keywords))))
;;`(font-lock-negation-char-face ((,class ()))) ;;`(font-lock-negation-char-face ((,class ())))
;;`(font-lock-preprocessor-char-face ((,class ()))) ;;`(font-lock-preprocessor-char-face ((,class ())))
;;`(font-lock-regexp-grouping-backslash ((,class ()))) ;;`(font-lock-regexp-grouping-backslash ((,class ())))
;;`(font-lock-regexp-grouping-construct ((,class ()))) ;;`(font-lock-regexp-grouping-construct ((,class ())))
`(font-lock-string-face ((,class (:foreground ,strings)))) `(font-lock-string-face ((,c (:foreground ,strings))))
`(font-lock-type-face ((,class (:foreground ,type)))) `(font-lock-type-face ((,c (:foreground ,type))))
`(font-lock-variable-name-face ((,class (:foreground ,variables)))) `(font-lock-variable-name-face ((,c (:foreground ,variables))))
`(font-lock-warning-face ((,class (:foreground ,red)))) `(font-lock-warning-face ((,c (:foreground ,red))))
`(bold ((,class (:weight bold :foreground ,white)))) `(bold ((,c (:weight bold :foreground ,white))))
`(italic ((,class (:slant italic :foreground ,subtle)))) `(italic ((,c (:slant italic :foreground ,subtle))))
`(bold-italic ((,class (:weight bold :slant italic :foreground ,white)))) `(bold-italic ((,c (:weight bold :slant italic :foreground ,white))))
`(trailing-whitespace ((,class (:background "#884444")))) `(trailing-whitespace ((,c (:background "#884444"))))
`(whitespace-tab ((,class (:foreground "#343d46")))) `(whitespace-tab ((,c (:foreground ,grey-2))))
`(whitespace-newline ((,class (:foreground "#343d46")))) `(whitespace-newline ((,c (:foreground ,grey-2))))
`(whitespace-trailing ((,class (:background "#553333")))) `(whitespace-trailing ((,c (:background ,grey-2))))
`(vertical-border ((,class (:foreground ,vertical-bar :background ,vertical-bar)))) `(vertical-border ((,c (:foreground ,vertical-bar :background ,vertical-bar))))
`(linum ((,class (:foreground ,linum-fg :bold nil)))) `(linum ((,c (:foreground ,linum-fg :bold nil :height 0.9))))
`(linum-highlight-face ((,class (:inherit linum :foreground ,linum-hl-fg)))) `(linum-highlight-face ((,c (:inherit linum :foreground ,linum-hl-fg))))
`(show-paren-match ((,class (:foreground ,highlight :weight ultra-bold :inverse-video t)))) `(show-paren-match ((,c (:foreground ,highlight :bold t :inverse-video t))))
;; Modeline ;; Modeline
`(mode-line ((,class (:foreground ,modeline-fg :background ,modeline-bg-light)))) `(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
`(mode-line-inactive ((,class (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive)))) `(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
`(mode-line-is-modified ((,class (:foreground ,highlight)))) `(mode-line-is-modified ((,c (:foreground ,magenta :bold t))))
`(mode-line-buffer-file ((,class (:foreground ,modeline-fg)))) `(mode-line-buffer-file ((,c (:foreground ,modeline-fg))))
`(powerline-active1 ((,class (:foreground ,modeline-fg-2)))) `(powerline-active1 ((,c (:foreground ,modeline-fg-2 :background ,modeline-bg-2))))
`(powerline-active2 ((,class (:foreground ,modeline-fg-3)))) `(powerline-active2 ((,c (:foreground ,modeline-fg-3 :background ,modeline-bg-3))))
`(powerline-inactive1 ((,class (:foreground ,modeline-fg-inactive)))) `(powerline-inactive1 ((,c (:foreground ,modeline-fg-inactive))))
`(powerline-inactive2 ((,class (:foreground ,modeline-fg-inactive)))) `(powerline-inactive2 ((,c (:foreground ,modeline-fg-inactive))))
`(spaceline-highlight-face ((,class (:foreground ,black :background ,highlight)))) `(spaceline-highlight-face ((,c (:foreground ,black :background ,highlight))))
`(mode-line-iedit-face ((,c (:foreground ,black :background ,magenta))))
`(mode-line-substitute-face ((,c (:foreground ,black :background ,yellow))))
;; Search ;; Search
`(isearch ((,class (:foreground ,search-fg :background ,search-bg)))) `(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
`(isearch-lazy-highlight-face ((,class (:foreground ,search-rest-fg :background ,search-rest-bg)))) `(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
`(narf-todo-face ((,class (:foreground ,yellow :bold t)))) `(narf-todo-face ((,c (:foreground ,yellow :bold t))))
`(narf-fixme-face ((,class (:foreground ,red :bold t)))) `(narf-fixme-face ((,c (:foreground ,red :bold t))))
`(narf-note-face ((,class (:foreground ,cyan :bold t)))) `(narf-note-face ((,c (:foreground ,cyan :bold t))))
`(evil-search-highlight-persist-highlight-face
((,class (:background ,search-rest-bg)))) `(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold t))))
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
;; plugin-specific ;; plugin-specific
;; ***************************************************************************************** ;; *****************************************************************************************
`(yascroll:thumb-fringe ((,class (:background ,orange)))) `(yascroll:thumb-fringe ((,c (:background ,grey-1 :foreground ,grey-1))))
`(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))))
;; neotree
`(neo-root-dir-face ((,c (:foreground ,cyan))))
`(neo-file-link-face ((,c (:foreground ,white))))
`(neo-dir-link-face ((,c (:foreground ,orange))))
`(neo-expand-btn-face ((,c (:foreground ,magenta))))
;; company-mode ;; company-mode
`(company-tooltip ((,class (:background ,black :foreground ,foreground)))) `(company-tooltip ((,c (:background ,black :foreground ,fg))))
`(company-tooltip-common ((,class (:foreground ,orange)))) `(company-tooltip-common ((,c (:foreground ,orange))))
`(company-tooltip-search ((,class (:foreground ,search-fg :background ,highlight)))) `(company-tooltip-search ((,c (:foreground ,search-fg :background ,highlight))))
`(company-tooltip-selection ((,class (:background ,selection)))) `(company-tooltip-selection ((,c (:background ,selection))))
`(company-tooltip-mouse ((,class (:background ,magenta :foreground ,background)))) `(company-tooltip-mouse ((,c (:background ,magenta :foreground ,bg))))
`(company-scrollbar-bg ((,class (:background ,black)))) `(company-scrollbar-bg ((,c (:background ,black))))
`(company-scrollbar-fg ((,class (:background ,orange)))) `(company-scrollbar-fg ((,c (:background ,orange))))
`(company-preview ((,class (:foreground ,orange)))) `(company-preview ((,c (:foreground ,orange))))
`(company-preview-common ((,class (:foreground ,magenta :background ,dark-grey)))) `(company-preview-common ((,c (:foreground ,magenta :background ,grey-1))))
`(company-preview-search ((,class (:inherit company-tooltip-search)))) `(company-preview-search ((,c (:inherit company-tooltip-search))))
`(popup ((,c (:inherit company-tooltip))))
`(popup-tip-face ((,c (:inherit company-tooltip))))
;; evil-snipe ;; evil-snipe
`(evil-snipe-first-match-face ((,class (:foreground ,search-fg :background ,search-bg)))) `(evil-snipe-first-match-face ((,c (:foreground ,search-fg :background ,search-bg))))
`(evil-snipe-matches-face ((,class (:foreground ,search-bg :underline t)))) `(evil-snipe-matches-face ((,c (:foreground ,search-bg :underline t))))
;; Volatile highlights ;; Volatile highlights
`(vhl/default-face ((,class (:background ,selection)))) `(vhl/default-face ((,c (:background ,grey-2))))
;; VCS ;; VCS
`(diff-hl-change ((,class (:background ,vc-modified)))) `(diff-hl-change ((,c (:foreground ,vc-modified))))
`(diff-hl-delete ((,class (:background ,vc-deleted)))) `(diff-hl-delete ((,c (:foreground ,vc-deleted))))
`(diff-hl-insert ((,class (:background ,vc-added)))) `(diff-hl-insert ((,c (:foreground ,vc-added))))
;; `(git-gutter+-modified ((,class (:foreground ,vc-modified :background nil)))) ;; `(git-gutter+-modified ((,c (:foreground ,vc-modified :background nil))))
;; `(git-gutter+-added ((,class (:foreground ,vc-added :background nil)))) ;; `(git-gutter+-added ((,c (:foreground ,vc-added :background nil))))
;; `(git-gutter+-deleted ((,class (:foreground ,vc-deleted :background nil)))) ;; `(git-gutter+-deleted ((,c (:foreground ,vc-deleted :background nil))))
;; Rainbow delimiters ;; Rainbow delimiters
`(rainbow-delimiters-depth-1-face ((,class (:foreground ,magenta :bold t)))) `(rainbow-delimiters-depth-1-face ((,c (:foreground ,magenta :bold t))))
`(rainbow-delimiters-depth-2-face ((,class (:foreground ,orange)))) `(rainbow-delimiters-depth-2-face ((,c (:foreground ,orange))))
`(rainbow-delimiters-depth-3-face ((,class (:foreground ,yellow)))) `(rainbow-delimiters-depth-3-face ((,c (:foreground ,yellow))))
`(rainbow-delimiters-depth-4-face ((,class (:foreground ,green)))) `(rainbow-delimiters-depth-4-face ((,c (:foreground ,green))))
`(rainbow-delimiters-depth-5-face ((,class (:foreground ,cyan)))) `(rainbow-delimiters-depth-5-face ((,c (:foreground ,cyan))))
`(rainbow-delimiters-unmatched-face ((,class (:foreground ,background :background ,red)))) `(rainbow-delimiters-unmatched-face ((,c (:foreground ,bg :background ,red))))
`(flyspell-incorrect ((,class (:underline (:style wave :color ,error-highlight) :inherit unspecified)))) `(flyspell-incorrect ((,c (:underline (:style wave :color ,error-highlight) :inherit unspecified))))
;; Helm ;; Helm
`(helm-source-header ((,class (:background ,background :foreground ,background :height 0.1)))) `(helm-source-header ((,c (:background ,bg :foreground ,bg :height 0.1))))
`(helm-selection ((,class (:background ,selection)))) `(helm-selection ((,c (:background ,selection))))
`(helm-swoop-target-line-face ((,c (:foreground ,highlight :inverse-video t))))
;; Avy ;; Avy
`(avy-lead-face-0 ((,class (:background ,orange :foreground ,black)))) `(avy-lead-face-0 ((,c (:background ,orange :foreground ,black))))
`(avy-lead-face-1 ((,class (:background ,orange :foreground ,black)))) `(avy-lead-face-1 ((,c (:background ,orange :foreground ,black))))
`(avy-lead-face-2 ((,class (:background ,orange :foreground ,black)))) `(avy-lead-face-2 ((,c (:background ,orange :foreground ,black))))
`(avy-lead-face ((,class (:background ,orange :foreground ,black)))) `(avy-lead-face ((,c (:background ,orange :foreground ,black))))
;; lang-specific ;; lang-specific
;; ***************************************************************************************** ;; *****************************************************************************************
;; js2-mode ;; js2-mode
`(js2-function-param ((t (:foreground ,variables)))) `(js2-function-param ((,c (:foreground ,variables))))
`(js2-jsdoc-tag ((t (:foreground ,comments :weight bold :bold t)))) `(js2-jsdoc-tag ((,c (:foreground ,comments :bold t))))
;; markdown-mode ;; markdown-mode
`(markdown-header-face ((,class (:foreground ,orange :bold t)))) `(markdown-header-face ((,c (:foreground ,orange :bold t))))
`(markdown-header-face-1 ((,class (:foreground ,dark-cyan)))) `(markdown-header-delimiter-face ((,c (:foreground ,orange :bold t))))
`(markdown-header-face-2 ((,class (:foreground ,yellow)))) `(markdown-blockquote-face ((,c (:foreground ,blue+2))))
`(markdown-header-face-3 ((,class (:foreground ,cyan)))) `(markdown-markup-face ((,c (:foreground ,cyan))))
`(markdown-header-face-4 ((,class ()))) `(markdown-inline-face ((,c (:foreground ,cyan))))
`(markdown-header-face-5 ((,class ()))) `(markdown-list-face ((,c (:foreground ,magenta))))
`(markdown-header-face-6 ((,class ()))) `(markdown-pre-face ((,c (:foreground ,cyan))))
`(markdown-header-face-1 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-2 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-3 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-4 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-5 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-6 ((,c (:inherit markdown-header-face))))
;; `(markdown-header-rule-face (:inherit shadow)) ;; `(markdown-header-rule-face (:inherit shadow))
;; `(markdown-italic-face (:inherit italic)) ;; `(markdown-italic-face (:inherit italic))
;; `(markdown-link-face (:inherit shadow)) ;; `(markdown-link-face (:inherit shadow))
@ -209,30 +247,49 @@
;; `(markdown-url-face (:inherit link)) ;; `(markdown-url-face (:inherit link))
;; org-mode ;; org-mode
;; `(org-table ((,class (:inherit 'fixed-pitch)))) `(variable-pitch ((,c (:font "DejaVu Sans" :height 1.0))))
;; `(org-block ((,class (:height 0.75 :background ,vsubtle)))) `(fixed-pitch ((,c (:font "DejaVu Sans Mono" :height 1.0))))
`(org-block-begin-line ((,class (:background ,current-line :foreground ,vsubtle)))) `(org-tag ((,c (:foreground ,grey-1))))
`(org-block-end-line ((,class (:inherit org-block-begin-line)))) ;; `(org-ellipsis ((,c (:inherit hs-face))))
`(org-document-title ((,class (:inherit variable-pitch :foreground ,foreground :height 1.40 :bold t))))
`(org-level-1 ((,class (:foreground ,magenta :bold t)))) `(org-whitespace ((,c (:inherit fixed-pitch))))
`(org-level-2 ((,class (:foreground ,dark-cyan)))) `(org-table ((,c (:inherit fixed-pitch :foreground ,cyan))))
`(org-level-3 ((,class (:foreground ,yellow)))) `(org-block ((,c (:inherit fixed-pitch :background ,current-line))))
`(org-level-4 ((,class (:foreground ,cyan)))) `(org-quote ((,c (:slant italic :foreground ,grey :background ,current-line))))
`(org-level-5 ((,class (:foreground ,orange)))) `(org-block-background ((,c (:inherit fixed-pitch :background ,current-line))))
`(org-level-6 ((,class (:foreground ,steel-blue)))) `(org-document-info ((,c (:inherit fixed-pitch :foreground ,orange))))
`(org-level-7 ((,class ()))) `(org-document-info-keyword ((,c (:inherit fixed-pitch :foreground ,grey-1))))
`(org-level-8 ((,class ()))) `(org-meta-line ((,c (:inherit fixed-pitch :background ,current-line :foreground ,vsubtle))))
`(org-block-begin-line ((,c (:inherit fixed-pitch :background ,current-line :foreground ,vsubtle))))
`(org-block-end-line ((,c (:inherit org-block-begin-line))))
`(org-document-title ((,c (:foreground ,fg :height 1.30 :bold t))))
`(org-level-1 ((,c (:foreground ,orange :bold t))))
`(org-level-2 ((,c (:foreground ,dark-cyan))))
`(org-level-3 ((,c (:foreground ,grey))))
`(org-level-4 ((,c (:foreground ,green))))
`(org-level-5 ((,c (:foreground ,cyan))))
`(org-level-6 ((,c (:foreground ,blue+2))))
;; `(org-level-7 ((,c ())))
;; `(org-level-8 ((,c ())))
;;`(org-checkbox ((,class (:box (:line-width 1 :style released-button))))) ;;`(org-checkbox ((,class (:box (:line-width 1 :style released-button)))))
`(org-code ((t (:foreground ,orange)))) `(org-code ((,c (:inherit fixed-pitch :foreground ,orange))))
`(org-verbatim ((t (:foreground ,green)))) `(org-verbatim ((,c (:inherit fixed-pitch :foreground ,green))))
`(org-formula ((,c (:inherit fixed-pitch :foreground ,cyan))))
`(org-link ((t (:underline t :foreground ,yellow)))) `(org-link ((,c (:inherit variable-pitch :underline t :foreground ,yellow))))
`(org-todo ((t (:foreground ,orange)))) `(org-date ((,c (:foreground ,violet))))
`(org-done ((t (:foreground ,green)))) `(org-item-checkbox ((,c (:inherit variable-pitch))))
`(org-special-keyword ((t (:foreground ,magenta)))) `(org-item-checkbox-checked ((,c (:inherit org-headline-done))))
`(org-checkbox-statistics-todo ((t (:inherit org-todo)))) `(org-todo ((,c (:inherit variable-pitch :foreground ,yellow))))
`(org-checkbox-statistics-done ((t (:inherit org-done)))) `(org-todo-high ((,c (:inherit variable-pitch :foreground ,yellow))))
`(org-todo-vhigh ((,c (:inherit variable-pitch :foreground ,magenta))))
`(org-done ((,c (:inherit variable-pitch :foreground ,green))))
`(org-headline-done ((,c (:inherit variable-pitch :foreground ,grey-.5 :strike-through t))))
`(org-special-keyword ((,c (:foreground ,magenta))))
`(org-checkbox-statistics-todo ((,c (:inherit org-todo :bold t))))
`(org-checkbox-statistics-done ((,c (:inherit org-done :bold t))))
)) ))