summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2022-01-04 15:30:33 -0600
committerCase Duckworth2022-01-04 15:30:33 -0600
commit792cf41885950b06caf33260143ac9f9f3828753 (patch)
tree13eadee611e4347f97692e1c00a2a7f93d31acec
parentAdd system-file, system-system-file, and change logic around (diff)
downloademacs-792cf41885950b06caf33260143ac9f9f3828753.tar.gz
emacs-792cf41885950b06caf33260143ac9f9f3828753.zip
Fix variable loading issues
-rw-r--r--init.el42
1 files changed, 22 insertions, 20 deletions
diff --git a/init.el b/init.el index 002a2b1..6b48479 100644 --- a/init.el +++ b/init.el
@@ -24,7 +24,8 @@
24(setq debug-on-error (memq system-type '(msdos windows-nt))) 24(setq debug-on-error (memq system-type '(msdos windows-nt)))
25 25
26(setup (:require +casing) 26(setup (:require +casing)
27 (define-key +key-mode-map (kbd "C-c c") +casing-map) 27 (with-eval-after-load '+key
28 (define-key +key-mode-map (kbd "C-c c") +casing-map))
28 ;; Unbind default casing bindings 29 ;; Unbind default casing bindings
29 (:global "M-u" nil "M-c" nil "M-l" nil 30 (:global "M-u" nil "M-c" nil "M-l" nil
30 "C-x C-u" nil "C-x C-l" nil)) 31 "C-x C-u" nil "C-x C-l" nil))
@@ -63,6 +64,25 @@
63(setup (:require auth-source) 64(setup (:require auth-source)
64 (:option auth-sources (list (private/ "authinfo")))) 65 (:option auth-sources (list (private/ "authinfo"))))
65 66
67(setup (:require cus-edit)
68 ;; I don't use Custom to actually /make/ any customizations, but it's handy to
69 ;; (A) see what options are available and (B) persist some changes across
70 ;; restarts, for example, `safe-local-variables'.
71 (:require +cus-edit)
72 (:option custom-file (private/ "custom.el")
73 custom-magic-show nil
74 custom-magic-show-button t
75 custom-raised-buttons nil
76 custom-unlispify-tag-names nil
77 custom-variable-default-form 'lisp)
78 (dolist (var '(safe-local-variable-values
79 warning-suppress-types))
80 (add-to-list '+custom-variable-allowlist var))
81 (+ensure-after-init #'+custom-load-ignoring-most-customizations)
82 (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets)
83 (:with-mode Custom-mode
84 (:local-set imenu-generic-expression +cus-edit-imenu-generic-expression)))
85
66(setup (:require goto-addr) 86(setup (:require goto-addr)
67 (if (fboundp #'global-goto-address-mode) 87 (if (fboundp #'global-goto-address-mode)
68 (global-goto-address-mode) 88 (global-goto-address-mode)
@@ -166,25 +186,6 @@
166 compilation-ask-about-save nil 186 compilation-ask-about-save nil
167 compilation-scroll-output t)) 187 compilation-scroll-output t))
168 188
169(setup cus-edit
170 ;; I don't use Custom to actually /make/ any customizations, but it's handy to
171 ;; (A) see what options are available and (B) persist some changes across
172 ;; restarts, for example, `safe-local-variables'.
173 (:require +cus-edit)
174 (:option custom-file (private/ "custom.el")
175 custom-magic-show nil
176 custom-magic-show-button t
177 custom-raised-buttons nil
178 custom-unlispify-tag-names nil
179 custom-variable-default-form 'lisp)
180 (dolist (var '(safe-local-variable-values
181 warning-suppress-types))
182 (add-to-list '+custom-variable-allowlist var))
183 (+ensure-after-init #'+custom-load-ignoring-most-customizations)
184 (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets)
185 (:with-mode Custom-mode
186 (:local-set imenu-generic-expression +cus-edit-imenu-generic-expression)))
187
188(setup dired 189(setup dired
189 (:also-load dired-x) 190 (:also-load dired-x)
190 (:also-straight dired-subtree 191 (:also-straight dired-subtree
@@ -463,6 +464,7 @@
463 org-agenda-file-regexp 464 org-agenda-file-regexp
464 org-agenda-templates)) 465 org-agenda-templates))
465 (add-to-list '+custom-variable-allowlist var)) 466 (add-to-list '+custom-variable-allowlist var))
467 (defvar org-agenda-files nil)
466 (add-to-list 'org-agenda-files (sync/ "org/" t)) 468 (add-to-list 'org-agenda-files (sync/ "org/" t))
467 (:+leader "a" #'org-agenda "C-a" #'org-agenda) 469 (:+leader "a" #'org-agenda "C-a" #'org-agenda)
468 (:hook #'hl-line-mode)) 470 (:hook #'hl-line-mode))