ensure package, remove obsolete function calls

3 files changed, 2 insertions, 17 deletions

diff --git a/bard-elisp/bard-theme.el b/bard-elisp/bard-theme.el
index f006a18..ce491c2 100644
--- a/bard-elisp/bard-theme.el
+++ b/bard-elisp/bard-theme.el
@@ -38,11 +38,6 @@
          :default-family "Monaco"
          :variable-pitch-family "Monaco"
          :fixed-pitch-family "Monaco")
-        (bit
-         :default-height 140
-         :default-family "Ttyp0 OTB"
-         :variable-pitch-family "Ttyp0 OTB"
-         :fixed-pitch-family "Ttyp0 OTB")
         (large
          :inherit default
          :default-height 160)
@@ -66,7 +61,6 @@
   "Hook that runs after a new theme is loaded using `bard/select-theme`.")
 
 (dolist (hook '(bard/after-theme-load-hook))
-  (add-hook hook #'fontaine-apply-current-preset)
   (add-hook hook #'logos-update-fringe-in-buffers))
 
 (defun bard/select-theme (&optional theme)
diff --git a/bard-emacs-modules/bard-emacs-theme.el b/bard-emacs-modules/bard-emacs-theme.el
index beacc09..965baad 100644
--- a/bard-emacs-modules/bard-emacs-theme.el
+++ b/bard-emacs-modules/bard-emacs-theme.el
@@ -10,7 +10,7 @@
   (bard/select-theme 'doom-gruvbox))
 
 (use-package fontaine
-  :ensure nil
+  :ensure t
   :config
   ;; save file
   (setq fontaine-latest-state-file
@@ -22,10 +22,6 @@
   ;; The other side of `fontaine-restore-latest-preset'.
   (add-hook 'kill-emacs-hook #'fontaine-store-latest-preset)
 
-  ;; preserve fonts when switching themes
-  (dolist (hook '(modus-themes-after-load-theme-hook ef-themes-post-load-hook))
-    (add-hook hook #'fontaine-apply-current-preset))
-
   (define-key global-map (kbd "C-c f") #'fontaine-set-preset))
 
 (use-package rainbow-mode
diff --git a/config.org b/config.org
index c98e2a2..919746e 100644
--- a/config.org
+++ b/config.org
@@ -1650,7 +1650,7 @@ For a long time I really struggled with Emacs tab completion. It still only kind
 *** Fonts
 #+begin_src emacs-lisp :tangle bard-emacs-modules/bard-emacs-theme.el :mkdirp yes
   (use-package fontaine
-    :ensure nil
+    :ensure t
     :config
     ;; save file
     (setq fontaine-latest-state-file
@@ -1662,10 +1662,6 @@ For a long time I really struggled with Emacs tab completion. It still only kind
     ;; The other side of `fontaine-restore-latest-preset'.
     (add-hook 'kill-emacs-hook #'fontaine-store-latest-preset)
 
-    ;; preserve fonts when switching themes
-    (dolist (hook '(modus-themes-after-load-theme-hook ef-themes-post-load-hook))
-      (add-hook hook #'fontaine-apply-current-preset))
-
     (define-key global-map (kbd "C-c f") #'fontaine-set-preset))
 #+end_src
 
@@ -3921,7 +3917,6 @@ Explanation provided by [[https://tatsumoto-ren.github.io/blog/japanese-fonts.ht
     "Hook that runs after a new theme is loaded using `bard/select-theme`.")
 
   (dolist (hook '(bard/after-theme-load-hook))
-    (add-hook hook #'fontaine-apply-current-preset)
     (add-hook hook #'logos-update-fringe-in-buffers))
 
   (defun bard/select-theme (&optional theme)