Use child theme to customize faces

Author: PythonNut

init.el

@@ -46,7 +46,8 @@
       (setq my/slow-device t))
 
     (eval-and-compile
-      (add-to-list 'load-path (locate-user-emacs-file "modules/")))
+      (add-to-list 'load-path (locate-user-emacs-file "modules/"))
+      (add-to-list 'custom-theme-load-path (locate-user-emacs-file "themes/")))
 
     ;; suppress the GNU spam
     (fset 'display-startup-echo-area-message #'ignore)
@@ -127,5 +128,5 @@
     (message "[============== ] modes")
     (my/require-config-module 'config-modes)
     (message "[===============] solarized")
-    (my/require-config-module 'config-solarized)
+    (load-theme 'quark-solarized-dark t)
     (message "[===============] done"))

modules/config-avy-easymotion.el

@@ -31,27 +31,6 @@
         avy-timeout-seconds 0.3
         avy-keys (eval-when-compile (string-to-list "jfkdlsaurieowncpqmxzb")))
 
-  (defun my/avy-setup-faces ()
-    (set-face-foreground 'avy-background-face "#586e75")
-
-    (set-face-attribute 'avy-lead-face nil
-                        :weight 'normal
-                        :background nil
-                        :foreground "#b58900"
-                        :inherit nil)
-    (set-face-attribute 'avy-lead-face-0 nil
-                        :weight 'extra-bold
-                        :background nil
-                        :foreground "#dc322f"
-                        :inherit nil)
-    (set-face-attribute 'avy-lead-face-1 nil
-                        :background nil
-                        :foreground "#839493"
-                        :inherit nil))
-
-  (my/avy-setup-faces)
-  (add-hook 'load-theme-hook #'my/avy-setup-faces)
-
   (use-package evil
     ;; Note: evil is ensured in config-evil
     :ensure nil

modules/config-company.el

@@ -12,8 +12,7 @@
     :hook 'first-change-hook
     :after-hook 'emacs-startup-hook
     :condition (get-buffer-window)
-    (global-company-mode +1)
-    (run-hooks 'load-theme-hook))
+    (global-company-mode +1))
 
   (eval-and-compile
     (cl-macrolet
@@ -109,47 +108,8 @@
       (company-select-next-or-abort arg)))
 
   (define-key company-active-map (kbd "<up>") #'company-select-above)
-  (define-key company-active-map (kbd "<down>") #'company-select-below)
-
-  (add-hook
-   'load-theme-hook
-   (my/defun-as-value my/company-setup-tooltip-faces  ()
-     (set-face-attribute 'company-tooltip-common-selection nil
-                         :background "#839496"
-                         :foreground (if (< (display-color-cells) 256)
-                                         "black"
-                                       nil)
-                         :underline nil
-                         :inherit 'region)
-
-     (set-face-attribute 'company-tooltip-selection nil
-                         :background "#586e75"
-                         :foreground nil
-                         :inherit 'region)
-
-     (set-face-attribute 'company-tooltip-common nil
-                         :background nil
-                         :underline nil
-                         :inherit 'company-tooltip
-                         :foreground "#586e75")
-
-     (set-face-attribute 'company-tooltip-annotation nil
-                         :foreground nil
-                         :background nil
-                         :inherit 'company-tooltip)
-
-     (set-face-attribute 'company-tooltip nil
-                         :foreground nil
-                         :inherit 'default))))
-
-(with-eval-after-load 'company-template
-  (add-hook
-   'load-theme-hook
-   (my/defun-as-value my/company-setup-template-faces ()
-     (set-face-attribute 'company-template-field nil
-                         :foreground nil
-                         :background nil
-                         :inherit 'region))))
+  (define-key company-active-map (kbd "<down>") #'company-select-below))
+
 
 (with-eval-after-load 'company-dabbrev-code
   (eval-when-compile

modules/config-ivy.el

@@ -169,29 +169,20 @@ Minibuffer bindings:
       (require 'historian)
       (require 'ivy)))
 
-  (ivy-historian-mode +1)
-
-  (defun my/ivy-setup-faces ()
-    (set-face-attribute 'ivy-minibuffer-match-face-1 nil
-                        :background nil)
-    (set-face-attribute 'ivy-minibuffer-match-face-2 nil
-                        :background nil
-                        :foreground "#268bd2")
-
-    (setq ivy-minibuffer-faces (list 'ivy-minibuffer-match-face-1
-                                     'ivy-minibuffer-match-face-2)))
+  (setq ivy-minibuffer-faces
+        (list 'ivy-minibuffer-match-face-1
+              'ivy-minibuffer-match-face-2))
 
+  (ivy-historian-mode +1)
   (diminish 'ivy-mode)
 
   (setq ivy-display-style 'fancy
         ivy-re-builders-alist '((t . ivy--regex-fuzzy))
         ivy-extra-directories nil
         ivy-count-format ""
         ivy-flx-limit 2000
-        ivy-use-selectable-prompt t)
+        ivy-use-selectable-prompt t))
 
-  (my/ivy-setup-faces)
-  (add-hook 'load-theme-hook #'my/ivy-setup-faces))
 
 (use-package counsel
   :init

modules/config-solarized.el

@@ -20,6 +20,16 @@
       frame-inhibit-implied-resize t
       inhibit-compacting-font-caches t)
 
+(define-advice list-faces-display
+    (:after (&rest _args) turn-off-hl-line-mode)
+  (with-current-buffer (get-buffer "*Faces*")
+    (setq-local global-hl-line-mode nil
+                hl-line-mode nil)))
+
+(let ((display-table (or standard-display-table (make-display-table))))
+  (set-display-table-slot display-table 'vertical-border (make-glyph-code ?│))
+  (setq standard-display-table display-table))
+
 (defun isearch-exit-chord-worker ()
   "Exit out of isearch after a chord"
   (interactive)
@@ -238,20 +248,6 @@ DIR should be 1 or -1 and COUNT should be a positive integer or nil."
   (defvar-local my/rainbow-delimiters-face-cookies nil
     "a list of face-remap-add-relative cookies to reset")
 
-  (defun my/rainbow-delimiters-setup-faces ()
-    (set-face-foreground 'rainbow-delimiters-depth-1-face "#889899")
-    (set-face-foreground 'rainbow-delimiters-depth-2-face "#9b7b6b")
-    (set-face-foreground 'rainbow-delimiters-depth-3-face "#7b88a5")
-    (set-face-foreground 'rainbow-delimiters-depth-4-face "#889899")
-    (set-face-foreground 'rainbow-delimiters-depth-5-face "#839564")
-    (set-face-foreground 'rainbow-delimiters-depth-6-face "#6391aa")
-    (set-face-foreground 'rainbow-delimiters-depth-7-face "#9d748f")
-    (set-face-foreground 'rainbow-delimiters-depth-8-face "#7b88a5")
-    (set-face-foreground 'rainbow-delimiters-depth-9-face "#659896"))
-
-  (my/rainbow-delimiters-setup-faces)
-  (add-hook 'load-theme-hook #'my/rainbow-delimiters-setup-faces)
-
   (defun my/rainbow-delimiters-focus-on ()
     "Punch the rainbow-delimiters"
     (setq my/rainbow-delimiters-face-cookies

modules/config-ui.el

@@ -0,0 +1,48 @@
+(eval-and-compile
+  (use-package solarized-theme)
+  (require 'solarized))
+(eval-when-compile
+  (require 'solarized-palettes))
+
+(setq quark/solarized-faces                                 
+      '("My personal solarized theme customization."
+        (custom-theme-set-faces
+         theme-name
+         `(mode-line
+           ((,class (:inverse-video unspecified
+                                    :foreground ,s-mode-line-fg
+                                    :background ,s-mode-line-bg))))
+         `(mode-line-inactive
+           ((,class (:inverse-video unspecified
+                                    :underline ,s-mode-line-underline
+                                    :foreground ,s-mode-line-inactive-fg
+                                    :background ,base02))))
+         `(mode-line-buffer-id ((,class (:weight bold))))
+         `(fringe ((,class (:foreground ,s-fringe-fg :background "#022F3A"))))
+         `(vertical-border ((,class (:background nil :foreground ,base02))))
+         `(diff-hl-change ((,class (:background ,s-diff-fine-C-bg :foreground ,s-diff-C-fg))))
+         `(diff-hl-delete ((,class (:background ,s-diff-fine-A-bg :foreground ,s-diff-A-fg))))
+         `(diff-hl-insert ((,class (:background ,s-diff-fine-B-bg :foreground ,s-diff-B-fg))))
+         `(avy-background-face ((,class (:foreground ,base01))))
+         `(avy-lead-face ((,class (:foreground ,yellow :background nil))))
+         `(avy-lead-face-0 ((,class (:weight extra-bold :foreground ,red :background nil))))
+         `(avy-lead-face-1 ((,class (:foreground ,base0 :background nil))))
+         `(ivy-minibuffer-match-face-1 ((,class (:background nil))))
+         `(ivy-minibuffer-match-face-2 ((,class (:background nil :foreground ,blue))))
+         `(rainbow-delimiters-depth-1-face ((,class (:foreground "#889899"))))
+         `(rainbow-delimiters-depth-2-face ((,class (:foreground "#9b7b6b"))))
+         `(rainbow-delimiters-depth-3-face ((,class (:foreground "#7b88a5"))))
+         `(rainbow-delimiters-depth-4-face ((,class (:foreground "#889899"))))
+         `(rainbow-delimiters-depth-5-face ((,class (:foreground "#839564"))))
+         `(rainbow-delimiters-depth-6-face ((,class (:foreground "#6391aa"))))
+         `(rainbow-delimiters-depth-7-face ((,class (:foreground "#9d748f"))))
+         `(rainbow-delimiters-depth-8-face ((,class (:foreground "#7b88a5"))))
+         `(rainbow-delimiters-depth-9-face ((,class (:foreground "#659896"))))
+         )))
+
+(deftheme quark-solarized-dark "The dark variant of the Solarized colour theme")
+
+(solarized-with-color-variables
+  'dark 'quark-solarized-dark solarized-dark-color-palette-alist quark/solarized-faces)
+
+(provide-theme 'quark-solarized-dark)