theme: adapt to the version 4 upgrade of modus-themes

1 files changed, 98 insertions, 67 deletions

diff --git a/theme.el b/theme.el
index da92f1e..b9c8d34 100644
--- a/theme.el
+++ b/theme.el
@@ -1,73 +1,104 @@
 ;;; theme
 
-(setq modus-themes-syntax '(yellow-comments))
+(use-package "protesilaos/modus-themes" 'modus-themes)
+
+;;; No fringe
+
+(fringe-mode 0)
+
+;;; palette
+
+(mapc
+ (lambda (theme)
+   (let ((symbol (intern (format "%s-palette-overrides" theme))))
+     (set symbol
+          (list
+           ;; borders
+           ;; (list 'border-mode-line-active 'bg-mode-line-active)
+           ;; (list 'border-mode-line-inactive 'bg-mode-line-inactive)
+           ;; blue cursor
+           (list 'cursor 'blue-cooler)
+           ;; headings
+           ;; I prefer the old color for heading 1
+           (list 'heading-1 "#b6a0ff")
+           ;; Trying to imitate the old line numbers color
+           (list 'fg-line-number-active 'blue-warmer)))))
+ (list "modus-vivendi" "modus-vivendi-tinted"))
+
+;;; converted settings
+(setq modus-themes-region (list 'bg-only))
+
+;; It seems the default style already has rainbow effect.  Let's see
+;; what will happen.
+;;
+;; But agenda settings are transferred here.
+(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 'agenda-date 'ultrabold)
+       (list 'agenda-structure 'variable-pitch 'ultrabold)))
+
+;; (setq modus-themes-org-agenda
+;;       '((header-block . (variable-pitch scale-title))
+;;         (header-date . (gray-scale))
+;;         (scheduled . rainbow)
+;;         ()))
+
+;; (setq modus-themes-scale-headings t)
+;; (setq modus-themes-scale-1 1.05)
+;; (setq modus-themes-scale-2 1.1)
+;; (setq modus-themes-scale-3 1.15)
+;; (setq modus-themes-scale-4 1.2)
+;; (setq modus-themes-scale-5 1.3)
+
+;; (setq modus-themes-variable-pitch-headings t)
+
+;; Comment
+;; 
+;; This is fine, as the new comment color already looks good.
+;; (setq modus-themes-syntax '(yellow-comments))
+
+;; HL-LINE
+;; 
+;; This does not seem to have a big difference.
+
+;; (setq modus-themes-hl-line '(intense accented))
+
+;; Subtle line numbers
+;; I try to imitate this effect by setting the palette, but am not
+;; satisfied.
+;; 
+;; (setq modus-themes-subtle-line-numbers t)
+
+;;; I like the default style
+(setq modus-themes-completions nil)
+
+;;; Glad these options remain
 (setq modus-themes-bold-constructs t)
-(setq modus-themes-slanted-constructs t)
-(setq modus-themes-mode-line '(3d borderless padded))
-(setq modus-themes-hl-line '(intense accented))
+(setq modus-themes-italic-constructs t)
 (setq modus-themes-org-blocks 'gray-background)
+(setq modus-themes-variable-pitch-ui nil)
 
-(setq modus-themes-subtle-line-numbers t)
-(setq modus-themes-region nil)
-(setq modus-themes-links '(background bold))
-                                        ; Try it out
-(setq modus-themes-headings '((t . rainbow)))
-
-(setq modus-themes-org-agenda
-      '((header-block . (variable-pitch scale-title))
-        (header-date . (gray-scale))
-        (scheduled . rainbow)
-        ()))
-
-(setq modus-themes-scale-headings t)
-(setq modus-themes-scale-1 1.05)
-(setq modus-themes-scale-2 1.1)
-(setq modus-themes-scale-3 1.15)
-(setq modus-themes-scale-4 1.2)
-(setq modus-themes-scale-5 1.3)
+;;; How to convert these settings?
 
-(setq modus-themes-variable-pitch-ui nil)
-(setq modus-themes-variable-pitch-headings t)
-
-(use-package "protesilaos/modus-themes" 'modus-vivendi-theme
-  (load-theme 'modus-vivendi t))
-
-;;; Archives
-
-;; (setq modus-vivendi-theme-slanted-constructs t
-;;       modus-vivendi-theme-bold-constructs t
-;;       ;; modus-vivendi-theme-3d-modeline t
-;;       modus-vivendi-theme-mode-line '3d
-;;       modus-vivendi-theme-diffs nil
-;;       modus-vivendi-theme-completions nil
-;;       modus-vivendi-theme-org-blocks 'rainbow
-;;       modus-vivendi-theme-rainbow-org-src-blocks t
-;;       modus-vivendi-theme-variable-pitch-headings t
-;;       modus-vivendi-theme-headings '((t . rainbow))
-;;       ;; modus-vivendi-theme-rainbow-headings t
-;;       ;; modus-vivendi-theme-section-headings t
-;;       modus-vivendi-theme-scale-headings t
-;;       modus-vivendi-theme-scale-1 1.05
-;;       modus-vivendi-theme-scale-2 1.1
-;;       modus-vivendi-theme-scale-3 1.15
-;;       modus-vivendi-theme-scale-4 1.2
-;;       modus-vivendi-theme-scale-5 1.3)
-
-;; (setq modus-operandi-theme-slanted-constructs t
-;;       modus-operandi-theme-bold-constructs t
-;;       ;; modus-operandi-theme-3d-modeline t
-;;       modus-operandi-theme-mode-line '3d
-;;       modus-operandi-theme-diffs nil
-;;       modus-operandi-theme-completions nil
-;;       modus-operandi-theme-org-blocks 'rainbow
-;;       modus-operandi-theme-rainbow-org-src-blocks t
-;;       modus-operandi-theme-variable-pitch-headings t
-;;       modus-operandi-theme-headings '((t . rainbow))
-;;       ;; modus-operandi-theme-rainbow-headings t
-;;       ;; modus-operandi-theme-section-headings t
-;;       modus-operandi-theme-scale-headings t
-;;       modus-operandi-theme-scale-1 1.05
-;;       modus-operandi-theme-scale-2 1.1
-;;       modus-operandi-theme-scale-3 1.15
-;;       modus-operandi-theme-scale-4 1.2
-;;       modus-operandi-theme-scale-5 1.3)
+;;;; Mode-line
+;; I can delete the mode line border via the palette.
+;;
+;; But I am not sure about the 3d effect.
+;;
+;; I am not sure about the padding either.
+
+;; (setq modus-themes-mode-line '(3d borderless padded))
+
+;;;; 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)