diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 1536424..309c34f 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -279,38 +279,32 @@ (use-package fontaine :config + (setq-default text-scale-remap-header-line t) (setq fontaine-presets - '((tiny - :default-family "Iosevka Comfy Wide Fixed" - :default-height 70) - (small - :default-family "Iosevka Comfy Fixed" - :default-height 90) - (regular - :default-height 140) - (medium - :default-height 170) - (large - :default-weight semilight - :default-height 250 - :bold-weight extrabold) + '((regular) (presentation :default-weight semilight - :default-height 250 - :bold-weight extrabold) - (jumbo - :default-weight semilight - :default-height 300 - :bold-weight extrabold) + :default-height 250) (t :default-family "Iosevka Comfy" :default-weight regular :default-height 130 - :variable-pitch-family "Iosevka Comfy Duo" + :fixed-pitch-height 1.0 + :fixed-pitch-serif-height 1.0 + :variable-pitch-family "Iosevka Comfy Motion Duo" + :variable-pitch-height 1.0 :bold-weight bold :italic-slant italic - :line-spacing 0.25))) - (fontaine-set-preset 'regular)) + :line-spacing 0.2))) + (add-hook 'kill-emacs-hook #'fontaine-store-latest-preset) + (dolist (hook '(modus-themes-after-load-theme-hook ef-themes-post-load-hook)) + (add-hook hook #'fontaine-apply-current-preset)) + (dolist (hook '(text-mode-hook help-mode-hook)) + (add-hook hook (lambda () + (unless (or (derived-mode-p 'mhtml-mode 'nxml-mode 'yaml-mode) + (member (buffer-name) '("*Colors*" "*Faces*" "*Quick Help*"))) + (variable-pitch-mode))))) + (fontaine-set-preset (or (fontaine-restore-latest-preset) 'regular))) (use-package git-gutter :after ef-themes