Whitespace etc.

1 files changed, 86 insertions, 73 deletions

@@ -9,58 +9,71 @@
 ;;; Built-ins
 
 (use-package emacs                      ; Misc. config
-  :custom-face
-  (fixed-pitch ((t :family ,(find-font "Comic Code"
-                                       "DejaVu Sans Mono")
-                   :height 100)))
-  (variable-pitch ((t :family ,(find-font "Atkinson Hyperlegible"
-                                          "DejaVu Serif")
-                      :height 1.4)))
-  (default ((t :family ,(find-font "Comic Code"
-                                   "DejaVu Sans Mono")
-               :height 100)))
-  (font-lock-comment-face ((t :slant italic)))
   :config
   (setopt tab-bar-show 1
-          recenter-positions '(top middle bottom))
-  (keymap-global-unset "C-\\"))
+          recenter-positions '(top middle bottom)
+          initial-scratch-message
+          (mapconcat (lambda (s) (format ";; %s" s))
+                     (process-lines "fortune")
+                     "\n"))
+  (keymap-global-unset "C-\\")
+  (add-hook 'kill-buffer-query-functions
+            (defun scratch@immortal ()
+              (if (equal (buffer-name) "*scratch*")
+                  (progn (bury-buffer) nil)
+                t))))
 
 (use-package faces
-  :defer 2                              ; This is sort of expensive
   :config
-  ;; 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)))
+  (add-hook 'server-after-make-frame-hook
+            (defun first-frame@set-fonts ()
+              (face-spec-set 'fixed-pitch
+                             `((t :family ,(find-font "Comic Code"
+                                                      "DejaVu Sans Mono")
+                                  :height 100)))
+              (face-spec-set 'variable-pitch
+                             `((t :family ,(find-font "Atkinson Hyperlegible"
+                                                      "DejaVu Serif")
+                                  :height 1.4)))
+              (face-spec-set 'default
+                             `((t :family ,(find-font "Comic Code"
+                                                      "DejaVu Sans Mono")
+                                  :height 100)))
+              (face-spec-set 'font-lock-comment-face
+                             `((t :slant italic)))
+              ;; 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
@@ -71,11 +84,11 @@
   (add-hook 'prog-mode-hook #'auto-fill-mode)
   (add-hook 'prog-mode-hook
             (defun prog@indent-tabs-maybe ()
-              (indent-tabs-mode
+              (indent-tabs-mode
                (if (derived-mode-p 'emacs-lisp-mode
-                                   'python-mode
-                                   'haskell-mode)
-                   -1 1)))))
+                                   'python-mode
+                                   'haskell-mode)
+                   -1 1)))))
 
 (use-package eshell
   :preface
@@ -201,15 +214,15 @@
   :after custom-allowed
   :config
   (add-hook 'custom-allowed-after-load-hook
-            (defun dawn-modus ()
-              (dawn-schedule-themes 'modus-operandi
+            (defun dawn-modus ()
+              (dawn-schedule-themes 'modus-operandi
                                     'modus-vivendi))))
 
 (use-package electric-cursor
   :load-path "~/src/emacs/electric-cursor/"
   :config
   (setopt electric-cursor-alist '((overwrite-mode . box)
-                                  (t . bar)))
+                                  (t . bar)))
   (electric-cursor-mode))
 
 (use-package mode-line-bell
@@ -378,10 +391,10 @@ With prefix ARG, toggle the value of
   (define-advice load-theme (:after (&rest _) mlscroll)
     (mlscroll-mode -1)
     (when (seq-intersection '(modus-vivendi modus-operandi)
-                            custom-enabled-themes)
+                            custom-enabled-themes)
       (modus-themes-with-colors
-        (setq mlscroll-in-color fg-dim
-              mlscroll-out-color bg-inactive)))
+        (setq mlscroll-in-color fg-dim
+              mlscroll-out-color bg-inactive)))
     (run-with-idle-timer 1 nil #'mlscroll-mode))
   :config
   (load-theme@mlscroll))
@@ -399,8 +412,8 @@ With prefix ARG, toggle the value of
   :config
   (setopt ws-butler-trim-predicate
           (lambda (begin end)
-            (not (eq 'font-lock-string-face
-                     (get-text-property end 'face)))))
+            (not (eq 'font-lock-string-face
+                     (get-text-property end 'face)))))
   (ws-butler-global-mode))
 
 (use-package wgrep
@@ -408,16 +421,16 @@ With prefix ARG, toggle the value of
   :config
   (setopt wgrep-enable-key (kbd "C-x C-q"))
   :bind (:map grep-mode-map
-              ("C-x C-q" . wgrep-change-to-wgrep-mode)))
+              ("C-x C-q" . wgrep-change-to-wgrep-mode)))
 
 (use-package avy
   :ensure t
   :init
   (setopt avy-background t
-          avy-keys (string-to-list "asdfghjklqwertyuiopzxcvbnm"))
+          avy-keys (string-to-list "asdfghjklqwertyuiopzxcvbnm"))
   :bind (("M-j" . avy-goto-char-timer)
-         :map isearch-mode-map
-         ("M-j" . avy-isearch)))
+         :map isearch-mode-map
+         ("M-j" . avy-isearch)))
 
 (use-package zzz-to-char
   :ensure t
@@ -426,16 +439,16 @@ With prefix ARG, toggle the value of
 (use-package anzu
   :ensure t
   :bind (("M-%" . anzu-query-replace-regexp)
-         ("C-M-%" . anzu-query-replace)))
+         ("C-M-%" . anzu-query-replace)))
 
 (use-package isearch-mb
   :ensure t
   :config
   (setopt isearch-lazy-count t
-          isearch-regexp-lax-whitespace t
-          search-whitespace-regexp "\\W+"
-          search-default-mode t         ; Search regexp by default
-          isearch-wrap-pause 'no)
+          isearch-regexp-lax-whitespace t
+          search-whitespace-regexp "\\W+"
+          search-default-mode t                 ; Search regexp by default
+          isearch-wrap-pause 'no)
   (define-advice isearch-cancel (:before (&rest _) add-search-to-history)
     "Add search string to history when canceling."
     (unless (equal "" isearch-string)
@@ -444,11 +457,11 @@ With prefix ARG, toggle the value of
     "Don't exit replace for any key that's not in `query-replace-map'."
     (save-window-excursion
       (cl-letf* ((lookup-key-orig (symbol-function 'lookup-key))
-                 ((symbol-function 'lookup-key)
-                  (lambda (map key &optional accept-default)
-                    (or (apply lookup-key-orig map key accept-default)
-                        (when (eq map query-replace-map) 'help)))))
-        (apply orig r))))
+                 ((symbol-function 'lookup-key)
+                  (lambda (map key &optional accept-default)
+                    (or (apply lookup-key-orig map key accept-default)
+                        (when (eq map query-replace-map) 'help)))))
+        (apply orig r))))
   ;; Consult
   (autoload 'consult-line "consult" nil t)
   (autoload 'consult-isearch-history "consult" nil t)