summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el82
1 files changed, 44 insertions, 38 deletions
diff --git a/init.el b/init.el index 7080131..7c9d96a 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)
@@ -258,37 +255,35 @@
258 (:also-load erc-autoaway 255 (:also-load erc-autoaway
259 erc-track) 256 erc-track)
260 257
261 (:option erc-auto-discard-away t 258 (:option
262 erc-autoaway-idle-seconds 600 259 erc-auto-discard-away t
263 erc-autoaway-message "BRB (autoaway: %i seconds)" 260 erc-autoaway-idle-seconds 600
264 erc-autojoin-channels-alist '(("libera.chat" 261 erc-autoaway-message "BRB (autoaway: %i seconds)"
265 "#emacs" "##webpals") 262 erc-autojoin-channels-alist '(("libera.chat"
266 ("tilde.chat" 263 "#emacs" "##webpals")
267 "#meta" "#team" "#gemini" 264 ("tilde.chat"
268 "#bread" ; how could I've forgotten!? 265 "#meta" "#team" "#gemini"
269 "#politics" "#bungame" 266 "#bread" ; how could I've forgotten!?
270 "#backgammon")) 267 "#politics" "#bungame"))
271 erc-button-url-regexp browse-url-button-regexp 268 erc-button-url-regexp browse-url-button-regexp
272 erc-common-server-suffixes '(("oftc.net\\'" . "OFTC") 269 erc-common-server-suffixes '(("tilde.chat\\'" . "~")
273 ("tilde.chat\\'" . "~") 270 ("libera.chat\\'" . "LC"))
274 ("libera.chat\\'" . "LC")) 271 erc-header-line-face-method #'erc/update-header-line-show-disconnected
275 erc-header-line-face-method 272 erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE"
276 #'erc/update-header-line-show-disconnected 273 "324" "329" "332" "333" "353" "477")
277 erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE" 274 erc-interpret-mirc-color t
278 "324" "329" "332" "333" "353" "477") 275 erc-join-buffer 'bury
279 erc-interpret-mirc-color t 276 erc-kill-buffer-on-part t
280 erc-join-buffer 'bury 277 erc-kill-queries-on-quit t
281 erc-kill-buffer-on-part t 278 erc-kill-server-buffer-on-quit t
282 erc-kill-queries-on-quit t 279 erc-nick "acdw"
283 erc-kill-server-buffer-on-quit t 280 erc-prompt (lambda () (concat (buffer-name) ">"))
284 erc-nick "acdw" 281 erc-prompt-for-password nil ; use ~/.authinfo
285 erc-prompt (lambda () (concat (buffer-name) ">")) 282 erc/servers '("irc.libera.chat"
286 erc-prompt-for-password nil ; use ~/.authinfo 283 "irc.tilde.chat")
287 erc/servers '("irc.libera.chat" 284 erc-server-coding-system '(utf-8 . utf-8)
288 "irc.tilde.chat") 285 erc-track-exclude-types erc-hide-list
289 erc-server-coding-system '(utf-8 . utf-8) 286 erc-track-position-in-mode-line 'before-modes)
290 erc-track-exclude-types erc-hide-list
291 erc-track-position-in-mode-line 'before-modes)
292 287
293 ;; Thanks bpalmer! 288 ;; Thanks bpalmer!
294 (advice-add 'show-paren-function :around 289 (advice-add 'show-paren-function :around
@@ -407,8 +402,10 @@
407 (:option ibuffer-saved-filter-groups 402 (:option ibuffer-saved-filter-groups
408 '(("default" 403 '(("default"
409 ("dired" (mode . dired-mode)) 404 ("dired" (mode . dired-mode))
405 ("customize" (mode . Custom-mode))
410 ("emacs" (or (name . "^\\*scratch\\*$") 406 ("emacs" (or (name . "^\\*scratch\\*$")
411 (name . "^\\*Messages\\*$") 407 (name . "^\\*Messages\\*$")
408 (name . "^\\*Warnings\\*$")
412 (name . "^\\*straight-process\\*$") 409 (name . "^\\*straight-process\\*$")
413 (name . "^\\*Calendar\\*$"))) 410 (name . "^\\*Calendar\\*$")))
414 ("git" (or (name . "^\*magit") 411 ("git" (or (name . "^\*magit")
@@ -775,9 +772,9 @@
775 "M-g f" avy-goto-line 772 "M-g f" avy-goto-line
776 "M-g w" avy-goto-word-1 773 "M-g w" avy-goto-word-1
777 "C-c C-j" avy-resume) 774 "C-c C-j" avy-resume)
778 775
779 (eval-after-load "isearch" 776 (with-eval-after-load "isearch"
780 '(define-key isearch-mode-map (kbd "C-'") #'avy-isearch))) 777 (define-key isearch-mode-map (kbd "C-'") #'avy-isearch)))
781 778
782(setup (:straight (beginend)) 779(setup (:straight (beginend))
783 (beginend-global-mode +1)) 780 (beginend-global-mode +1))
@@ -1151,6 +1148,15 @@ if ripgrep is installed, otherwise `consult-grep'."
1151 (add-to-list 'comp-deferred-compilation-deny-list "vertico")) 1148 (add-to-list 'comp-deferred-compilation-deny-list "vertico"))
1152 (vertico-mode +1)) 1149 (vertico-mode +1))
1153 1150
1151(setup (:straight vuiet)
1152 (:needs "youtube-dl"
1153 "mpv")
1154
1155 ;; lastfm.el is required too, and needs some setup:
1156 ;; https://github.com/mihaiolteanu/lastfm.el
1157 (setup (:straight lastfm)
1158 (require 'lastfm)))
1159
1154(setup (:straight web-mode) 1160(setup (:straight web-mode)
1155 (:option css-level-offset 2 1161 (:option css-level-offset 2
1156 js-indent-level 2 1162 js-indent-level 2