From 3d23b5376f0aa30e9d0c0bfe8ac0b004c73c0338 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Tue, 2 Apr 2019 10:45:07 +0300 Subject: [PATCH] Update the not harmonic theme --- 10themes-base16-not-harmonic.el | 21 +++++++++++++++++++++ 10themes.el | 12 ++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/10themes-base16-not-harmonic.el b/10themes-base16-not-harmonic.el index 4da0886..da64a66 100644 --- a/10themes-base16-not-harmonic.el +++ b/10themes-base16-not-harmonic.el @@ -32,6 +32,27 @@ ;; Add all the faces to the theme (base16-theme-define 'base16-not-harmonic base16-not-harmonic-colors) +;; Customise things +(custom-theme-set-faces + 'base16-not-harmonic + '(cursor ((t (:background "#568bbf")))) + '(font-lock-comment-delimiter-face ((t (:foreground "#aabcce")))) + '(mode-line ((t (:font "Hasklig 16")))) + '(fringe ((t (:background "#2c3a47" :slant normal)))) + + '(diff-refine-added ((t (:background "#56bf8b" :foreground "#2c3a47")))) + '(diff-refine-removed ((t (:background "#bf5656" :foreground "#2c3a47")))) + '(diff-refine-changed ((t (:background "#bfbf56" :foreground "#2c3a47")))) + + '(magit-diff-added ((t (:background "#56bf8b" :foreground "#2c3a47")))) + '(magit-diff-added-highlight ((t (:background "#8bbf56" :foreground "#2c3a47")))) + + '(magit-diff-our ((t (:background "#bf5656" :foreground "#2c3a47")))) + '(magit-diff-our-highlight ((t (:background "#bf568b" :foreground "#2c3a47")))) + + '(magit-diff-removed ((t (:background "#bf5656" :foreground "#2c3a47")))) + '(magit-diff-removed-highlight ((t (:background "#bf568b" :foreground "#2c3a47"))))) + ;; Mark the theme as provided (provide-theme 'base16-not-harmonic) diff --git a/10themes.el b/10themes.el index 544f31d..7f73ef7 100644 --- a/10themes.el +++ b/10themes.el @@ -5,7 +5,7 @@ (setq-default display-time-format "%H:%M") ;; time format to display on mode line (sml/setup) -(load "~/.emacs.d/10themes-base16-not-harmonic.el") +(load "~/.emacs.d/10themes-base16-not-harmonic.el" t) (load-theme 'base16-mexico-light t t) (load-theme 'manoj-dark t t) (load-theme 'base16-one-light t t) @@ -14,18 +14,10 @@ "Additional configuration for Base16 theme." (set-face-attribute 'mode-line nil :font "Hasklig 15")) -(defun base16-harmonic-custom () - "Additional configuration for Base 16 theme." - (set-face-attribute 'font-lock-comment-delimiter-face nil - :foreground "#aabcce") - (set-face-attribute 'mode-line nil :font "Hasklig 15") - (set-face-attribute 'fringe nil :background "#2c3a47" - :slant 'normal)) - (if (display-graphic-p) (progn (sml/apply-theme 'respectful) - (enable-theme 'base16-one-light)) + (enable-theme 'base16-not-harmonic)) (progn (enable-theme 'manoj-dark)))