diff options
-rw-r--r-- | early-init.el | 3 | ||||
-rw-r--r-- | init.el | 17 |
2 files changed, 14 insertions, 6 deletions
diff --git a/early-init.el b/early-init.el index aaacf36..90a2b0c 100644 --- a/early-init.el +++ b/early-init.el | |||
@@ -152,6 +152,9 @@ | |||
152 | (eval-print-last-sexp))) | 152 | (eval-print-last-sexp))) |
153 | (load bootstrap-file nil 'nomessage)) | 153 | (load bootstrap-file nil 'nomessage)) |
154 | 154 | ||
155 | ;; Helper package, good commands here. | ||
156 | (require 'straight-x) | ||
157 | |||
155 | ;; Appendix. Get rid of a dumb alias. | 158 | ;; Appendix. Get rid of a dumb alias. |
156 | ;; straight-ಠ_ಠ-mode really slows down all minibuffer completion functions. | 159 | ;; straight-ಠ_ಠ-mode really slows down all minibuffer completion functions. |
157 | ;; Since it's a (rarely-used, even) alias anyway, I just define it back to nil. | 160 | ;; Since it's a (rarely-used, even) alias anyway, I just define it back to nil. |
diff --git a/init.el b/init.el index d226d77..26474b8 100644 --- a/init.el +++ b/init.el | |||
@@ -324,6 +324,8 @@ | |||
324 | erc-nick-truncate (- erc-fill-static-center 1) | 324 | erc-nick-truncate (- erc-fill-static-center 1) |
325 | erc-prompt (lambda () (acdw-erc/prompt)) | 325 | erc-prompt (lambda () (acdw-erc/prompt)) |
326 | erc-prompt-for-password nil ; use ~/.authinfo | 326 | erc-prompt-for-password nil ; use ~/.authinfo |
327 | erc-rename-buffers t | ||
328 | erc-server erc-default-server | ||
327 | erc/servers | 329 | erc/servers |
328 | (when (boundp 'erc-autojoin-channels-alist) | 330 | (when (boundp 'erc-autojoin-channels-alist) |
329 | (mapcar #'car erc-autojoin-channels-alist)) | 331 | (mapcar #'car erc-autojoin-channels-alist)) |
@@ -346,7 +348,9 @@ | |||
346 | erc-track-mode | 348 | erc-track-mode |
347 | erc-truncate-mode) | 349 | erc-truncate-mode) |
348 | 350 | ||
349 | (:bind "C-c C-b" acdw-erc/erc-switch-to-buffer) | 351 | (:bind "C-c C-b" acdw-erc/erc-switch-to-buffer |
352 | "C-c C-c" nil ; def: `erc-toggle-interpret-controls' | ||
353 | ) | ||
350 | 354 | ||
351 | (with-eval-after-load 'erc | 355 | (with-eval-after-load 'erc |
352 | (setup (:straight erc-hl-nicks) | 356 | (setup (:straight erc-hl-nicks) |
@@ -1125,14 +1129,13 @@ if ripgrep is installed, otherwise `consult-grep'." | |||
1125 | (require 'orderless) | 1129 | (require 'orderless) |
1126 | (:option (prepend completion-styles) 'orderless)) | 1130 | (:option (prepend completion-styles) 'orderless)) |
1127 | 1131 | ||
1128 | (setup (:straight (org :host nil | 1132 | (setup (:straight org) |
1129 | :repo "https://code.orgmode.org/bzg/org-mode.git")) | 1133 | (:straight org-contrib) |
1130 | (:straight (org-contrib :host nil | ||
1131 | :repo "https://git.sr.ht/~bzg/org-contrib")) | ||
1132 | (require 'acdw-org) ; so I don't clutter up init.el | 1134 | (require 'acdw-org) ; so I don't clutter up init.el |
1133 | (:option org-adapt-indentation nil | 1135 | (:option org-adapt-indentation nil |
1134 | org-catch-invisible-edits 'smart | 1136 | org-catch-invisible-edits 'smart |
1135 | org-clock-clocked-in-display 'mode-line | 1137 | org-clock-clocked-in-display 'mode-line |
1138 | org-clock-string-limit 7 ; gives time and not title | ||
1136 | org-confirm-babel-evaluate nil | 1139 | org-confirm-babel-evaluate nil |
1137 | org-ellipsis " …" | 1140 | org-ellipsis " …" |
1138 | org-export-coding-system 'utf-8-unix | 1141 | org-export-coding-system 'utf-8-unix |
@@ -1280,7 +1283,9 @@ if ripgrep is installed, otherwise `consult-grep'." | |||
1280 | (setup (:straight (vertico | 1283 | (setup (:straight (vertico |
1281 | :host github | 1284 | :host github |
1282 | :repo "minad/vertico")) | 1285 | :repo "minad/vertico")) |
1283 | (setq resize-mini-windows 'grow-only) | 1286 | (:option resize-mini-windows 'grow-only |
1287 | vertico-count-format nil | ||
1288 | vertico-cycle t) | ||
1284 | (if (boundp 'comp-deferred-compilation-deny-list) | 1289 | (if (boundp 'comp-deferred-compilation-deny-list) |
1285 | (add-to-list 'comp-deferred-compilation-deny-list "vertico")) | 1290 | (add-to-list 'comp-deferred-compilation-deny-list "vertico")) |
1286 | (vertico-mode +1)) | 1291 | (vertico-mode +1)) |