theme + modeline: adapt to the update of modus-themes

* modeline.el: Basically adjust colors to fit the new theme.

* theme.el (modus-themes-headings): Make the headings ultra-bold.

(modus-themes-after-load-theme-hook, durand-custom-face): To change
the mode-line face via a hook.

(modus-vivendi-tinted, modus-vivendi): I use the un-tinted version
now.

1 files changed, 47 insertions, 9 deletions

diff --git a/theme.el b/theme.el
index b9c8d34..5b42c7e 100644
--- a/theme.el
+++ b/theme.el
@@ -16,11 +16,22 @@
            ;; borders
            ;; (list 'border-mode-line-active 'bg-mode-line-active)
            ;; (list 'border-mode-line-inactive 'bg-mode-line-inactive)
+           ;; subtle line numbers
+           (list 'bg-line-number-inactive 'bg-dim)
+           (list 'fg-line-number-inactive 'fg-dim)
+           (list 'bg-line-number-active 'bg-main)
+           (list 'fg-line-number-active 'fg-main)
+           ;; comment
+           (list 'comment 'yellow-faint)
            ;; blue cursor
-           (list 'cursor 'blue-cooler)
-           ;; headings
+           (list 'cursor 'fg-main)
            ;; I prefer the old color for heading 1
-           (list 'heading-1 "#b6a0ff")
+           (list 'fg-heading-1 "#b6a0ff")
+           ;; link background and bold
+           (list 'bg-link 'bg-dim)
+           (list 'bg-link-visited 'bg-cyan-nuanced)
+           (list 'bg-link-symbolic 'bg-red-nuanced)
+           (list 'underline-link t)
            ;; Trying to imitate the old line numbers color
            (list 'fg-line-number-active 'blue-warmer)))))
  (list "modus-vivendi" "modus-vivendi-tinted"))
@@ -35,11 +46,11 @@
 (setq modus-themes-headings
       (list
        (list 0 'variable-pitch 'ultrabold 1.3)
-       (list 1 1.05 'variable-pitch)
-       (list 2 1.1 'variable-pitch)
-       (list 3 1.15 'variable-pitch)
-       (list 4 1.2 'variable-pitch)
-       (list 5 1.3 'variable-pitch)
+       (list 1 1.05 'variable-pitch 'ultrabold)
+       (list 2 1.1 'variable-pitch 'extrabold)
+       (list 3 1.15 'variable-pitch 'extrabold)
+       (list 4 1.2 'variable-pitch 'bold)
+       (list 5 1.3 'variable-pitch 'bold)
        (list 'agenda-date 'ultrabold)
        (list 'agenda-structure 'variable-pitch 'ultrabold)))
 
@@ -95,10 +106,37 @@
 
 ;; (setq modus-themes-mode-line '(3d borderless padded))
 
+;; To change the mode-line face via a hook.
+
+(defun durand-custom-face (&rest _args)
+  "Change appearances of some themes."
+  (modus-themes-with-colors
+    (custom-set-faces
+     (list 'mode-line
+           (list
+            (list
+             t
+             :box (list :line-width 4
+                        :color bg-mode-line-active
+                        :style 'released-button)
+             :background bg-mode-line-active
+             :foreground fg-mode-line-active)))
+     (list 'mode-line-inactive
+           (list
+            (list
+             t
+             :box (list :line-width 4
+                        :color bg-mode-line-inactive
+                        :style 'released-button)
+             :background bg-mode-line-inactive
+             :foreground fg-mode-line-inactive))))))
+
+(remove-hook 'modus-themes-after-load-theme-hook #'durand-custom-face)
+
 ;;;; Links
 ;; Fine, but I cannot set the background color now?
 ;; (setq modus-themes-links '(background bold))
 
 ;;; Load the theme
 
-(modus-themes-load-theme 'modus-vivendi-tinted)
+(modus-themes-load-theme 'modus-vivendi)