From 2f946e63f235849ca9e4d3a27277576f257e5b64 Mon Sep 17 00:00:00 2001 From: jao Date: Mon, 21 Jun 2021 00:53:26 +0100 Subject: jao-greenish -> jao-dark --- init.org | 3 +- lib/themes/jao-dark-theme.el | 136 +++++++++++++++++++++++++++++++++++++++ lib/themes/jao-greenish-theme.el | 135 -------------------------------------- lib/themes/jao-themes.el | 1 + 4 files changed, 138 insertions(+), 137 deletions(-) create mode 100644 lib/themes/jao-dark-theme.el delete mode 100644 lib/themes/jao-greenish-theme.el diff --git a/init.org b/init.org index 036553e..f22ce99 100644 --- a/init.org +++ b/init.org @@ -414,7 +414,7 @@ (defun jao-themes-setup () (let ((dark (jao-colors-scheme-dark-p))) - (load-theme (if dark 'jao-greenish 'jao-light) t))) + (load-theme (if dark 'jao-dark 'jao-light) t))) (when (and window-system (not (eq window-system 'pgtk))) (jao-themes-setup)) @@ -451,7 +451,6 @@ (setq jao-exwm-enabled-p t) (display-time-mode -1) (jao-ednc-setup 95) - ;; (jao-toggle-inactive-mode-line t) (exwm-enable) (jao-trisect t) (message "Welcome to exwm")) diff --git a/lib/themes/jao-dark-theme.el b/lib/themes/jao-dark-theme.el new file mode 100644 index 0000000..d914ecb --- /dev/null +++ b/lib/themes/jao-dark-theme.el @@ -0,0 +1,136 @@ +;;; jao-dark-theme.el --- a dark theme with blue-green accent -*- 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-dark + (:names (bg "#282b33" nil nil) + (bg-alt "#1f2024" nil nil) + (fg "#c6c6c6") + (fg-0.5 "#a6a6a6") + (fg-1 "#868686") + (fg-2 "#666666") + (blue "#819cd6") + (blueish "#6e7899") + (dark-blue "#616c96") + (green "#5b94ab") + (yellow "antiquewhite3") + (dark-yellow "antiquewhite4") + (orange "#a6c1e0") + (orange2 "#dd8844") + (red "#e1c1ee" "#ff6655" "red") + (comments "lightblue4") + (constants "honeydew4") + (dimm-line-fg "#3f3f3f") + (dimm-line "#6f6f6f") + (error "#e1c1ee") + (functions "#7ebebd") + (functions2 "#44b9b1") + (keywords "cadetblue3" "paleturquoise3") + (keywords2 "#51afef") + (modeline-bg "#22242b") + (modeline-bg-inactive "#24262d") + (region "#41454b") + (strings "honeydew3") + (success "#5b94ab") + (warning "#cfcf9c") + (warning2 "#ECBE7B")) + (:palette (fg "#c6c6c6") + (bg "#1f2024") + (box "grey25") + (button ((p f01) bx nul)) + (hilite ((c nil region) ex)) + (strike-through (st)) + (italic (it)) + (link ((c blue))) ;; (ul dimm-line) + (visited-link ((c dark-blue))) + (tab-sel ((c 252 232) nbf)) + (tab-unsel ((c 245 232))) + (comment ((c comments))) + (keyword ((c keywords))) + (function ((c functions))) + (type ((c constants))) + (variable-name ((c nil))) + (constant ((c constants))) + (string ((c strings))) + (error ((c warning2))) + (warning ((c warning))) + (success ((c green))) + (dimm ((c dimm-line))) + (gnus-mail ((c nil))) + (gnus-news ((c nil))) + (outline-1 ((c keywords) bf)) + (outline-2 ((c functions) bf)) + (outline-3 ((c keywords2) bf)) + (outline-4 ((c functions2) bf)) + (outline-5 ((c nil))) + (f00 ((c "darkslategray3"))) + (f01 ((c blueish))) + (f02 ((c "lightblue3"))) + (f10 ((c "cadetblue4"))) + (f11 ((c "lightskyblue2"))) + (f12 ((c "lightskyblue3")))) + (:faces (bold (c nil nil) nul) + (mode-line (c 248 235) nbf nul) + (mode-line-inactive (c 243 235) nbf nul)) + (:x-faces (clojure-keyword-face (c "powder blue")) + (company-scrollbar-bg (c nil "#383941")) + (company-scrollbar-fg (c nil "#484951")) + (cursor (c warning2 warning2)) + (diff-hl-change (c dimm-line-fg green)) + (diff-hl-delete (c dimm-line-fg orange2)) + (diff-hl-insert (c dimm-line-fg dark-blue)) + (fill-column-indicator (c "black") :inherit nil) + (font-lock-doc-face (~ font-lock-comment-face) it) + (fringe (p dimm)) + (gnus-button (c "lightyellow3")) + (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 yellow)) + (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-group-mail-low (p f10)) + (gnus-group-mail-low-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 1 :color "#282b33")) + (mode-line-inactive (c "grey35" modeline-bg-inactive) + :box (:line-width 1 :color "#282b33")) + (mode-line-buffer-id (c yellow)) + (org-hide (c 0 nil)) + (org-code (c yellow)) + (scroll-bar (c bg)) + (term-color-blue (c nil nil) it) + (vterm-color-blue (c "steelblue4" nil)) + (show-paren-match (c "darkseagreen1" "#5f5f5f")) + (variable-pitch (c nil nil)) + (vertical-border (c "black") :inherit nil) + (vertico-group-separator (p dimm) :strike-through "#6f6f6f") + (w3m-image (c green) bx it) + (w3m-tab-background (c nil nil)) + (w3m-tab-line (c 0 0) ul))) + +;; (enable-theme 'jao-dark) +;; (jao-minibuffer-adjust-mode-line-faces) + + +(provide 'jao-dark-theme) diff --git a/lib/themes/jao-greenish-theme.el b/lib/themes/jao-greenish-theme.el deleted file mode 100644 index 11b7a59..0000000 --- a/lib/themes/jao-greenish-theme.el +++ /dev/null @@ -1,135 +0,0 @@ -;;; jao-greenish-theme.el --- a dark theme with green accent -*- 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-greenish - (:names (bg "#282b33" nil nil) - (bg-alt "#1f2024" nil nil) - (fg "#c6c6c6") - (fg-0.5 "#a6a6a6") - (fg-1 "#868686") - (fg-2 "#666666") - (blue "#819cd6") - (dark-blue "#616c96") - (green "#5b94ab") - (yellow "antiquewhite3") - (dark-yellow "antiquewhite4") - (orange "#a6c1e0") - (orange2 "#dd8844") - (red "#e1c1ee" "#ff6655" "red") - (comments "lightskyblue4") - (constants "#a6c1e0") - (dimm-line-fg "#3f3f3f") - (dimm-line "#6f6f6f") - (error "#e1c1ee") - (functions "#7ebebd") - (functions2 "#44b9b1") - (keywords "paleturquoise3") - (keywords2 "#51afef") - (modeline-bg "#22242b") - (modeline-bg-inactive "#24262d") - (region "#41454b") - (strings "#6e7899" "azure4") - (success "#5b94ab" "#99bb66") - (warning "#cfcf9c") - (warning2 "#ECBE7B")) - (:palette (fg "#c6c6c6") - (bg "#1f2024") - (box "grey25") - (button ((p f01) bx nul)) - (hilite ((c nil region) ex)) - (strike-through (st)) - (italic (it)) - (link ((c blue))) ;; (ul dimm-line) - (visited-link ((c dark-blue))) - (tab-sel ((c 252 232) nbf)) - (tab-unsel ((c 245 232))) - (comment ((c comments))) - (keyword ((c keywords))) - (function ((c functions))) - (type ((c strings))) - (variable-name ((c nil))) - (constant ((c blue))) - (string ((c strings))) - (error ((c warning2))) - (warning ((c warning))) - (success ((c green))) - (dimm ((c dimm-line))) - (gnus-mail ((c nil))) - (gnus-news ((c nil))) - (outline-1 ((c keywords) bf)) - (outline-2 ((c functions) bf)) - (outline-3 ((c keywords2) bf)) - (outline-4 ((c functions2) bf)) - (outline-5 ((c nil))) - (f00 ((c "lightcyan3"))) - (f01 ((c "darkslategray3"))) - (f02 ((c "lightblue3"))) - (f10 ((c "cadetblue4"))) - (f11 ((c "lightskyblue2"))) - (f12 ((c "lightskyblue3")))) - (:faces (bold (c nil nil) nul) - (mode-line (c 248 235) nbf nul) - (mode-line-inactive (c 243 235) nbf nul)) - (:x-faces (clojure-keyword-face (c "powder blue")) - (company-scrollbar-bg (c nil "#383941")) - (company-scrollbar-fg (c nil "#484951")) - (cursor (c warning2 warning2)) - (diff-hl-change (c dimm-line-fg green)) - (diff-hl-delete (c dimm-line-fg orange2)) - (diff-hl-insert (c dimm-line-fg dark-blue)) - (fill-column-indicator (c "black") :inherit nil) - (font-lock-doc-face (~ font-lock-comment-face) it) - (fringe (p dimm)) - (gnus-button (c "lightyellow3")) - (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 yellow)) - (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-group-mail-low (p f10)) - (gnus-group-mail-low-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 1 :color "#282b33")) - (mode-line-inactive (c "grey35" modeline-bg-inactive) - :box (:line-width 1 :color "#282b33")) - (mode-line-buffer-id (c yellow)) - (org-hide (c 0 nil)) - (org-code (c yellow)) - (scroll-bar (c bg)) - (term-color-blue (c nil nil) it) - (vterm-color-blue (c "steelblue4" nil)) - (show-paren-match (c "darkseagreen1" "#5f5f5f")) - (variable-pitch (c nil nil)) - (vertical-border (c "black") :inherit nil) - (vertico-group-separator (p dimm) :strike-through "#6f6f6f") - (w3m-image (c green) bx it) - (w3m-tab-background (c nil nil)) - (w3m-tab-line (c 0 0) ul))) - -;; (enable-theme 'jao-greenish) -;; (jao-minibuffer-adjust-mode-line-faces) - - -(provide 'jao-greenish-theme) diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el index 02c141c..0a5c95a 100644 --- a/lib/themes/jao-themes.el +++ b/lib/themes/jao-themes.el @@ -1039,6 +1039,7 @@ `((telega-button (~ button)) (telega-button-active (~ button)) (telega-msg-heading (p f00)) + (telega-msg-self-title (p f01)) (telega-root-heading (p hilite)) (term (~ default)) (tool-bar (~ default)) -- cgit v1.2.3