From 3d16cff6224f67f214de4e0cfcc70cdad22da88e Mon Sep 17 00:00:00 2001 From: jao Date: Mon, 21 Sep 2020 22:33:15 +0100 Subject: themes --- themes/jao-doomish-theme.el | 77 ++++++++++++++++++++++----------------------- themes/jao-themes.el | 3 +- 2 files changed, 39 insertions(+), 41 deletions(-) (limited to 'themes') diff --git a/themes/jao-doomish-theme.el b/themes/jao-doomish-theme.el index 2e1a6bc..7645e17 100644 --- a/themes/jao-doomish-theme.el +++ b/themes/jao-doomish-theme.el @@ -1,20 +1,10 @@ (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) + (:names (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") + (constants "#a6c1e0" "magenta") (cyan "#7289bc" "#46D9FF" "brightcyan") (dark-blue "#616c96") (dark-blue-1 "#2257A0" "blue") @@ -24,13 +14,15 @@ (error "#e1c1ee") (error2 "#ff6655") (fg "#c6c6c6") - (fg-1 "#a6a6a6") - (fg-2 "#2d2d2d") + (fg-0.5 "#a6a6a6") + (fg-1 "#868686") + (fg-2 "#666666") (light-purple "#c9d9ff") (functions "#7ebebd") (functions2 "#44b9b1") (green "#5b94ab") (green2 "#99bb66") + (green3 "#44b9b1") (grey "#515462" "#3f3f3f" "brightblack") (hidden "#282b33" "black" "black") (highlight "#819cd6" "#51afef" "brightblue") @@ -55,9 +47,8 @@ (strings "#5b94ab" "#99bb66" "green") (success "#5b94ab" "#99bb66" "green") (teal "#7ebebd" "#44b9b1" "brightgreen") - (type "#b0a2e7") + (types "lightsteelblue4") (type2 "#a9a1e1") - (variables "#a6c1e0" "#c678dd" "magenta") (vc-added "#5b94ab" "#99bb66" "green") (vc-deleted "#e1c1ee" "#ff6655" "red") (vc-modified "#a6c1e0" "#dd8844" "brightred") @@ -70,28 +61,27 @@ (zenburn-orange "#DFAF8F") (zenburn-red-1 "#BC8383")) (:palette (fg unspecified "#c6c6c6") - ;; (bg unspecified "#282b33") (bg unspecified "#1f2024") ;; bg-alt (box "#2d2d2d" "grey25") - (button ((c 240) nul) ((p f01) bx nul)) + (button ((p f01) bx nul)) (hilite ((c nil region) ex)) - (strike-through ((c 237)) (st)) - (italic ((c 137) it) (it)) + (strike-through (st)) + (italic (it)) (link ((c blue) nit nul)) (visited-link ((c green) 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 type2))) + (comment ((c comments))) + (keyword ((c keywords))) + (function ((c functions))) + (type ((c types))) (variable-name ((c nil))) - (constant ((c 72)) ((c constants) nbf nit nul)) - (string ((c 36)) ((c strings))) ;; "wheat3" "slate gray" "medium aquamarine" - (error ((c 144)) ((c warning2))) - (warning ((c 95)) ((c warning))) + (constant ((c constants) nbf nit nul)) + (string ((c strings))) ;; "wheat3" "slate gray" "medium aquamarine" + (error ((c warning2))) + (warning ((c warning))) (success ((c green))) - (dimm ((c 59)) ((c "#6f6f6f"))) + (dimm ((c "#6f6f6f"))) (gnus-mail ((c nil))) (gnus-news ((c nil))) (outline-1 ((c keywords) bf)) @@ -99,12 +89,9 @@ (outline-3 ((c keywords2) bf)) (outline-4 ((c functions2) bf)) (outline-5 ((c nil))) - ;; (f00 ((c 29)) ((c "burlywood3"))) - ;; (f01 ((c 108)) ((c "burlywood4"))) - ;; (f02 ((c 102)) ((c "lemonchiffon4"))) - (f00 ((c 29)) ((c "steelblue3"))) - (f01 ((c 102)) ((c "lightsteelblue3"))) - (f02 ((c 108)) ((c "skyblue4"))) + (f00 ((c "steelblue3"))) + (f01 ((c "lightsteelblue3"))) + (f02 ((c "skyblue4"))) (f10 ((c "slategray3"))) (f11 ((c "lightskyblue2"))) (f12 ((c "lightskyblue3")))) @@ -120,12 +107,12 @@ (font-lock-doc-face (~ font-lock-comment-face) it) (fringe (p dimm)) (gnus-button (c "lightyellow3") nul) - (gnus-cite-1 (c fg-1)) + (gnus-cite-1 (c fg-0.5)) (gnus-cite-2 (c fg-1)) (gnus-cite-3 (c fg-2)) (gnus-cite-4 (c fg-2)) (gnus-group-mail-3 (c base8)) ;; "#252525" - (gnus-group-mail-3-empty (c fg-1)) + (gnus-group-mail-3-empty (c fg-0.5)) (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) @@ -133,13 +120,13 @@ (header-line (p hilite)) (magit-diff-context-highlight (p hilite) ex) (mode-line (c "grey60" modeline-bg) - :box (:line-width 2 :color "#22242b")) + :box (:line-width 1 :color "#282b33")) ;; "#22242b" (mode-line-inactive (c "grey35" modeline-bg-inactive) - :box (:line-width 2 :color "#24262d")) + :box (:line-width 1 :color "#282b33")) ;; "#24262d" (mode-line-buffer-id (c nil) bf) (org-hide (c 0 nil)) (org-code (c yellow)) - (scroll-bar (c modeline-bg)) + (scroll-bar (c bg)) (term-color-blue (c nil nil) it) (show-paren-match (c "darkseagreen1" "#5f5f5f")) (variable-pitch (c nil nil)) @@ -151,4 +138,14 @@ ;; (enable-theme 'jao-doomish) +;; (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") + (provide 'jao-doomish-theme) diff --git a/themes/jao-themes.el b/themes/jao-themes.el index 15537aa..c4effcf 100644 --- a/themes/jao-themes.el +++ b/themes/jao-themes.el @@ -696,6 +696,7 @@ (magit-section-highlight (p hilite) ex) (magit-section-heading (~ outline-2)) (magit-section-title (~ outline-2)) + (Man-underline ul) (match (p hilite)) (markdown-pre-face (~ font-lock-constant-face)) (markdown-code-face (p keyword)) @@ -882,7 +883,7 @@ (treemacs-root-face nul bf :scale 1.1) (twittering-uri-face (~ link)) (twittering-username-face (p f01))) - `((underline nul)) + `((underline ul)) `((variable-pitch :family ,jao-themes--face-family :height 110) (vertical-border (c ,jao-themes--box nil) :inherit default)) `((w3m-anchor link) -- cgit v1.2.3