about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el69
1 files changed, 33 insertions, 36 deletions
diff --git a/init.el b/init.el index 57121ef..c01d49b 100644 --- a/init.el +++ b/init.el
@@ -25,10 +25,7 @@
25(setup setup 25(setup setup
26 (setup-define :straight 26 (setup-define :straight
27 (lambda (recipe) 27 (lambda (recipe)
28 `(or (ignore-errors (straight-use-package ',recipe)) 28 `(straight-use-package ',recipe))
29 (progn
30 (message "Straight error: %S" ',recipe)
31 (throw 'setup-exit nil))))
32 :documentation "Install RECIPE with `straight-use-package'." 29 :documentation "Install RECIPE with `straight-use-package'."
33 :repeatable t 30 :repeatable t
34 :shorthand (lambda (sexp) 31 :shorthand (lambda (sexp)
@@ -268,35 +265,35 @@
268 (:also-load erc-autoaway 265 (:also-load erc-autoaway
269 erc-track) 266 erc-track)
270 267
271 (:option erc-auto-discard-away t 268 (:option
272 erc-autoaway-idle-seconds 600 269 erc-auto-discard-away t
273 erc-autoaway-message "BRB (autoaway: %i seconds)" 270 erc-autoaway-idle-seconds 600
274 erc-autojoin-channels-alist '(("libera.chat" 271 erc-autoaway-message "BRB (autoaway: %i seconds)"
275 "#emacs" "##webpals") 272 erc-autojoin-channels-alist '(("libera.chat"
276 ("tilde.chat" 273 "#emacs" "##webpals")
277 "#meta" "#team" "#gemini" 274 ("tilde.chat"
278 "#bread" ; how could I've forgotten!? 275 "#meta" "#team" "#gemini"
279 "#politics" "#bungame")) 276 "#bread" ; how could I've forgotten!?
280 erc-button-url-regexp browse-url-button-regexp 277 "#politics" "#bungame"))
281 (append erc-common-server-suffixes) '("tilde.chat\\'" . "~") 278 erc-button-url-regexp browse-url-button-regexp
282 (append erc-common-server-suffixes) '("libera.chat\\'" . "LC") 279 erc-common-server-suffixes '(("tilde.chat\\'" . "~")
283 erc-header-line-face-method 280 ("libera.chat\\'" . "LC"))
284 #'erc/update-header-line-show-disconnected 281 erc-header-line-face-method #'erc/update-header-line-show-disconnected
285 erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE" 282 erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE"
286 "324" "329" "332" "333" "353" "477") 283 "324" "329" "332" "333" "353" "477")
287 erc-interpret-mirc-color t 284 erc-interpret-mirc-color t
288 erc-join-buffer 'bury 285 erc-join-buffer 'bury
289 erc-kill-buffer-on-part t 286 erc-kill-buffer-on-part t
290 erc-kill-queries-on-quit t 287 erc-kill-queries-on-quit t
291 erc-kill-server-buffer-on-quit t 288 erc-kill-server-buffer-on-quit t
292 erc-nick "acdw" 289 erc-nick "acdw"
293 erc-prompt (lambda () (concat (buffer-name) ">")) 290 erc-prompt (lambda () (concat (buffer-name) ">"))
294 erc-prompt-for-password nil ; use ~/.authinfo 291 erc-prompt-for-password nil ; use ~/.authinfo
295 erc/servers '("irc.libera.chat" 292 erc/servers '("irc.libera.chat"
296 "irc.tilde.chat") 293 "irc.tilde.chat")
297 erc-server-coding-system '(utf-8 . utf-8) 294 erc-server-coding-system '(utf-8 . utf-8)
298 erc-track-exclude-types erc-hide-list 295 erc-track-exclude-types erc-hide-list
299 erc-track-position-in-mode-line 'before-modes) 296 erc-track-position-in-mode-line 'before-modes)
300 297
301 ;; Thanks bpalmer! 298 ;; Thanks bpalmer!
302 (advice-add 'show-paren-function :around 299 (advice-add 'show-paren-function :around
@@ -784,9 +781,9 @@
784 "M-g f" avy-goto-line 781 "M-g f" avy-goto-line
785 "M-g w" avy-goto-word-1 782 "M-g w" avy-goto-word-1
786 "C-c C-j" avy-resume) 783 "C-c C-j" avy-resume)
787 784
788 (eval-after-load "isearch" 785 (with-eval-after-load "isearch"
789 '(define-key isearch-mode-map (kbd "C-'") #'avy-isearch))) 786 (define-key isearch-mode-map (kbd "C-'") #'avy-isearch)))
790 787
791(setup (:straight (beginend)) 788(setup (:straight (beginend))
792 (beginend-global-mode +1)) 789 (beginend-global-mode +1))