2 files changed, 30 insertions, 20 deletions
diff --git a/.gitignore b/.gitignore
index d6e7fbd..02cbcf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /bookmarks
 /savehist
 /lisp/
+/.org-id-locations
diff --git a/config/init-ui.el b/config/init-ui.el
index b12c84b..01b1bdd 100644
--- a/config/init-ui.el
+++ b/config/init-ui.el
@@ -51,32 +51,41 @@
                              ("Europe/London" "London")
                              ("Europe/Paris" "Paris")))
 
-(use-package ef-themes
+(use-package modus-themes
   :ensure t
   :init
-  (add-hook 'ef-themes-post-load-hook #'my-ef-themes-mode-line)
-  :preface
-  (defun my-ef-themes-mode-line ()
-    "Tweak the style of the mode lines."
-    (ef-themes-with-colors
-      (custom-set-faces
-       `(mode-line ((,c :background ,bg-active :foreground ,fg-main :box (:line-width 1 :color ,fg-dim))))
-       `(mode-line-inactive ((,c :box (:line-width 1 :color ,bg-active)))))))
+  (load-theme 'modus-operandi-tinted t)
   :custom
-  (ef-themes-region '(intense no-extend neutral))
-  (ef-themes-disable-other-themes t)
-  (ef-themes-to-toggle '(ef-melissa-light ef-owl))
-  :init
-  (ef-themes-select 'ef-owl))
+  (modus-themes-italic-constructs t)
+  (modus-themes-bold-constructs t)
+
+  (modus-themes-mixed-fonts t)
+  (modus-themes-variable-pitch-ui t)
+
+  (modus-themes-completions
+      '((matches . (extrabold))
+        (selection . (semibold italic text-also))))
+
+  (modus-themes-custom-auto-reload t)
+
+  (modus-themes-disable-other-themes t)
+
+  (modus-themes-prompts '(italic bold))
+  (modus-themes-region '(bg-only))
+  (modus-themes-syntax '(green-strings))
+
+  (modus-themes-paren-match '(bold))
+
+  (modus-themes-headings '((t . (bold rainbow))))
+  (modus-themes-scale-headings t)
+
+  (modus-themes-to-toggle
+   '(modus-operandi-tinted modus-vivendi-tritanopia)))
 
 ;; | 数字 | アルファベット | 日本語 | 絵文字 |
 ;; | 0123 | abcdefghijklmn | あいう | 🍎🍎🍎 |
-(set-face-attribute 'default nil :family "Source Code Pro" :height 150)
-
-(set-fontset-font t 'japanese-jisx0208 '("Osaka"))
-(set-fontset-font t 'symbol '("Apple Color Emoji"))
-(setq face-font-rescale-alist '(("Osaka" . 1.2)
-                                ("Apple Color Emoji" . 0.8)))
+(set-face-attribute 'default        nil :family "Source Code Pro" :height 160)
+(set-face-attribute 'variable-pitch nil :family "Go Mono" :height 160)
 
 (provide 'init-ui)
 ;;; init-ui.el ends here