diff options
Diffstat (limited to 'lib/themes')
| -rw-r--r-- | lib/themes/jao-light-term-theme.el | 121 | ||||
| -rw-r--r-- | lib/themes/jao-light-theme.el | 38 | ||||
| -rw-r--r-- | lib/themes/jao-themes.el | 76 |
3 files changed, 184 insertions, 51 deletions
diff --git a/lib/themes/jao-light-term-theme.el b/lib/themes/jao-light-term-theme.el new file mode 100644 index 0000000..ccd6a3f --- /dev/null +++ b/lib/themes/jao-light-term-theme.el @@ -0,0 +1,121 @@ +;;; jao-light-term-theme.el --- a light theme -*- lexical-binding: t; -*- + +;; Author: jao <mail@jao.io> +;; Keywords: themes + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <https://www.gnu.org/licenses/>. + +(jao-define-custom-theme jao-light-term + (:names (bg-lightest "gray98") + (bg-light "gray95") + + (light-gray "gray80") + + (black "black") + (dark-gray "gray30") + (fg-light "gray40") + + ;; (hl "#f2f2f2") + (hl "ivory2") + (dimm "lemonchiffon4") + + (warning "orange4") + (red "burlywood4") + (blue "#023770") + (green "#005555") + (lightgreen "darkgreen") + (yellow "lightyellow")) + (:face-size 9) + (:face-family "DejaVu Sans Mono") + (:bold-weight 'bold) + (:palette (fg "#000000") + (bg "#ffffff") + (box "gray80") + (hilite (c nil hl)) + (link (c green) nbf nul) + (visited-link (c green)) + (tab-sel (~ mode-line)) + (tab-unsel (~ mode-line-inactive)) + (comment (c fg-light) it) + (keyword (c blue) bf) + (type (c blue) nbf) + (function (c green)) + (variable-name (c black)) + (constant (c dark-gray)) + (string (c blue) nit) + (warning (c warning)) + (error (c red) bf) + (dimm (c dimm)) + (gnus-mail (c "black")) + (gnus-news (c "black")) + (outline (c "black") bf) + (outline-1 (c green) nbf nul ex) + (outline-2 (c blue) nbf) + (outline-3 (c lightgreen) nbf) + (outline-4 (c blue) nul nbf) + (outline-5 (c blue) nul nbf) + (f00 (c green)) + (f01 (c blue)) + (f02 (c dark-gray)) + (f10 (p f00)) + (f11 (p f01)) + (f12 (p f02))) + (:x-faces (button (c blue bg-lightest)) + (compilation-info (c "#223142" nil) nbf) + (completions-group-separator (c nil ni) (st "grey80")) + (corfu-default (~ default) (c "black" "grey95")) + (corfu-bar (c nil "grey80")) ;; moving part of the bar + (corfu-border (~ corfu-background)) ;; background of the bar + (corfu-current (c "black" "grey95") nbf nit (ul "grey70")) + (cursor (c "sienna3" "sienna3")) + (diff-hl-margin-change (c "lightcyan2" nil)) + (diff-hl-margin-insert (c "honeydew2" nil)) + (diff-hl-margin-delete (c "wheat1" nil)) + (eww-form-text (p hilite)) + (fill-column-indicator (c "grey80")) + (fringe (c "grey70" nil)) + (gnus-button (c blue)) + (gnus-cite-1 (c "darkslategray" nil)) + (gnus-cite-2 (c "slate gray" nil)) + (gnus-cite-3 (c "slate gray" nil)) + (gnus-cite-4 (c "slate gray" nil)) + (gnus-header-name (c fg-light)) + (gnus-summary-selected (c green) nbf) + (gnus-summary-cancelled (c "sienna3" nil) st) + (header-line (c dark-gray bg-lightest) + :box (:line-width 1 :color "grey90")) + (magit-diff-context-highlight (c nil hl) ex) + (magit-diff-hunk-heading-highlight (c nil hl) it bf) + (mode-line (c "grey20" "gray90") nbf) + (mode-line-inactive (c "grey40" "gray95")) + (mode-line-buffer-id (~ default) (c dark-blue-2 nil) nit) + (mode-line-emphasis (c green nil)) + (mode-line-highlight (c green nil)) + (org-link (p link) (ul "grey80")) + (scroll-bar (c "grey90" nil)) + (show-paren-match (c nil "grey85")) + (shr-text (c nil nil)) + (shr-link (~ link) (ul light-gray)) + (shr-code (c blue nil)) + (success (c green)) + (vertical-border (c "grey70" nil)) + (vertico-current (c nil yellow) nul ext) + (widget-button (c blue nil) nit nul) + (widget-field (c nil bg-light) nit nul) + (whitespace-tag (p hilite)))) + +;; (enable-theme 'jao-light-term) +;; (jao-mode-line-adjust-faces) + +(provide 'jao-light-term-theme) diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el index bd3fcdf..a172f84 100644 --- a/lib/themes/jao-light-theme.el +++ b/lib/themes/jao-light-theme.el @@ -16,8 +16,6 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see <https://www.gnu.org/licenses/>. -(defvar jao-theme-light-bold (if (> emacs-major-version 28) 'medium 'semibold)) - (jao-define-custom-theme jao-light (:names (bg-lightest "gray98") (bg-light "gray95") @@ -31,21 +29,22 @@ (hl "#f2f2f2") (dimm "lemonchiffon4") - (search "#e8e800") - (search2 "#ffffb4") - (warning "orange4") (red "burlywood4") (blue "#023770") - (green "#005555")) + (pale-blue "honeydew3") + (green "#005555") + (lightgreen "darkgreen") + (yellow "lightyellow")) (:face-size 9) - (:face-family "Fira Code") - (:bold-weight jao-theme-light-bold) + ;; (:face-family "DejaVu Sans Mono") + (:face-family "Hack") + (:bold-weight 'semibold) (:palette (fg "black") (bg "white") (box "gray80") - (button (c fg-light bg-lightest) (ul light-gray)) (hilite (c nil hl)) + (button (c fg-light bg-lightest) (ul light-gray)) (link (c green) nbf (ul light-gray)) (visited-link (ul light-gray) nbf) (tab-sel (~ mode-line)) @@ -81,9 +80,12 @@ (corfu-border (~ corfu-background)) ;; background of the bar (corfu-current (c "black" "grey95") nbf nit (ul "grey70")) (cursor (c "sienna3" "sienna3")) - (diff-hl-change (c "white" pale-blue)) - (diff-hl-insert (c "white" "honeydew2")) + (diff-hl-change (c "white" "honeydew2")) + (diff-hl-insert (c "white" "lemonchiffon2")) (diff-hl-delete (c "white" "wheat1")) + (diff-hl-margin-change (c pale-blue)) + (diff-hl-margin-insert (c pale-blue)) + (diff-hl-margin-delete (c "wheat1")) (fill-column-indicator (c "grey80")) (fringe (c "grey70" nil)) (gnus-button (c blue)) @@ -96,16 +98,17 @@ (gnus-summary-cancelled (c "sienna3" nil) st) (header-line (c dark-gray bg-lightest) :box (:line-width 1 :color "grey90")) - (magit-diff-context-highlight (c nil hl) ex) + (magit-diff-context-highlight (c nil yellow) ex) (magit-diff-hunk-heading-highlight (c nil hl) it bf) - (mode-line (c "grey30" bg-light) - :box (:line-width -1 :color "grey90")) - (mode-line-inactive (c "grey40" "white") - :box (:line-width -1 :color "grey90")) - (mode-line-buffer-id (~ default) (c dark-blue-2 nil) nit) + (message-header-subject (p warning) nbf) + (mode-line (c "grey20") :box (:line-width 1 :color "grey80")) + (mode-line-inactive + (c "grey40" bg-light) :box (:line-width 1 :color "grey80")) + (mode-line-buffer-id (~ default) (c nil nil) nit) (mode-line-emphasis (c green nil)) (mode-line-highlight (c green nil)) (org-link (p link) (ul "grey80")) + (tab-bar (~ header-line) :family "Source Code Pro") (scroll-bar (c "grey80" nil)) (show-paren-match (c nil "grey85")) (shr-text (c nil nil)) @@ -113,6 +116,7 @@ (shr-code (c blue nil)) (success (c green)) (vertical-border (c "grey70" nil)) + (vterm-color-yellow (c "darkgoldenrod4" yellow)) (widget-button (~ default) nit (ul "grey80")))) ;; (enable-theme 'jao-light) diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el index 2c182f6..b1aa265 100644 --- a/lib/themes/jao-themes.el +++ b/lib/themes/jao-themes.el @@ -21,8 +21,8 @@ (require 'ansi-color) ;;; palette -(defvar jao-themes-default-face "Hack-9") -(defvar jao-themes--face-family "Hack") +(defvar jao-themes-default-face "DejaVu Sans Mono-9") +(defvar jao-themes--face-family "DejaVu Sans Mono") (defvar jao-themes--fg "black") (defvar jao-themes--bg "white") (defvar jao-themes--box "grey75") @@ -191,6 +191,8 @@ (nth clr jao-themes--default-cidxs) (format "color-%s" clr))) ((and (symbolp clr) (cadr (assoc clr *jao-themes--color-names*)))) + ((equal clr 'dfg) jao-themes--fg) + ((equal clr 'dbg) jao-themes--bg) (t 'unspecified))) (defun jao-themes--parse-face-sym (s) @@ -300,7 +302,8 @@ (jao-themes-f10 (p f10)) (jao-themes-f11 (p f11)) (jao-themes-f12 (p f12))) - `((ansi-color-bright-blue (c "steelblue3" "steelblue3")) + `((ansi-color-bold bf) + (ansi-color-bright-blue (c "steelblue3" "steelblue3")) (ansi-color-bright-cyan (c "cyan3" "cyan3")) (ansi-color-bright-green (c "darkseagreen3" "darkseagreen3")) (ansi-color-bright-magenta (c "lightpink4" "lightpink4")) @@ -311,23 +314,9 @@ (ansi-color-green (c "darkseagreen4" "darkseagreen4")) (ansi-color-magenta (c "lightpink3" "lightpink3")) (ansi-color-yellow (c "lightgoldenrod3" "lightgoldenrod3")) - (aw-background-face (p dimm)) - (aw-leading-char-face (~ error) bf :height 3.0) - (awesome-tray-module-awesome-tab-face (p f00)) - (awesome-tray-module-battery-face (p f00)) - (awesome-tray-module-battery-face (p f00)) - (awesome-tray-module-buffer-name-face (p f11)) - (awesome-tray-module-circe-face (p f00)) - (awesome-tray-module-date-face (p f00)) - (awesome-tray-module-date-face (p f01)) - (awesome-tray-module-evil-face (p f00)) - (awesome-tray-module-file-path-face (p f00)) - (awesome-tray-module-git-face (p f10)) - (awesome-tray-module-last-command-face (p f00)) - (awesome-tray-module-location-face (p f00)) - (awesome-tray-module-mode-name-face (p f00)) - (awesome-tray-module-parent-dir-face (p f00)) - (awesome-tray-module-rvm-face (p f00))) + (avy-lead-face (c "red" "grey90") bf :height 1.2) + (avy-lead-face-0 (~ avy-lead-face) bf) + (avy-lead-face-1 (~ avy-lead-face))) `((bbdb-company) (bbdb-field-name bf) (bbdb-field-value (~ default)) @@ -505,6 +494,10 @@ (embark-verbose-indicator-documentation it) (embark-verbose-indicator-title (p f00)) (embark-verbose-indicator-shadowed (p dimm)) + (ement-room-reactions-key (~ ement-room-reactions)) + (ement-room-self-face (p warning) nb) + (ement-room-timestamp-header (~ header-line) :height 1.0 nb) + (ement-room-user-face (~ default)) (emms-browser-album-face (p f00) :height 1.0) (emms-browser-artist-face (p f01) :height 1.0) (emms-browser-composer-face (p f02) :height 1.0) @@ -604,6 +597,7 @@ (font-lock-type-face (p type)) (font-lock-variable-name-face (p variable-name)) (font-lock-warning-face (p warning)) + (forge-pullreq-open (c nil nil)) (forge-topic-label bx) (fringe (p dimm)) (fuel-font-lock-debug-error (p error) nul) @@ -816,7 +810,7 @@ (lui-button-face (p link)) (lui-highlight-face (p warning)) (lui-time-stamp-face (p dimm)) - (lui-track-bar (p dimm) :height 0.2 nul nil ex)) + (lui-track-bar (p dimm) nul nil ex)) `((magit-branch (p f00)) (magit-cherry-equivalent (p warning)) (magit-diff-add (~ diff-added)) @@ -837,6 +831,7 @@ (magit-log-head-label-tags (p warning) nbf) (magit-log-graph (p f11)) (magit-log-tag-label (p keyword)) + (magit-process-ok (c nil nil)) (magit-section-highlight (p hilite) ex) (magit-section-heading (~ outline-1)) (magit-section-secondary-heading (~ outline-2)) @@ -940,7 +935,7 @@ (org-ellipsis (p dimm)) (org-formula (p f02)) (org-headline-done (p dimm)) - (org-hide (c dbg dfg)) + (org-hide (c dbg nil)) (org-latex-and-export-specials (~ default)) (org-level-1 (~ outline-1)) (org-level-2 (~ outline-2)) @@ -963,7 +958,7 @@ (org-table (p f01)) (org-tag (p dimm) nbf) (org-target ul) - (org-time-grid dfg dbg) + (org-time-grid (c nil nil)) (org-todo nbf niv (p error)) (org-upcoming-deadline (p f02)) (org-verbatim (p hilite)) @@ -976,14 +971,14 @@ (outline-6 nbf ul (p outline-6)) (outline-7 nbf ul (p outline-7)) (outline-8 nbf ul (p outline-8)) - (outline-minor-1 bf (~ outline-1) (c nil "grey95") ex) - (outline-minor-2 bf (~ outline-2) (c nil "grey95") ex) - (outline-minor-3 bf (~ outline-3) (c nil "grey95") ex) - (outline-minor-4 bf (~ outline-4) (c nil "grey95") ex) - (outline-minor-5 bf (~ outline-5) (c nil "grey95") ex) - (outline-minor-6 bf (~ outline-6) (c nil "grey95") ex) - (outline-minor-7 bf (~ outline-7) (c nil "grey95") ex) - (outline-minor-8 bf (~ outline-8) (c nil "grey95") ex)) + (outline-minor-1 nbf (~ outline-1) ex) + (outline-minor-2 nbf (~ outline-2) ex) + (outline-minor-3 nbf (~ outline-3) ex) + (outline-minor-4 nbf (~ outline-4) ex) + (outline-minor-5 nbf (~ outline-5) ex) + (outline-minor-6 nbf (~ outline-6) ex) + (outline-minor-7 nbf (~ outline-7) ex) + (outline-minor-8 nbf (~ outline-8) ex)) `((powerline-active1 (~ mode-line)) (powerline-active2 (~ mode-line-inactive)) (powerline-inactive1 (~ mode-line-inactive)) @@ -1016,6 +1011,7 @@ (rst-level-8-face (~ outline-8))) `((secondary-selection (p hilite) ex) (separator-line (~ default) (st "grey85")) + (sh-heredoc (~ font-lock-doc-face)) (sh-quoted-exec (p f00)) (shortdoc-heading (p outline-1) nul) (shortdoc-section (p outline-2)) @@ -1080,18 +1076,30 @@ (success (p success)) (sunshine-forecast-date-face (~ default)) (sunshine-forecast-day-divider-face (p dimm)) - (sunshine-forecast-headline-face (~ header-line))) - `((telega-button (~ button)) + (sunshine-forecast-headline-face (~ header-line)) + (symbol-overlay-face-1 (c nil "brown1")) + (symbol-overlay-face-2 (c nil "lightsalmon1")) + (symbol-overlay-face-3 (c nil "tomato1")) + (symbol-overlay-face-4 (c nil "coral")) + (symbol-overlay-face-5 (~ symbol-overlay-face-1)) + (symbol-overlay-face-6 (~ symbol-overlay-face-2)) + (symbol-overlay-face-7 (~ symbol-overlay-face-3)) + (symbol-overlay-face-8 (~ symbol-overlay-face-4))) + `((tab-bar (~ header-line)) + (telega-button (~ button)) (telega-button-active (~ button)) + (telega-entity-type-spoiler (c dfg dbg)) (telega-msg-heading (p f00)) (telega-msg-self-title (p f01)) (telega-root-heading (p hilite)) (textsec-suspicious (~ default) bx) - (term (~ default)) + (term (c dfg dbg)) (tool-bar (~ default)) (tooltip :family ,jao-themes--face-family (c nil "lightyellow") :height 0.9) (trailing-whitespace (p error)) + (transient-key-exit (p error) bf) + (transient-key-stay (p f00) bf) (treemacs-root-face nul bf :scale 1.1) (twittering-timeline-footer-face (~ header-line)) (twittering-timeline-header-face (~ header-line)) |