ref(ui): switch back to simpler themes/fonts

I prefer the simplicity of Source Code Pro as a font, it's less fancy
but also more readable to me.

I also can't get used to variable pitch for org-mode, I still prefer a
monospace font.

Change-Id: If174c656309ee29fa80e1610571ff711ed9de6a3

3 files changed, 4 insertions, 36 deletions

diff --git a/emacs/custom/my-org.el b/emacs/custom/my-org.el
index b40c3f8..f49bc6b 100644
--- a/emacs/custom/my-org.el
+++ b/emacs/custom/my-org.el
@@ -17,7 +17,6 @@
 (add-hook 'org-mode-hook 'org-indent-mode)
 (add-hook 'org-mode-hook 'org-hide-block-all)
 (add-hook 'org-mode-hook 'visual-line-mode)
-(add-hook 'org-mode-hook 'variable-pitch-mode)
 (add-hook 'org-capture-after-finalize-hook 'org-save-all-org-buffers)
 (add-hook 'org-capture-prepare-finalize-hook 'org-save-all-org-buffers)
 
diff --git a/emacs/custom/my-packages.el b/emacs/custom/my-packages.el
index 87d15d9..da5263b 100644
--- a/emacs/custom/my-packages.el
+++ b/emacs/custom/my-packages.el
@@ -7,9 +7,6 @@
 
 (require 'straight)
 
-;; packages related to themes
-(straight-use-package 'ef-themes)
-
 ;; packages needed for LSP
 (straight-use-package 'eglot)
 
diff --git a/emacs/custom/my-ui.el b/emacs/custom/my-ui.el
index 9dc0802..2acf1f7 100644
--- a/emacs/custom/my-ui.el
+++ b/emacs/custom/my-ui.el
@@ -21,8 +21,7 @@
     (setq mac-allow-anti-aliasing t)))
 
 (when (memq window-system '(x pgtk))
-  (set-face-attribute 'default nil :font "Iosevka Term Extended" :height 130)
-  (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height 130)
+  (set-face-attribute 'default nil :font "Source Code Pro" :height 130)
   ;; this is a fall back in the case we have Unicode characters.
   ;; For example, with this settings, the following source is
   ;; rendered correctly 😇 😀 and 🤢
@@ -38,41 +37,14 @@
         modus-themes-italic-constructs t
         modus-themes-lang-checkers '(background)
         modus-themes-org-blocks 'gray-background
+        modus-themes-variable-pitch-ui nil
         modus-themes-headings '((1 . (background 1))
                                 (2 . (rainbow semibold 1))
                                 (t . (bold)))
         modus-themes-completions '((matches   . (extrabold intense))
                                    (selection . (semibold  intense))
-                                   (popup     . (extrabold intense)))
-        modus-themes-operandi-color-overrides '((bg-main . "#f2efe4"))))
-
-(eval-and-compile
-  (require 'ef-themes)
-  (setq ef-themes-to-toggle '(ef-duo-light ef-duo-dark))
-  ;; set the typeface for headers
-  (setq ef-themes-headings
-      '((0 . (variable-pitch bold 1.4))
-        (1 . (variable-pitch bold 1.3))
-        (2 . (variable-pitch regular 1.2))
-        (3 . (variable-pitch italic 1.1))
-        (t . (variable-pitch 1.1))))
-
-  ;; enable using variable pitch fonts for some part of the UI
-  (setq ef-themes-mixed-fonts t
-        ef-themes-variable-pitch-ui t)
-
-  ;; Read the doc string or manual for this one.  The symbols can be
-  ;; combined in any order.
-  (setq ef-themes-region '(intense no-extend neutral))
-
-  ;; Disable all other themes to avoid awkward blending:
-  (mapc #'disable-theme custom-enabled-themes)
-
-  ;; Load the theme of choice:
-  (load-theme 'ef-duo-light :no-confirm)
-
-  ;; OR use this to load the theme which also calls `ef-themes-post-load-hook':
-  (ef-themes-select 'ef-duo-light))
+                                   (popup     . (extrabold intense))))
+  (load-theme 'modus-operandi t))
 
 (customize-set-variable 'display-time-24hr-format t)
 (customize-set-variable 'display-time-day-and-date t)