From 445e7db5e419a45e51923f665eef81ba8060ff08 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Fri, 27 Jan 2023 08:49:29 +0100
Subject: [PATCH] Appearance

---
 .emacs.d/init.el                       | 16 +------
 .emacs.d/modules/tobmacs-appearance.el | 59 ++++++++++++++++++++++++++
 .emacs.d/modules/tobmacs-editor.el~    | 48 ---------------------
 3 files changed, 61 insertions(+), 62 deletions(-)
 create mode 100644 .emacs.d/modules/tobmacs-appearance.el
 delete mode 100644 .emacs.d/modules/tobmacs-editor.el~

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 24167ac..6200055 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -12,22 +12,8 @@
 (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
 (load custom-file 'noerror)
 
-(set-face-attribute 'default nil :font "Iosevka Comfy" :height 140)
-(set-face-attribute 'variable-pitch nil :font "Iosevka" :height 140)
-(setq-default line-spacing 0.2)
-
 (add-to-list 'native-comp-eln-load-path (expand-file-name "eln-cache/" user-emacs-directory))
 
-(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))
-
-(load-theme 'modus-vivendi)
-
 (setq package-archives
       '(("elpa" . "https://elpa.gnu.org/packages/")
         ("elpa-devel" . "https://elpa.gnu.org/devel/")
@@ -53,8 +39,10 @@
 (when (memq window-system '(mac ns x))
   (exec-path-from-shell-initialize))
 
+(require 'tobmacs-appearance)
 (require 'tobmacs-completion)
 (require 'tobmacs-editor)
 (require 'tobmacs-languages)
 (require 'tobmacs-org)
 (require 'tobmacs-vc)
+
diff --git a/.emacs.d/modules/tobmacs-appearance.el b/.emacs.d/modules/tobmacs-appearance.el
new file mode 100644
index 0000000..d70dba3
--- /dev/null
+++ b/.emacs.d/modules/tobmacs-appearance.el
@@ -0,0 +1,59 @@
+(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)))
+
+(provide 'tobmacs-appearance)
+
diff --git a/.emacs.d/modules/tobmacs-editor.el~ b/.emacs.d/modules/tobmacs-editor.el~
deleted file mode 100644
index 930bbfd..0000000
--- a/.emacs.d/modules/tobmacs-editor.el~
+++ /dev/null
@@ -1,48 +0,0 @@
-inq(setq-default indent-tabs-mode nil)
-
-(add-hook 'prog-mode-hook 'mac-auto-operator-composition-mode)
-
-(use-package emacs
-  :config
-  (global-auto-revert-mode)
-  (minibuffer-electric-default-mode 1)
-  
-  (setq isearch-allow-motion t
-        sentence-end-double-space nil
-        backup-directory-alist `((".*" . ,temporary-file-directory))
-        auto-save-file-name-transforms `((".*" ,temporary-file-directory t))
-        delete-by-moving-to-trash t
-        tab-bar-show nil
-        tab-bar-new-tab-choice "*scratch*"))
-   
-
-(use-package ef-themes)
-
-(use-package parinfer-rust-mode
-  :hook (emacs-lisp-mode clojure-mode)
-  :init
-  (setq parinfer-rust-library (expand-file-name
-                               "parinfer-rust/parinfer-rust-darwin.so"
-                               user-emacs-directory)))
-
-(use-package electric
-  :hook swift-mode)
-
-(use-package rainbow-delimiters)
-
-(use-package flycheck
-  :init
-  (global-flycheck-mode))
-
-(use-package avy
-  :bind
-  ("M-j" . 'avy-goto-char-timer))
-
-(use-package dumb-jump
-  :config
-  (add-hook 'xref-backend-functions #'dumb-jump-xref-activate)
-  (setq xref-show-definitions-function #'xref-show-definitions-completing-read))
-
-(provide 'tobmacs-editor)
-
-