diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/jao-doom-theme.el | 45 | ||||
| -rw-r--r-- | themes/jao-doomish-theme.el | 164 |
2 files changed, 199 insertions, 10 deletions
diff --git a/themes/jao-doom-theme.el b/themes/jao-doom-theme.el index f215fa3..0f4b2df 100644 --- a/themes/jao-doom-theme.el +++ b/themes/jao-doom-theme.el @@ -1,8 +1,16 @@ (deftheme jao-doom "Created 2019-12-13.") -(defun jao-doom-color (c) (cadr (assoc c doom-themes--colors))) -(defun jao-doom-face (f) (cadr (assoc f doom-themes--faces))) +(defun jao-doom-color (c &optional alt) + (let ((c (assoc c doom-themes--colors))) (if alt (caddr c) (cadr c)))) +(defun jao-doom-face (f) + (mapcar (lambda (x) + (cond ((symbolp x) (or (jao-doom-color x) x)) + ((listp x) (jao-doom-face x)) + (t x))) + (if (listp f) f (cdr (assoc f doom-themes--faces))))) + +;; (enable-theme 'jao-doom) (custom-theme-set-faces 'jao-doom @@ -10,18 +18,35 @@ '(custom-button ((t (:background "#282b33" :foreground "#819cd6" :box nil)))) '(dictionary-reference-face ((t (:inherit (font-lock-keyword-face))))) '(dictionary-word-definition-face ((t (:inherit default)))) - '(error ((t (:foreground "tan2")))) - '(diff-hl-change ((t (:inherit default :background "#313133")))) - '(diff-hl-delete ((t (:inherit default :background "#513133")))) - '(diff-hl-insert ((t (:inherit default :background "#313351")))) + `(error ((t (:foreground ,(jao-doom-color 'orange))))) + `(diff-hl-change ((t (:inherit default :background "#313153")))) + '(diff-hl-delete ((t (:inherit default :background "#533133")))) + `(diff-hl-insert ((t (:inherit default :background "#315331")))) '(fill-column-indicator ((t (:foreground "grey25")))) + `(gnus-summary-normal-read ((t (:foreground ,(jao-doom-color 'grey))))) + `(gnus-summary-normal-unread ((t ,(jao-doom-face 'default)))) + `(highlight ((t (;; :underline ,(jao-doom-color 'green t) + :background ,(jao-doom-color 'bg-alt))))) + `(gnus-summary-selected ((t (:inherit highlight)))) '(lui-button-face ((t (:foreground "#7ebebd" :underline nil)))) + `(link-visited ((t (:foreground ,(jao-doom-color 'green))))) '(magit-diff-context-highlight ((t (:background "#333344")))) - '(magit-diff-removed-highlight ((t (:foreground "tan2")))) + `(magit-diff-hunk-heading-highlight ((t (,@(jao-doom-face 'default) + :overline nil :underline t :extend t)))) + '(magit-diff-removed-highlight ((t (:foreground "tan" :bold nil)))) + '(magit-diff-added-highlight ((t (:foreground "antiquewhite" :bold nil)))) + `(mode-line ((t (:foreground "#999999" ;; ,(jao-doom-color 'modeline-fg-alt) + :background ,(jao-doom-color 'modeline-bg) + :box (:line-width 2 :color ,(jao-doom-color 'modeline-bg)))))) + `(mode-line-inactive ((t (:foreground ,(jao-doom-color 'modeline-fg-alt t) + :background ,(jao-doom-color 'modeline-bg-inactive) + :box (:line-width 2 :color ,(jao-doom-color 'modeline-bg-inactive)))))) ;; "#3a3a4a" '(mpdel-tablist-album-face ((t (:inherit font-lock-doc-face)))) - '(mpdel-tablist-artist-face ((t (:inherit (font-lock-keyword-face))))) - `(scroll-bar ((t (:background ,(jao-doom-color 'modeline-bg) - :foreground ,(jao-doom-color 'modeline-bg-l))))) + '(mpdel-tablist-artist-face ((t (:inherit font-lock-keyword-face)))) + '(org-block-begin-line ((t (:inherit font-lock-comment-face :extend nil)))) + '(org-block-end-line ((t (:inherit org-block-begin-line :extend nil)))) + `(scroll-bar ((t (:foreground ,(jao-doom-color 'modeline-bg) + :background ,(jao-doom-color 'bg))))) '(variable-pitch ((t (:inherit default)))) '(w3m-form-button ((t (:inherit button))))) diff --git a/themes/jao-doomish-theme.el b/themes/jao-doomish-theme.el new file mode 100644 index 0000000..46b9115 --- /dev/null +++ b/themes/jao-doomish-theme.el @@ -0,0 +1,164 @@ +(jao-define-custom-theme jao-doomish + (:names (base0 "#222228" "black" "black") + (base1 "#282b33" "#1e1e1e" "brightblack") + (base2 "#34373e" "#2e2e2e" "brightblack") + (base3 "#41454b" "#262626" "brightblack") + (base4 "#515462" "#3f3f3f" "brightblack") + (base5 "#888395" "#525252" "brightblack") + (base6 "#929292" "#6b6b6b" "brightblack") + (base7 "#727269" "#979797" "brightblack") + (base8 "#eceff4" "#dfdfdf" "white") + (bg "#282b33" nil nil) + (bg-alt "#1f2024" nil nil) + (blue "#819cd6") + (blue2 "#51afef") + (builtin "#7ebebd" "#44b9b1" "brightgreen") + (comments "#6e7899" "#5699AF" "cyan") + (constants "#a6c1e0" "#c678dd" "magenta") + (cyan "#7289bc" "#46D9FF" "brightcyan") + (dark-blue "#616c96") + (dark-blue-1 "#2257A0" "blue") + (dark-cyan "#6e7899" "#5699AF" "cyan") + (dimm-line-fg "#3f3f3f") + (doc-comments "#9299b2" "#80b2c3" "cyan") + (error "#e1c1ee" "#ff6655" "red") + (fg "#c6c6c6") + (fg-05 "#c0c0c0") + (fg-1 "#a6a6a6") + (fg-2 "#2d2d2d") + (fg-alt "#c9d9ff" "#bfbfbf" "brightwhite") + (functions "#7ebebd" "#44b9b1" "brightgreen") + (green "#5b94ab") + (green2 "#99bb66") + (grey "#515462" "#3f3f3f" "brightblack") + (hidden "#282b33" "black" "black") + (highlight "#819cd6" "#51afef" "brightblue") + (keywords "#819cd6" "#51afef" "brightblue") + (light-blue "#90a6db" "#ECBE7B" "yellow") + (magenta "#a6c1e0" "#c678dd" "magenta") + (methods "#7289bc" "#46D9FF" "brightcyan") + (modeline-bg "#22242b" "black" "black") + (modeline-bg-inactive "#24262d" nil nil) + (modeline-bg-inactive-l "#282b33" "#1e1e1e" "brightblack") + (modeline-bg-l "#24262d" "black" "black") + (modeline-fg-alt "#888395" "#525252" "brightblack") + (numbers "#a6c1e0" "#c678dd" "magenta") + (operators "#819cd6" "#51afef" "brightblue") + (orange "#a6c1e0" "#dd8844" "brightred") + (red "#e1c1ee" "#ff6655" "red") + (region "#41454b") + (region2 "#262626") + (selection "#616c96" "#2257A0" "blue") + (strings "#5b94ab" "#99bb66" "green") + (success "#5b94ab" "#99bb66" "green") + (teal "#7ebebd" "#44b9b1" "brightgreen") + (type "#b0a2e7" "#a9a1e1" "brightmagenta") + (variables "#a6c1e0" "#c678dd" "magenta") + (vc-added "#5b94ab" "#99bb66" "green") + (vc-deleted "#e1c1ee" "#ff6655" "red") + (vc-modified "#a6c1e0" "#dd8844" "brightred") + (vertical-bar "#141519" "#0f0f0f" "brightblack") + (violet "#b0a2e7" "#a9a1e1" "brightmagenta") + (warning "#cfcf9c" "#ECBE7B" "yellow") + (yellow "#cfcf9c" "#ECBE7B" "yellow") + (zenburn-green-2 "#5F7F5F") + (zenburn-orange "#DFAF8F") + (zenburn-red-1 "#BC8383") + ) + (:palette (fg unspecified "#c6c6c6") + (bg unspecified "#282b33") + (box "#2d2d2d" "grey25") + (button ((c 240) nul) (bx nul)) + (hilite ((c nil region) ex)) + (strike-through ((c 237)) (st)) + (italic ((c 137) it) (it)) + (link ((c green) nit nul)) + (visited-link ((c green2) nit nul)) + (tab-sel ((c 252 232) nbf)) + (tab-unsel ((c 245 232))) + (comment ((c 102) it) ((c comments))) + (keyword ((c 151) nbf nul nit) ((c keywords))) + (function ((c 115) nul nbf) ((c functions))) + (type ((c 72) nbf) ((c type))) + (variable-name ((c nil))) + (constant ((c 72)) ((c constants) nbf nit nul)) + (string ((c 36)) ((c "wheat3"))) ;; "slate gray" "medium aquamarine" + (error ((c 144)) ((c zenburn-red-1))) + (warning ((c 95)) ((c zenburn-orange))) + (success ((c green))) + (dimm ((c 59)) ((c "#6f6f6f"))) + (gnus-mail ((c nil))) + (gnus-news ((c nil))) + (outline ((c nil))) + (f00 ((c 29)) ((c "burlywood3"))) + (f01 ((c 108)) ((c "burlywood4"))) + (f02 ((c 102)) ((c "lemonchiffon4"))) + (f10 ((c "cornsilk3"))) + (f11 ((c "lemonchiffon3"))) + (f12 ((c "honeydew4")))) + (:faces (bold (c nil nil) nul) + (button (c 66)) + (font-lock-doc-face (c 30)) + (gnus-button (c nil) nul) + (gnus-header-subject (p f01)) + (gnus-summary-selected (c 250)) + (match ul) + (magit-log-tag-label (c 95 240) nbf) + (mm-uu-extract (c nil 234)) + (mode-line (c 248 235) nbf nul) + (mode-line-inactive (c 243 235) nbf nul) + (org-hide (c 0 nil)) + (rcirc-other-nick (c 108)) + (vertical-border (c 59 nil) :inherit nil) + (w3m-image (c 144)) + (w3m-tab-background (c 0 0) ul) + (w3m-tab-line (c 0 0) ul) + (widget-button (c 196)) + (widget-field (c 143 236))) + (:x-faces (company-scrollbar-bg (c nil "#383941")) + (company-scrollbar-fg (c nil "#484951")) + (diff-hl-change (c dimm-line-fg "#313131")) + (diff-hl-delete (c dimm-line-fg red)) + (diff-hl-insert (c dimm-line-fg dark-blue)) + (fill-column-indicator (c bg-alt) :inherit nil) + (font-lock-doc-face (~ font-lock-comment-face) it) + (fringe (p dimm)) + (gnus-button (c "lightyellow3") nul) + (gnus-cite-1 (c fg-05)) + (gnus-cite-2 (c fg-1)) + (gnus-cite-3 (c fg-1)) + (gnus-cite-4 (c fg-1)) + (gnus-group-mail-3 (c nil nil)) ;; "#252525" + (gnus-group-mail-3-empty (c fg-1)) + (gnus-group-news-3 (~ gnus-group-mail-3)) + (gnus-group-news-3-empty (~ gnus-group-mail-3-empty)) + (gnus-summary-cancelled (c "dark slate gray" nil) st) + (gnus-summary-selected (p warning) nul nbf) + (header-line (p hilite)) + (magit-diff-context-highlight (p hilite) ex) + (mode-line (c "grey60" modeline-bg) + :box (:line-width 2 :color "#22242b")) + (mode-line-inactive (c "grey35" modeline-bg-inactive) + :box (:line-width 2 :color "#24262d")) + (mode-line-buffer-id (c zenburn-green-2)) + (org-hide (c 0 nil)) + (scroll-bar (c box-line-fg)) + (show-paren-match (c "darkseagreen1" "#5f5f5f")) + (variable-pitch (c nil nil)) + (vertical-border (c "black") :inherit nil) + (w3m-image (c green) bx it) + (w3m-tab-background (c nil nil)) + (w3m-tab-line (c 0 0) ul) + (widget-button (c nil nil) nul)) + (:x-colors "lemonchiffon" + "sienna3" + "darkseagreen3" + "lightgoldenrod3" + "cadetblue4" + "lightcyan4" + "cadetblue3" + "black")) + +;; (enable-theme 'jao-doomish) + +(provide 'jao-doomish-theme) |