diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 6200055..8a9b292 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -39,7 +39,71 @@ (when (memq window-system '(mac ns x)) (exec-path-from-shell-initialize)) -(require 'tobmacs-appearance) +;; ----------------------------------------------------------------- + + +(use-package ef-themes + :config + (setq ef-themes-headings + '((0 . (variable-pitch light 2.0)) + (1 . (variable-pitch light 1.5)) + (2 . (variable-pitch semibold 1.2)) + (t . (variable-pitch semibold 1.0)))) + (setq ef-themes-mixed-fonts t + ef-themes-variable-pitch-ui t) + (mapc #'disable-theme custom-enabled-themes) + (load-theme 'ef-winter :no-confirm)) + +(use-package fontaine + :config + (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 130) + (medium + :default-height 170) + (large + :default-weight semilight + :default-height 250 + :bold-weight extrabold) + (presentation + :default-weight semilight + :default-height 250 + :bold-weight extrabold) + (jumbo + :default-weight semilight + :default-height 300 + :bold-weight extrabold) + (t + :default-family "Iosevka Comfy" + :default-weight regular + :default-height 130 + :variable-pitch-family "Iosevka Comfy Duo" + :bold-weight bold + :italic-slant italic + :line-spacing 0.2))) + (fontaine-set-preset 'regular)) + +(use-package modus-themes + :config + (setq modus-themes-variable-pitch-headings t + modus-themes-org-blocks 'tinted-background + modus-themes-bold-constructs t + modus-themes-italic-constructs t + modus-themes-scale-headings t + modus-themes-completions 'opinionated + modus-themes-mode-line '(accented borderless))) + +(use-package rainbow-delimiters + :hook + ((emacs-lisp-mode . rainbow-delimiters-mode) + (clojure-mode . rainbow-delimiters-mode))) + (require 'tobmacs-completion) (require 'tobmacs-editor) (require 'tobmacs-languages) diff --git a/.emacs.d/modules/tobmacs-appearance.el b/.emacs.d/modules/tobmacs-appearance.el deleted file mode 100644 index 44a39dc..0000000 --- a/.emacs.d/modules/tobmacs-appearance.el +++ /dev/null @@ -1,64 +0,0 @@ -(use-package fontaine - :config - (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 130) - (medium - :default-height 170) - (large - :default-weight semilight - :default-height 250 - :bold-weight extrabold) - (presentation - :default-weight semilight - :default-height 250 - :bold-weight extrabold) - (jumbo - :default-weight semilight - :default-height 300 - :bold-weight extrabold) - (t - :default-family "Iosevka Comfy" - :default-weight regular - :default-height 130 - :variable-pitch-family "Iosevka Comfy Duo" - :bold-weight bold - :italic-slant italic - :line-spacing 0.2))) - (fontaine-set-preset 'regular)) - -(use-package ef-themes - :config - (setq ef-themes-headings - '((0 . (variable-pitch light 2.0)) - (1 . (variable-pitch light 1.5)) - (2 . (variable-pitch semibold 1.2)) - (t . (variable-pitch semibold 1.0)))) - (setq ef-themes-mixed-fonts t - ef-themes-variable-pitch-ui t) - (mapc #'disable-theme custom-enabled-themes) - (load-theme 'ef-winter :no-confirm)) - -(use-package modus-themes - :config - (setq modus-themes-variable-pitch-headings t - modus-themes-org-blocks 'tinted-background - modus-themes-bold-constructs t - modus-themes-italic-constructs t - modus-themes-scale-headings t - modus-themes-completions 'opinionated - modus-themes-mode-line '(accented borderless))) - -(use-package rainbow-delimiters - :hook - ((emacs-lisp-mode . rainbow-delimiters-mode) - (clojure-mode . rainbow-delimiters-mode))) - -(provide 'tobmacs-appearance) -