about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2023-01-09 12:53:57 -0600
committerCase Duckworth2023-01-09 12:53:57 -0600
commit93e8ed10b9edd7e589c9233bc950638294a6ffcb (patch)
tree09af637049f0e94c734ec30ab26d0230884671c1
parentmyeahhhhhh (diff)
downloademacs-93e8ed10b9edd7e589c9233bc950638294a6ffcb.tar.gz
emacs-93e8ed10b9edd7e589c9233bc950638294a6ffcb.zip
Move faces definition to init.el
-rw-r--r--basics.el16
-rw-r--r--init.el47
2 files changed, 43 insertions, 20 deletions
diff --git a/basics.el b/basics.el index 4e9e0a9..1f64522 100644 --- a/basics.el +++ b/basics.el
@@ -321,22 +321,6 @@ N spaces."
321 (when (file-remote-p (buffer-file-name)) 321 (when (file-remote-p (buffer-file-name))
322 (setq-local vc-handled-backends nil)))) 322 (setq-local vc-handled-backends nil))))
323 323
324(add-hook 'after-init-hook
325 (defun after-init@emoji-font-setup ()
326 "Set up emoji fonts after init."
327 (run-with-idle-timer
328 1 nil (defun emoji-font-setup ()
329 "Set up emoji fonts."
330 (let ((ffl (font-family-list)))
331 (dolist (font '("Noto Emoji" "Noto Color Emoji"
332 "Segoe UI Emoji" "Apple Color Emoji"
333 "FreeSans" "FreeMono" "FreeSerif"
334 "Unifont" "Symbola"))
335 (when (member font (font-family-list))
336 (set-fontset-font t 'symbol
337 (font-spec :family font)
338 nil :add))))))))
339
340;;; Advice 324;;; Advice
341 325
342(define-advice switch-to-buffer (:after (&rest _) normal-mode) 326(define-advice switch-to-buffer (:after (&rest _) normal-mode)
diff --git a/init.el b/init.el index c3c2f49..95a022e 100644 --- a/init.el +++ b/init.el
@@ -8,13 +8,49 @@
8 8
9;;; Built-ins 9;;; Built-ins
10 10
11(use-package emacs 11(use-package emacs ; Misc. config
12 :config
13 (setopt tab-bar-show 1))
14
15(use-package faces
12 :custom-face 16 :custom-face
13 (default ((t :family "Comic Code" 17 (default ((t :family "Comic Code"
14 :height 100))) 18 :height 100)))
15 (variable-pitch ((t :family "Comic Code"))) 19 (variable-pitch ((t :family "Comic Code")))
16 :config 20 :config
17 (setopt tab-bar-show 1)) 21 ;; Emojis
22 (cl-loop with ffl = (font-family-list)
23 for font in '("Noto Emoji" "Noto Color Emoji"
24 "Segoe UI Emoji" "Apple Color Emoji"
25 "FreeSans" "FreeMono" "FreeSerif"
26 "Unifont" "Symbola")
27 if (member font ffl)
28 do (set-fontset-font t 'symbol font))
29 ;; International scripts
30 (cl-loop with ffl = (font-family-list)
31 for (charset . font) in '((latin . "Noto Sans")
32 (han . "Noto Sans CJK SC Regular")
33 (kana . "Noto Sans CJK JP Regular")
34 (hangul . "Noto Sans CJK KR Regular")
35 (cjk-misc . "Noto Sans CJK KR Regular")
36 (khmer . "Noto Sans Khmer")
37 (lao . "Noto Sans Lao")
38 (burmese . "Noto Sans Myanmar")
39 (thai . "Noto Sans Thai")
40 (ethiopic . "Noto Sans Ethiopic")
41 (hebrew . "Noto Sans Hebrew")
42 (arabic . "Noto Sans Arabic")
43 (gujarati . "Noto Sans Gujarati")
44 (devanagari . "Noto Sans Devanagari")
45 (kannada . "Noto Sans Kannada")
46 (malayalam . "Noto Sans Malayalam")
47 (oriya . "Noto Sans Oriya")
48 (sinhala . "Noto Sans Sinhala")
49 (tamil . "Noto Sans Tamil")
50 (telugu . "Noto Sans Telugu")
51 (tibetan . "Noto Sans Tibetan"))
52 if (member font ffl)
53 do (set-fontset-font t charset font)))
18 54
19(use-package text-mode 55(use-package text-mode
20 :config 56 :config
@@ -330,8 +366,8 @@
330 geiser-mode-hook geiser-repl-mode-hook) 366 geiser-mode-hook geiser-repl-mode-hook)
331 :config 367 :config
332 (keymap-set paredit-mode-map "C-j" 368 (keymap-set paredit-mode-map "C-j"
333 (defun +paredit-newline 369 (defun +paredit-newline ()
334 (interactive) 370 (interactive)
335 (call-interactively 371 (call-interactively
336 (if (derived-mode-p 'lisp-interaction-mode) 372 (if (derived-mode-p 'lisp-interaction-mode)
337 #'eval-print-last-sexp #'paredit-newline)))) 373 #'eval-print-last-sexp #'paredit-newline))))
@@ -443,6 +479,9 @@
443 "markdown")) 479 "markdown"))
444 (add-hook 'markdown-mode-hook #'visual-fill-column-mode)) 480 (add-hook 'markdown-mode-hook #'visual-fill-column-mode))
445 481
482(use-package edit-indirect
483 :bind (("C-c '" . edit-indirect-region)))
484
446(use-package transpose-frame 485(use-package transpose-frame
447 :ensure t 486 :ensure t
448 :bind (("C-x 5 t" . transpose-frame) 487 :bind (("C-x 5 t" . transpose-frame)