From 65fb8ac42e98e8ddbc974ef5426362205daa899f Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 15 Sep 2020 20:48:08 -0400 Subject: theme: Switch to modus-themes I've been using modus-operandi and modus-vivendi for a few months now. I think they're great. --- init.el | 7 ++- lisp/km-theme.el | 132 ---------------------------------------- lisp/stekene-light-theme.el | 101 ------------------------------- lisp/stekene-theme-common.el | 141 ------------------------------------------- 4 files changed, 6 insertions(+), 375 deletions(-) delete mode 100644 lisp/km-theme.el delete mode 100644 lisp/stekene-light-theme.el delete mode 100644 lisp/stekene-theme-common.el diff --git a/init.el b/init.el index 0b4253d..116b9ec 100644 --- a/init.el +++ b/init.el @@ -57,7 +57,12 @@ (line-number-mode) (size-indication-mode) -(require 'km-theme) +(use-package modus-themes + :init + (setq modus-themes-fringes 'subtle) + (setq modus-themes-diffs 'fg-only) + :config + (load-theme 'modus-operandi t)) ;;; Custom prefix maps diff --git a/lisp/km-theme.el b/lisp/km-theme.el deleted file mode 100644 index e8028e3..0000000 --- a/lisp/km-theme.el +++ /dev/null @@ -1,132 +0,0 @@ -;;; km-theme.el --- Tweaks to the stekene light theme - -;; Copyright (C) 2012-2020 Kyle Meyer - -;; Author: Kyle Meyer -;; URL: https://git.kyleam.com/emacs.d - -;; 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 . - -;;; Code: - -(load-theme 'stekene-light t) - -(let ((bg "white") - (bg-mid "gray96") - (bg-dark "gray92") - (fg-light "gray30") - (diff-added "#1d771d") - (diff-removed "#e60000")) - (custom-theme-set-faces - 'stekene-light - '(Info-quoted ((t (:inherit default)))) - '(compilation-info ((t (:inherit font-lock-function-name-face)))) - '(cursor ((t (:background "#f08080")))) - `(default ((t (:background ,bg)))) - `(diff-added ((t (:foreground ,diff-added :background ,bg-mid)))) - `(diff-context ((t (:foreground ,fg-light :background ,bg-mid)))) - `(diff-removed ((t (:foreground ,diff-removed :background ,bg-mid)))) - '(dired-subtree-depth-1-face ((t (:background "gray80")))) - '(dired-subtree-depth-2-face ((t (:background "gray90")))) - '(dired-subtree-depth-3-face ((t (:background "gray95")))) - '(dired-symlink ((t (:inherit font-lock-constant-face)))) - '(font-latex-math-face ((t (:inherit font-lock-builtin-face)))) - '(font-latex-string-face ((t (:inherit default)))) - '(font-lock-keyword-face ((t (:foreground "#4e5656")))) - '(font-lock-comment-face ((t (:foreground "#745f5f")))) - '(git-annex-dired-annexed-available ((t (:inherit font-lock-type-face)))) - '(git-annex-dired-annexed-unavailable ((t (:inherit font-lock-string-face)))) - '(gnus-button ((t (:inherit default)))) - '(gnus-cite-1 ((t (:inherit font-lock-function-name-face)))) - '(gnus-cite-2 ((t (:inherit font-lock-string-face)))) - '(gnus-group-mail-1 ((t (:inherit gnus-group-mail-1-empty :weight bold)))) - '(gnus-group-mail-1-empty ((t (:inherit font-lock-string-face)))) - '(gnus-group-mail-2 ((t (:inherit gnus-group-mail-2-empty :weight bold)))) - '(gnus-group-mail-2-empty ((t (:inherit font-lock-function-name-face)))) - '(gnus-group-mail-3 ((t (:inherit gnus-group-mail-3-empty :weight bold)))) - '(gnus-group-mail-3-empty ((t (:inherit font-lock-type-face)))) - '(gnus-header-content ((t (:inherit default)))) - '(gnus-header-name ((t (:inherit font-lock-constant-face)))) - '(gnus-header-subject ((t (:inherit font-lock-doc-face)))) - '(gnus-subject ((t (:inherit font-lock-doc-face)))) - '(gnus-summary-normal-read ((t (:inherit font-lock-comment-face)))) - '(helm-grep-file ((t (:inherit compilation-info)))) - '(helm-grep-finish ((t (:inherit compilation-mode-line-exit)))) - '(helm-grep-lineno ((t (:inherit compilation-line-number)))) - '(helm-match-item ((t (:inherit lazy-highlight)))) - '(helm-selection ((t (:inherit region)))) - '(helm-swoop-target-line-block-face ((t (:inherit match)))) - '(helm-swoop-target-line-face ((t (:inherit match)))) - '(helm-swoop-target-word-face ((t (:inherit lazy-highlight)))) - '(isearch ((t (:inherit match)))) - '(magit-cherry-equivalent ((t (:inherit font-lock-constant-face)))) - '(magit-cherry-unmatched ((t (:inherit font-lock-string-face)))) - `(magit-diff-added ((t (:foreground ,diff-added :background ,bg-mid)))) - `(magit-diff-added-highlight ((t (:foreground ,diff-added :background ,bg-mid)))) - `(magit-diff-context ((t (:foreground ,fg-light :background ,bg-mid)))) - `(magit-diff-context-highlight ((t (:foreground ,fg-light :background ,bg-mid)))) - '(magit-diff-file-heading ((t (:inherit default :weight bold)))) - '(magit-diff-file-heading-selection ((t (:inherit default :weight bold)))) - `(magit-diff-hunk-heading ((t (:foreground ,fg-light :background ,bg-dark)))) - `(magit-diff-hunk-heading-highlight ((t (:foreground ,fg-light :background "grey80")))) - `(magit-diff-removed ((t (:foreground ,diff-removed :background ,bg-mid)))) - `(magit-diff-removed-highlight ((t (:foreground ,diff-removed :background ,bg-mid)))) - `(magit-diff-revision-summary ((t (:background ,bg :weight bold)))) - `(magit-diff-revision-summary-highlight ((t (:background ,bg-mid :weight bold)))) - `(magit-diffstat-added ((t (:foreground ,diff-added)))) - `(magit-diffstat-removed ((t (:foreground ,diff-removed)))) - '(magit-hash ((t (:foreground "#8a939a")))) - '(magit-popup-argument ((t (:inherit font-lock-string-face)))) - `(magit-process-ng ((t (:foreground ,diff-removed)))) - `(magit-process-ok ((t (:foreground ,diff-added)))) - '(magit-reflog-amend ((t (:inherit font-lock-function-name-face)))) - '(magit-reflog-checkout ((t (:inherit font-lock-builtin-face)))) - '(magit-reflog-commit ((t (:inherit default)))) - '(magit-reflog-merge ((t (:inherit font-lock-doc-face)))) - '(magit-reflog-other ((t (:inherit font-lock-type-face)))) - '(magit-reflog-rebase ((t (:inherit font-lock-string-face)))) - '(magit-reflog-remote ((t (:inherit font-lock-variable-name-face)))) - '(magit-reflog-reset ((t (:inherit font-lock-warning-face)))) - '(magit-section-heading ((t (:inherit font-lock-keyword-face :weight bold)))) - `(magit-section-highlight ((t (:background ,bg)))) - '(magit-section-secondary-heading ((t (:inherit default)))) - '(match ((t (:inherit default :background "PaleGreen1")))) - `(mm-uu-extract ((t (:background ,bg-mid)))) - '(org-agenda-calendar-event ((t (:inherit font-lock-function-name-face)))) - '(org-agenda-calendar-sexp ((t (:inherit font-lock-variable-name-face)))) - '(org-agenda-clocking ((t (:inherit lazy-highlight)))) - '(org-agenda-date ((t (:inherit font-lock-keyword-face)))) - '(org-agenda-date-today ((t (:weight bold)))) - '(org-agenda-date-weekend ((t (:inherit org-agenda-date)))) - `(org-agenda-restriction-lock ((t (:background ,bg)))) - '(org-agenda-structure ((t (:inherit font-lock-comment-face)))) - '(org-date ((t (:inherit font-lock-type-face)))) - `(org-done ((t (:foreground ,diff-added)))) - '(org-drawer ((t (:inherit org-special-keyword)))) - '(org-scheduled ((t (:inherit default)))) - '(org-scheduled-today ((t (:inherit org-scheduled)))) - `(org-todo ((t (:foreground ,diff-removed)))) - '(org-upcoming-deadline ((t (:inherit default)))) - '(org-warning ((t (:inherit font-lock-string-face)))) - '(outline-1 ((t (:inherit font-lock-doc-face)))) - '(outline-2 ((t (:inherit font-lock-function-name-face)))) - '(outline-3 ((t (:inherit font-lock-keyword-face)))) - '(rst-level-1 ((t (:weight bold)))) - '(rst-level-2 ((t (:weight bold)))) - '(rst-level-3 ((t (:inherit default)))) - `(whitespace-indentation ((t (:background ,bg-dark)))) - `(whitespace-trailing ((t (:background ,bg-dark)))))) - -(provide 'km-theme) -;;; km-theme.el ends here diff --git a/lisp/stekene-light-theme.el b/lisp/stekene-light-theme.el deleted file mode 100644 index eee54c7..0000000 --- a/lisp/stekene-light-theme.el +++ /dev/null @@ -1,101 +0,0 @@ -;;; stekene-light-theme.el --- Light version of the stekene theme -*- lexical-binding: t -*- - -;; Author: Fanael Linithien -;; URL: https://github.com/Fanael/stekene-theme - -;; This file is NOT part of GNU Emacs. - -;; Copyright (c) 2014, Fanael Linithien -;; All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without -;; modification, are permitted provided that the following conditions are -;; met: -;; -;; * Redistributions of source code must retain the above copyright -;; notice, this list of conditions and the following disclaimer. -;; * Redistributions in binary form must reproduce the above copyright -;; notice, this list of conditions and the following disclaimer in the -;; documentation and/or other materials provided with the distribution. -;; -;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -;;; Code: - -(eval-when-compile (require 'stekene-theme-common)) - -(deftheme stekene-light "The light version of the stekene theme.") - -(stekene-theme--set-faces - stekene-light - ((foreground "#242424") - (background "#f8f8f8") - (region "#bbbbbb") - (helmselection "#cccccc") - (hlline "#dddddd") - (highlight "#aaccaa") - (modelinebg "#dddddd") - (gray1 "#919191") - (gray2 "#666666") - (dullgreen "#557755") - (dullred "#775555") - (dullyellow "#777755") - (red "#ba2727") - (orange1 "#ba4727") - (orange2 "#b86833") - (yellow1 "#777722") - (yellow2 "#777722") - (blue1 "#336688") - (blue2 "#666699") - (blue3 "#555588") - (fringebg "#dddddd") - (whitespaceline "#fac9c0") - (whitespacetrailing "#fa8980") - (symbol1 "#934748") - (symbol2 "#8b4e34") - (symbol3 "#7d5626") - (symbol4 "#695e22") - (symbol5 "#51642a") - (symbol6 "#35693b") - (symbol7 "#006b51") - (symbol8 "#006c69") - (symbol9 "#006b7f") - (symbol10 "#00688f") - (symbol11 "#0d6396") - (symbol12 "#4c5b94") - (symbol13 "#6f5288") - (symbol14 "#854976") - (symbol15 "#91455f") - (delim1 "#7c544a") - (delim2 "#6e5b3e") - (delim3 "#586241") - (delim4 "#3f6652") - (delim5 "#2a6768") - (delim6 "#32647a") - (delim7 "#505d7e") - (delim8 "#6d5673") - (delim9 "#7d525e") - (identifierlightness 25) - (identifiersaturation 40) - (block1 "#f8f0f0") - (block2 "#f0f8f0") - (block3 "#f0f0f8") - (block4 "#f8f8f0") - (block5 "#f0f8f8") - (block6 "#f8f0f8") - (block7 "#efe5e5") - (block8 "#e5efe5") - (block9 "#e5e5ef"))) - -(provide-theme 'stekene-light) -;;; stekene-light-theme.el ends here diff --git a/lisp/stekene-theme-common.el b/lisp/stekene-theme-common.el deleted file mode 100644 index 109ce45..0000000 --- a/lisp/stekene-theme-common.el +++ /dev/null @@ -1,141 +0,0 @@ -;;; stekene-theme-common.el --- Common stuff for the stekene themes -*- lexical-binding: t -*- - -;; Author: Fanael Linithien -;; URL: https://github.com/Fanael/stekene-theme - -;; This file is NOT part of GNU Emacs. - -;; Copyright (c) 2014, Fanael Linithien -;; All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without -;; modification, are permitted provided that the following conditions are -;; met: -;; -;; * Redistributions of source code must retain the above copyright -;; notice, this list of conditions and the following disclaimer. -;; * Redistributions in binary form must reproduce the above copyright -;; notice, this list of conditions and the following disclaimer in the -;; documentation and/or other materials provided with the distribution. -;; -;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -;;; Code: - -(defmacro stekene-theme--set-faces (name palette) - `(let ,(cons '(class '((class color) (min-colors 89))) palette) - (custom-theme-set-faces - ',name - `(default ((,class (:background ,background :foreground ,foreground)))) - `(cursor ((,class (:background ,foreground)))) - `(region ((,class (:background ,region)))) - `(highlight ((,class (:background ,highlight)))) - `(font-lock-builtin-face ((,class (:foreground ,blue3)))) - `(font-lock-preprocessor-face ((,class (:foreground ,dullred)))) - `(font-lock-comment-face ((,class (:foreground ,gray1)))) - `(font-lock-constant-face ((,class (:foreground ,dullyellow)))) - `(font-lock-function-name-face ((,class (:foreground ,blue1)))) - `(font-lock-keyword-face ((,class (:foreground ,gray2)))) - `(font-lock-string-face ((,class (:foreground ,red)))) - `(font-lock-regexp-grouping-backslash ((,class (:foreground ,orange2)))) - `(font-lock-regexp-grouping-construct ((,class (:foreground ,yellow2)))) - `(font-lock-doc-face ((,class (:foreground ,orange1)))) - `(font-lock-type-face ((,class (:foreground ,dullgreen)))) - `(font-lock-variable-name-face ((,class (:foreground ,blue2)))) - `(font-lock-negation-char-face ((,class (:foreground ,orange2)))) - - `(hl-line ((,class (:background ,hlline)))) - `(show-paren-match-face ((,class (:background ,region)))) - - `(whitespace-line ((,class (:background ,whitespaceline :foreground nil)))) - `(whitespace-trailing ((,class (:background ,whitespacetrailing :foreground nil)))) - - `(fringe ((,class (:background ,fringebg)))) - `(linum ((,class (:background ,background :foreground ,gray1)))) - - `(mode-line ((,class - (:background ,modelinebg :foreground ,foreground :box nil)))) - - `(minibuffer-prompt ((,class (:foreground ,orange1)))) - - `(ido-subdir ((,class (:foreground ,yellow1)))) - `(ido-only-match ((,class (:foreground ,blue2)))) - - `(evil-ex-info ((,class (:foreground ,red :weight bold)))) - `(evil-ex-substitute-replacement ((,class - (:foreground ,red :weight bold :underline t)))) - - `(highlight-quoted-quote ((,class (:foreground ,orange2)))) - `(highlight-quoted-symbol ((,class (:foreground ,dullyellow)))) - - `(helm-source-header ((,class (:background ,modelinebg :foreground ,blue2)))) - `(helm-selection ((,class (:background ,helmselection)))) - `(helm-prefarg ((,class (:foreground ,dullred)))) - `(helm-match ((,class (:foreground ,blue2)))) - `(helm-M-x-key ((,class (:foreground ,blue1)))) - `(helm-ff-file ((,class (:foreground ,foreground)))) - `(helm-ff-directory ((,class (:foreground ,blue1)))) - `(helm-ff-executable ((,class (:foreground ,dullgreen)))) - `(helm-ff-symlink ((,class (:foreground ,dullyellow)))) - `(helm-ff-invalid-symlink ((,class (:foreground ,red)))) - `(helm-history-deleted ((,class (:foreground ,red)))) - `(helm-history-remote ((,class (:foreground ,blue1)))) - `(helm-lisp-show-completion ((,class (:background ,highlight)))) - - `(rainbow-identifiers-identifier-1 ((,class (:foreground ,symbol1)))) - `(rainbow-identifiers-identifier-2 ((,class (:foreground ,symbol2)))) - `(rainbow-identifiers-identifier-3 ((,class (:foreground ,symbol3)))) - `(rainbow-identifiers-identifier-4 ((,class (:foreground ,symbol4)))) - `(rainbow-identifiers-identifier-5 ((,class (:foreground ,symbol5)))) - `(rainbow-identifiers-identifier-6 ((,class (:foreground ,symbol6)))) - `(rainbow-identifiers-identifier-7 ((,class (:foreground ,symbol7)))) - `(rainbow-identifiers-identifier-8 ((,class (:foreground ,symbol8)))) - `(rainbow-identifiers-identifier-9 ((,class (:foreground ,symbol9)))) - `(rainbow-identifiers-identifier-10 ((,class (:foreground ,symbol10)))) - `(rainbow-identifiers-identifier-11 ((,class (:foreground ,symbol11)))) - `(rainbow-identifiers-identifier-12 ((,class (:foreground ,symbol12)))) - `(rainbow-identifiers-identifier-13 ((,class (:foreground ,symbol13)))) - `(rainbow-identifiers-identifier-14 ((,class (:foreground ,symbol14)))) - `(rainbow-identifiers-identifier-15 ((,class (:foreground ,symbol15)))) - - `(rainbow-delimiters-depth-1-face ((,class (:foreground ,delim1)))) - `(rainbow-delimiters-depth-2-face ((,class (:foreground ,delim2)))) - `(rainbow-delimiters-depth-3-face ((,class (:foreground ,delim3)))) - `(rainbow-delimiters-depth-4-face ((,class (:foreground ,delim4)))) - `(rainbow-delimiters-depth-5-face ((,class (:foreground ,delim5)))) - `(rainbow-delimiters-depth-6-face ((,class (:foreground ,delim6)))) - `(rainbow-delimiters-depth-7-face ((,class (:foreground ,delim7)))) - `(rainbow-delimiters-depth-8-face ((,class (:foreground ,delim8)))) - `(rainbow-delimiters-depth-9-face ((,class (:foreground ,delim9)))) - - `(highlight-blocks-depth-1-face ((,class (:background ,block1)))) - `(highlight-blocks-depth-2-face ((,class (:background ,block2)))) - `(highlight-blocks-depth-3-face ((,class (:background ,block3)))) - `(highlight-blocks-depth-4-face ((,class (:background ,block4)))) - `(highlight-blocks-depth-5-face ((,class (:background ,block5)))) - `(highlight-blocks-depth-6-face ((,class (:background ,block6)))) - `(highlight-blocks-depth-7-face ((,class (:background ,block7)))) - `(highlight-blocks-depth-8-face ((,class (:background ,block8)))) - `(highlight-blocks-depth-9-face ((,class (:background ,block9))))) - (custom-theme-set-variables - ',name - `(rainbow-identifiers-cie-l*a*b*-lightness ,identifierlightness) - `(rainbow-identifiers-cie-l*a*b*-saturation ,identifiersaturation)))) - -;;;###autoload -(when load-file-name - (add-to-list 'custom-theme-load-path - (file-name-as-directory (file-name-directory load-file-name)))) - -(provide 'stekene-theme-common) -;;; stekene-theme-common.el ends here -- cgit v1.2.3