From 8bc7402721308336f2609aae985a7a076416aa22 Mon Sep 17 00:00:00 2001 From: jao Date: Fri, 8 Apr 2022 02:04:13 +0100 Subject: themes: slightly more spartan light theme --- init.org | 6 +- lib/themes/jao-black-and-white.el | 118 -------------------------------------- lib/themes/jao-light-theme.el | 115 +++++++++++++++++++------------------ 3 files changed, 63 insertions(+), 176 deletions(-) delete mode 100644 lib/themes/jao-black-and-white.el diff --git a/init.org b/init.org index 4431c81..fcef5bb 100644 --- a/init.org +++ b/init.org @@ -381,9 +381,12 @@ (require 'jao-themes) + (defvar jao-theme-dark 'jao-dark) + (defvar jao-theme-light 'jao-light) + (defun jao-themes-setup () (let ((dark (jao-colors-scheme-dark-p))) - (load-theme (if dark 'jao-dark 'jao-light) t))) + (load-theme (if dark jao-theme-dark jao-theme-light) t))) (when (and window-system (not (eq window-system 'pgtk))) (jao-themes-setup)) @@ -2493,6 +2496,7 @@ cider-auto-select-error-buffer nil cider-auto-select-test-report-buffer nil cider-eldoc-display-for-symbol-at-point t + cider-eldoc-ns-function #'cider-last-ns-segment cider-enrich-classpath nil cider-lein-parameters "repl :headless :host localhost" cider-mode-line " รท" diff --git a/lib/themes/jao-black-and-white.el b/lib/themes/jao-black-and-white.el deleted file mode 100644 index c222a5b..0000000 --- a/lib/themes/jao-black-and-white.el +++ /dev/null @@ -1,118 +0,0 @@ -;;; jao-light-theme.el --- a light theme -*- lexical-binding: t; -*- - -;; Author: jao -;; 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 . - -(jao-define-custom-theme jao-black-and-white - (:names (bg1 "white") - (bg2 "gray95") - (bg3 "gray90") - (bg4 "gray85") - (bg5 "gray98") - (bg6 "gray99") - (bg7 "gray80") - - (fg1 "black") - (fg2 "gray10") - (fg3 "gray20") - (fg4 "gray30") - (fg5 "gray40") - - (hl "cornsilk1") - - (str "grey05") - - (search "#e8e800") - (search2 "#ffffb4") - - (warning "orange4") - (red "burlywood4") - (ok "#005555")) - (:face-family "Roboto Mono") - (:bold-weight 'medium) - (:palette (fg "black") - (bg "white") - (box "grey88") - (button (c fg5 bg4) bx nit) - (hilite (c nil hl)) - (link nbf (ul fg5)) - (visited-link (ul bg7) nbf) - (tab-sel (~ mode-line)) - (tab-unsel (~ mode-line-inactive)) - (comment (c fg5) it) - (keyword (c fg2) bf) - (type (c nil) nbf) - (function it) - (variable-name (c fg1)) - (constant (c fg3)) - (string (c str) it) - (warning (c warning)) - (error (c red) bf) - (dimm (c "lemonchiffon4")) - (gnus-mail (c "black")) - (gnus-news (c "black")) - (outline (c "black") bf) - (outline-1 (c ok) bf) - (outline-2 (c ok) nbf) - (outline-3 ul) - (outline-4 ul) - (outline-5 ul) - (f00 (c ok)) - (f01 (c ok) it) - (f02 (c fg1)) - (f10 (p f00)) - (f11 (p f01)) - (f12 (p f02))) - (:x-faces (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-change (c "white" pale-blue)) - (diff-hl-insert (c "white" "honeydew2")) - (diff-hl-delete (c "white" "wheat1")) - (fill-column-indicator (c "grey80")) - (fringe (c "grey70" nil)) - (gnus-button (p f01) bf) - (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-summary-selected (c green) nbf) - (gnus-summary-cancelled (c "sienna3" nil) st) - (header-line (c "grey30" dimm-background-2) - :box (:line-width 1 :color "grey90")) - (magit-diff-context-highlight (c nil yellow) ex) - (magit-diff-hunk-heading-highlight (c nil yellow) it bf) - (mode-line (c "grey30" dimm-background-2) - :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) - (mode-line-emphasis (c green nil)) - (mode-line-highlight (c green nil)) - (org-link (p link) (ul "grey80")) - (scroll-bar (c "grey80" nil)) - (show-paren-match (c nil "grey85")) - (vertical-border (c "grey70" nil)) - (widget-button (~ default) nit (ul "grey80")))) - -;; (enable-theme 'jao-black-and-white) -;; (jao-mode-line-adjust-faces) - -(provide 'jao-black-and-white-theme) diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el index 3cfba2b..edcb951 100644 --- a/lib/themes/jao-light-theme.el +++ b/lib/themes/jao-light-theme.el @@ -17,64 +17,64 @@ ;; along with this program. If not, see . (jao-define-custom-theme jao-light - (:names (dimm-background "#f4f4f4") - (dimm-background-2 "#f0f0f0") - (dimm-background-3 "#f6f6f6") - (dimm-background-4 "#fafafa") - (yellowish-background "#fffff8") - (link "#00552a") - (yellow "#fdf6e3") - (pale-yellow "#fff8e5") - (paler-yellow "#fffff8") - (green "#005555") - (slate "dark slate gray") - (light-green "darkolivegreen4") - (greyish "#626262") - (blueish "deepskyblue4") - (blue "#819cd6") - (blue2 "#51afef") - (pale-blue "azure2") - (dark-blue "#616c96") - (dark-blue-1 "#2257A0") - (dark-blue-2 "#023770") - (keywords "lightsteelblue4") - (keywords2 "#2257A0") - (light-grey "grey97") - (functions "#005555") - (red "salmon3") - (red2 "sienna4")) + (:names (bg1 "gray98") + (bg2 "gray95") + (bg3 "gray90") + (bg4 "gray85") + (bg5 "gray98") + (bg6 "gray99") + (bg7 "gray80") + + (fg1 "black") + (fg2 "gray10") + (fg3 "gray20") + (fg4 "gray30") + (fg5 "gray40") + + (hl "cornsilk1") + (dimm "lemonchiffon4") + + (str "gray10") + + (search "#e8e800") + (search2 "#ffffb4") + + (warning "orange4") + (red "burlywood4") + (blue "#023770") + (green "#005555")) (:face-family "Roboto Mono") (:bold-weight 'medium) (:palette (fg "black") (bg "white") - (box "grey88") - (button (c "grey10" dimm-background-4) bx nit) - (hilite (c nil dimm-background)) - (link (c dark-blue-2) (ul "grey80") nbf) - (visited-link (c dark-blue-1) nul nbf) + (box "gray80") + (button (c fg5 bg2) ul) + (hilite (c nil hl)) + (link (c green) nbf (ul bg7)) + (visited-link (ul bg7) nbf) (tab-sel (~ mode-line)) (tab-unsel (~ mode-line-inactive)) - (comment (c greyish) it) - (keyword (c dark-blue-2) nbf) - (type (c nil) nbf) - (function (c green nil) nbf) - (variable-name (c "black")) - (constant (c 23)) - (string (c link)) - (warning (c red2)) - (error (c red)) - (dimm (c "lemonchiffon4")) + (comment (c fg5) it) + (keyword (c blue) bf) + (type (c blue) nbf) + (function (c green)) + (variable-name (c fg1)) + (constant (c fg4)) + (string (c str) it) + (warning (c warning)) + (error (c red) bf) + (dimm (c dimm)) (gnus-mail (c "black")) (gnus-news (c "black")) - (outline (c "black") nbf) - (outline-1 (c dark-blue-1) nit) - (outline-2 (c functions) nit nbf) - (outline-3 (c link) nit nbf) - (outline-4 (c nil) it nbf) - (outline-5 (c nil)) - (f00 (c slate)) - (f01 (c dark-blue-2)) - (f02 (c green)) + (outline (c "black") bf) + (outline-1 (c green) bf) + (outline-2 (c green) nbf) + (outline-3 (c blue) nul nbf) + (outline-4 (c blue) nul nbf) + (outline-5 (c blue) nul nbf) + (f00 (c green)) + (f01 (c blue)) + (f02 (c fg1)) (f10 (p f00)) (f11 (p f01)) (f12 (p f02))) @@ -90,18 +90,18 @@ (diff-hl-delete (c "white" "wheat1")) (fill-column-indicator (c "grey80")) (fringe (c "grey70" nil)) - (gnus-button (p f01) bf) + (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-summary-selected (c green) nbf) (gnus-summary-cancelled (c "sienna3" nil) st) - (header-line (c "grey30" dimm-background-2) + (header-line (c fg4 bg1) :box (:line-width 1 :color "grey90")) - (magit-diff-context-highlight (c nil yellow) ex) - (magit-diff-hunk-heading-highlight (c nil yellow) it bf) - (mode-line (c "grey30" dimm-background-2) + (magit-diff-context-highlight (c nil hl) ex) + (magit-diff-hunk-heading-highlight (c nil hl) it bf) + (mode-line (c "grey30" bg2) :box (:line-width -1 :color "grey90")) (mode-line-inactive (c "grey40" "white") :box (:line-width -1 :color "grey90")) @@ -111,9 +111,10 @@ (org-link (p link) (ul "grey80")) (scroll-bar (c "grey80" nil)) (show-paren-match (c nil "grey85")) - (success (p f00)) + (shr-text (c nil nil)) + (shr-link (~ link) (ul fg5)) + (shr-code (c blue nil)) (vertical-border (c "grey70" nil)) - (warning (c "burlywood4" nil)) (widget-button (~ default) nit (ul "grey80")))) ;; (enable-theme 'jao-light) -- cgit v1.2.3