Move faces definition to init.el

2 files changed, 43 insertions, 20 deletions

@@ -321,22 +321,6 @@ N spaces."
             (when (file-remote-p (buffer-file-name))
               (setq-local vc-handled-backends nil))))
 
-(add-hook 'after-init-hook
-          (defun after-init@emoji-font-setup ()
-            "Set up emoji fonts after init."
-            (run-with-idle-timer
-             1 nil (defun emoji-font-setup ()
-                     "Set up emoji fonts."
-                     (let ((ffl (font-family-list)))
-                       (dolist (font '("Noto Emoji" "Noto Color Emoji"
-                                       "Segoe UI Emoji" "Apple Color Emoji"
-                                       "FreeSans" "FreeMono" "FreeSerif"
-                                       "Unifont" "Symbola"))
-                         (when (member font (font-family-list))
-                           (set-fontset-font t 'symbol
-                                             (font-spec :family font)
-                                             nil :add))))))))
-
 ;;; Advice
 
 (define-advice switch-to-buffer (:after (&rest _) normal-mode)
@@ -8,13 +8,49 @@
 
 ;;; Built-ins
 
-(use-package emacs
+(use-package emacs                      ; Misc. config
+  :config
+  (setopt tab-bar-show 1))
+
+(use-package faces
   :custom-face
   (default ((t :family "Comic Code"
                :height 100)))
   (variable-pitch ((t :family "Comic Code")))
   :config
-  (setopt tab-bar-show 1))
+  ;; Emojis
+  (cl-loop with ffl = (font-family-list)
+           for font in '("Noto Emoji" "Noto Color Emoji"
+                         "Segoe UI Emoji" "Apple Color Emoji"
+                         "FreeSans" "FreeMono" "FreeSerif"
+                         "Unifont" "Symbola")
+           if (member font ffl)
+           do (set-fontset-font t 'symbol font))
+  ;; International scripts
+  (cl-loop with ffl = (font-family-list)
+           for (charset . font) in '((latin . "Noto Sans")
+                                     (han . "Noto Sans CJK SC Regular")
+                                     (kana . "Noto Sans CJK JP Regular")
+                                     (hangul . "Noto Sans CJK KR Regular")
+                                     (cjk-misc . "Noto Sans CJK KR Regular")
+                                     (khmer . "Noto Sans Khmer")
+                                     (lao . "Noto Sans Lao")
+                                     (burmese . "Noto Sans Myanmar")
+                                     (thai . "Noto Sans Thai")
+                                     (ethiopic . "Noto Sans Ethiopic")
+                                     (hebrew . "Noto Sans Hebrew")
+                                     (arabic . "Noto Sans Arabic")
+                                     (gujarati . "Noto Sans Gujarati")
+                                     (devanagari . "Noto Sans Devanagari")
+                                     (kannada . "Noto Sans Kannada")
+                                     (malayalam . "Noto Sans Malayalam")
+                                     (oriya . "Noto Sans Oriya")
+                                     (sinhala . "Noto Sans Sinhala")
+                                     (tamil . "Noto Sans Tamil")
+                                     (telugu . "Noto Sans Telugu")
+                                     (tibetan . "Noto Sans Tibetan"))
+           if (member font ffl)
+           do (set-fontset-font t charset font)))
 
 (use-package text-mode
   :config
@@ -330,8 +366,8 @@
           geiser-mode-hook geiser-repl-mode-hook)
   :config
   (keymap-set paredit-mode-map "C-j"
-              (defun +paredit-newline
-                  (interactive)
+              (defun +paredit-newline ()
+                (interactive)
                 (call-interactively
                  (if (derived-mode-p 'lisp-interaction-mode)
                      #'eval-print-last-sexp #'paredit-newline))))
@@ -443,6 +479,9 @@
                             "markdown"))
   (add-hook 'markdown-mode-hook #'visual-fill-column-mode))
 
+(use-package edit-indirect
+  :bind (("C-c '" . edit-indirect-region)))
+
 (use-package transpose-frame
   :ensure t
   :bind (("C-x 5 t" . transpose-frame)