diff options
-rw-r--r-- | early-init.el | 84 | ||||
-rw-r--r-- | init.el | 4 | ||||
-rw-r--r-- | lisp/reading.el | 2 |
3 files changed, 47 insertions, 43 deletions
diff --git a/early-init.el b/early-init.el index 508336e..5a29885 100644 --- a/early-init.el +++ b/early-init.el | |||
@@ -76,31 +76,34 @@ See `no-littering' for examples.") | |||
76 | 76 | ||
77 | ;;; Fonts | 77 | ;;; Fonts |
78 | (progn | 78 | (progn |
79 | ;; Set default faces | 79 | ;; Set default faces |
80 | (let ((font-name system-default-font) | 80 | (+with-message "Setting default faces" |
81 | (font-size system-default-height) | 81 | (let ((font-name system-default-font) |
82 | (variable-font-name system-variable-pitch-font) | 82 | (font-size system-default-height) |
83 | (variable-font-size system-variable-pitch-height)) | 83 | (variable-font-name system-variable-pitch-font) |
84 | (set-face-attribute 'default nil :family system-default-font | 84 | (variable-font-size system-variable-pitch-height)) |
85 | :height font-size :weight 'book) | 85 | (set-face-attribute 'default nil :family system-default-font |
86 | (set-face-attribute 'italic nil :family font-name | 86 | :height font-size :weight 'book) |
87 | :height font-size :slant 'italic) | 87 | (set-face-attribute 'italic nil :family font-name |
88 | (set-face-attribute 'variable-pitch nil :family variable-font-name | 88 | :height font-size :slant 'italic) |
89 | :height variable-font-size)) | 89 | (set-face-attribute 'variable-pitch nil :family variable-font-name |
90 | 90 | :height variable-font-size))) | |
91 | ;; Emoji fonts | 91 | |
92 | (let ((ffl (font-family-list))) | 92 | ;; Emoji fonts |
93 | (dolist (font '("Noto Color Emoji" | 93 | (+with-message "Adding emoji fonts" |
94 | "Noto Emoji" | 94 | (let ((ffl (font-family-list))) |
95 | "Segoe UI Emoji" | 95 | (dolist (font '("Noto Color Emoji" |
96 | "Apple Color Emoji" | 96 | "Noto Emoji" |
97 | "FreeSans" | 97 | "Segoe UI Emoji" |
98 | "FreeMono" | 98 | "Apple Color Emoji" |
99 | "FreeSerif" | 99 | "FreeSans" |
100 | "Unifont" | 100 | "FreeMono" |
101 | "Symbola")) | 101 | "FreeSerif" |
102 | (when (member font ffl) | 102 | "Unifont" |
103 | (set-fontset-font t 'symbol (font-spec :family font) nil :append))))) | 103 | "Symbola")) |
104 | (when (member font ffl) | ||
105 | (message "Found font: %s" font) | ||
106 | (set-fontset-font t 'symbol (font-spec :family font) nil :append)))))) | ||
104 | 107 | ||
105 | ;;; Packages | 108 | ;;; Packages |
106 | 109 | ||
@@ -118,21 +121,22 @@ See `no-littering' for examples.") | |||
118 | ;; Bootstrap straight.el | 121 | ;; Bootstrap straight.el |
119 | ;; https://github.com/raxod502/straight.el | 122 | ;; https://github.com/raxod502/straight.el |
120 | 123 | ||
121 | (defvar bootstrap-version) | 124 | (+with-message "Bootstrapping straight" |
122 | (let ((bootstrap-file | 125 | (defvar bootstrap-version) |
123 | (expand-file-name | 126 | (let ((bootstrap-file |
124 | "straight/repos/straight.el/bootstrap.el" | 127 | (expand-file-name |
125 | straight-base-dir)) | 128 | "straight/repos/straight.el/bootstrap.el" |
126 | (bootstrap-version 5)) | 129 | straight-base-dir)) |
127 | (unless (file-exists-p bootstrap-file) | 130 | (bootstrap-version 5)) |
128 | (with-current-buffer | 131 | (unless (file-exists-p bootstrap-file) |
129 | (url-retrieve-synchronously | 132 | (with-current-buffer |
130 | (concat "https://raw.githubusercontent.com/" | 133 | (url-retrieve-synchronously |
131 | "raxod502/straight.el/develop/install.el") | 134 | (concat "https://raw.githubusercontent.com/" |
132 | 'silent 'inhibit-cookies) | 135 | "raxod502/straight.el/develop/install.el") |
133 | (goto-char (point-max)) | 136 | 'silent 'inhibit-cookies) |
134 | (eval-print-last-sexp))) | 137 | (goto-char (point-max)) |
135 | (load bootstrap-file nil 'nomessage)) | 138 | (eval-print-last-sexp))) |
139 | (load bootstrap-file nil 'nomessage))) | ||
136 | 140 | ||
137 | ;; Early-loaded packages -- those that, for some reason or another, | 141 | ;; Early-loaded packages -- those that, for some reason or another, |
138 | ;; need to be ensured to be loaded first. | 142 | ;; need to be ensured to be loaded first. |
diff --git a/init.el b/init.el index 229f081..d1dc6e3 100644 --- a/init.el +++ b/init.el | |||
@@ -1266,9 +1266,11 @@ See also `crux-reopen-as-root-mode'." | |||
1266 | ) | 1266 | ) |
1267 | 1267 | ||
1268 | (setup (:straight org-visibility) | 1268 | (setup (:straight org-visibility) |
1269 | ;; I think this is causing hangups on Windows .. ? | ||
1269 | (:option org-visibility-state-file (.etc "org-visibility") | 1270 | (:option org-visibility-state-file (.etc "org-visibility") |
1270 | org-visibility-include-regexps '("\\.org\\'")) | 1271 | org-visibility-include-regexps '("\\.org\\'")) |
1271 | (org-visibility-enable-hooks)) | 1272 | ;; (org-visibility-enable-hooks) |
1273 | ) | ||
1272 | 1274 | ||
1273 | (setup (:straight orglink) | 1275 | (setup (:straight orglink) |
1274 | (global-orglink-mode +1)) | 1276 | (global-orglink-mode +1)) |
diff --git a/lisp/reading.el b/lisp/reading.el index d00172b..6658671 100644 --- a/lisp/reading.el +++ b/lisp/reading.el | |||
@@ -58,9 +58,7 @@ FUNC should be a function with the signature (THING REMEMBERED-SETTING)." | |||
58 | ;;;###autoload | 58 | ;;;###autoload |
59 | (define-minor-mode reading-mode | 59 | (define-minor-mode reading-mode |
60 | "A mode for reading." | 60 | "A mode for reading." |
61 | :init-value nil | ||
62 | :lighter " Read" | 61 | :lighter " Read" |
63 | :keymap (make-sparse-keymap) | ||
64 | (if reading-mode | 62 | (if reading-mode |
65 | ;; turn on | 63 | ;; turn on |
66 | (progn | 64 | (progn |