From 564c14d695f0b495e59cf88233a32b8a8530d254 Mon Sep 17 00:00:00 2001 From: jao Date: Wed, 23 Jun 2021 00:53:16 +0100 Subject: old themes removed and dark tweaks --- lib/themes/jao-dark-theme.el | 6 +- lib/themes/jao-doom-theme.el | 75 ------------------- lib/themes/jao-doomish-theme.el | 160 ---------------------------------------- 3 files changed, 3 insertions(+), 238 deletions(-) delete mode 100644 lib/themes/jao-doom-theme.el delete mode 100644 lib/themes/jao-doomish-theme.el diff --git a/lib/themes/jao-dark-theme.el b/lib/themes/jao-dark-theme.el index 1aefc08..f016cf3 100644 --- a/lib/themes/jao-dark-theme.el +++ b/lib/themes/jao-dark-theme.el @@ -77,12 +77,12 @@ (outline-3 ((c keywords2) bf)) (outline-4 ((c functions2) bf)) (outline-5 ((c nil))) - (f00 ((c "darkslategray3"))) + (f00 ((c "darkseagreen3"))) (f01 ((c "dark sea green"))) (f02 ((c "lightblue3"))) (f10 ((c "cadetblue4"))) - (f11 ((c "lightskyblue2"))) - (f12 ((c "lightskyblue3")))) + (f11 ((c "cadetblue"))) + (f12 ((c "darkseagreen4")))) (:faces (bold (c nil nil) nul) (mode-line (c 248 235) nbf nul) (mode-line-inactive (c 243 235) nbf nul)) diff --git a/lib/themes/jao-doom-theme.el b/lib/themes/jao-doom-theme.el deleted file mode 100644 index 4c16a43..0000000 --- a/lib/themes/jao-doom-theme.el +++ /dev/null @@ -1,75 +0,0 @@ -;;; jao-doom.el --- tweaks to an existing (doom) 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 . - -(deftheme jao-doom - "Created 2019-12-13.") - -(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 - '(Info-quoted ((t (:inherit font-lock-variable-name-face)))) - '(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 ,(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-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)))) - '(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))))) - -(custom-theme-set-variables - 'jao-doom - '(fci-rule-color "grey25")) - -(provide-theme 'jao-doom) diff --git a/lib/themes/jao-doomish-theme.el b/lib/themes/jao-doomish-theme.el deleted file mode 100644 index 8f93cde..0000000 --- a/lib/themes/jao-doomish-theme.el +++ /dev/null @@ -1,160 +0,0 @@ -;;; jao-doomish-theme.el --- a dark theme inspired by doom -*- 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-doomish - (:names (bg "#282b33" nil nil) - (bg-alt "#1f2024" nil nil) - (blue "#819cd6") - (blue2 "#51afef") - (comments "#6e7899" "#5699AF" "cyan") - (constants "#a6c1e0" "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") - (error2 "#ff6655") - (fg "#c6c6c6") - (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") - (keywords "#819cd6") - (keywords2 "#51afef") - (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") - (orange2 "#dd8844") - (red "#e1c1ee" "#ff6655" "red") - (region "#41454b") - (region2 "#262626") - (selection "#616c96" "#2257A0" "blue") - (strings "#5b94ab" "#99bb66" "green") - (success "#5b94ab" "#99bb66" "green") - (teal "#7ebebd" "#44b9b1" "brightgreen") - (types "lightsteelblue4") - (type2 "#a9a1e1") - (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") - (warning2 "#ECBE7B") - (yellow "#cfcf9c" "#ECBE7B" "yellow") - (zenburn-green-2 "#5F7F5F") - (zenburn-orange "#DFAF8F") - (zenburn-red-1 "#BC8383")) - (:palette (fg unspecified "#c6c6c6") - (bg unspecified "#1f2024") ;; bg-alt - (box "#2d2d2d" "grey25") - (button ((p f01) bx nul)) - (hilite ((c nil region) ex)) - (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 comments))) - (keyword ((c keywords))) - (function ((c functions))) - (type ((c types))) - (variable-name ((c nil))) - (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 "#6f6f6f"))) - (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 "steelblue3"))) - (f01 ((c "lightsteelblue3"))) - (f02 ((c "skyblue4"))) - (f10 ((c "slategray3"))) - (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 (company-scrollbar-bg (c nil "#383941")) - (company-scrollbar-fg (c nil "#484951")) - (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") nul) - (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-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) - (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")) ;; "#22242b" - (mode-line-inactive (c "grey35" modeline-bg-inactive) - :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 bg)) - (term-color-blue (c nil nil) it) - (vterm-color-blue (c light-blue nil)) - (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))) - -;; (enable-theme 'jao-doomish) - -(provide 'jao-doomish-theme) -- cgit v1.2.3