Port Modus settings to v2

2 files changed, 14 insertions, 11 deletions

diff --git a/.emacs b/.emacs
index ffb1c04..234df07 100644
--- a/.emacs
+++ b/.emacs
@@ -17,7 +17,20 @@
 (load custom-file)
 
 (when (>= emacs-major-version 28)
-  (load-theme 'modus-vivendi t))
+  (setq modus-themes-bold-constructs t
+        modus-themes-deuteranopia t
+        modus-themes-headings '((1 . (variable-pitch 1.2))
+                                (2 . (variable-pitch 1.15))
+                                (3 . (variable-pitch 1.1))
+                                (4 . (variable-pitch 1.05))
+                                (t . (variable-pitch)))
+        modus-themes-italic-constructs t
+        modus-themes-mixed-fonts t
+        modus-themes-org-blocks 'gray-background
+        modus-themes-prompts '(background)
+        modus-themes-region 'bg-only
+        modus-themes-variable-pitch-ui t)
+  (load-theme 'modus-vivendi))
 
 ;; Key bindings
 
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 6f11a44..6d3c8ed 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -74,16 +74,6 @@
  '(markdown-indent-on-enter 'indent-and-new-item)
  '(menu-bar-mode nil)
  '(minibuffer-depth-indicate-mode t)
- '(modus-themes-bold-constructs t)
- '(modus-themes-diffs 'deuteranopia)
- '(modus-themes-italic-constructs t)
- '(modus-themes-mixed-fonts t)
- '(modus-themes-org-blocks 'grayscale)
- '(modus-themes-prompts '(background))
- '(modus-themes-region 'bg-only)
- '(modus-themes-scale-headings t)
- '(modus-themes-variable-pitch-headings t)
- '(modus-themes-variable-pitch-ui t)
  '(org-edit-src-content-indentation 0)
  '(org-ellipsis "…")
  '(org-fontify-done-headline nil)