Merge
This commit is contained in:
commit
2e0bebddc6
82
init.el
82
init.el
|
@ -25,10 +25,7 @@
|
|||
(setup setup
|
||||
(setup-define :straight
|
||||
(lambda (recipe)
|
||||
`(or (ignore-errors (straight-use-package ',recipe))
|
||||
(progn
|
||||
(message "Straight error: %S" ',recipe)
|
||||
(throw 'setup-exit nil))))
|
||||
`(straight-use-package ',recipe))
|
||||
:documentation "Install RECIPE with `straight-use-package'."
|
||||
:repeatable t
|
||||
:shorthand (lambda (sexp)
|
||||
|
@ -258,37 +255,35 @@
|
|||
(:also-load erc-autoaway
|
||||
erc-track)
|
||||
|
||||
(:option erc-auto-discard-away t
|
||||
erc-autoaway-idle-seconds 600
|
||||
erc-autoaway-message "BRB (autoaway: %i seconds)"
|
||||
erc-autojoin-channels-alist '(("libera.chat"
|
||||
"#emacs" "##webpals")
|
||||
("tilde.chat"
|
||||
"#meta" "#team" "#gemini"
|
||||
"#bread" ; how could I've forgotten!?
|
||||
"#politics" "#bungame"
|
||||
"#backgammon"))
|
||||
erc-button-url-regexp browse-url-button-regexp
|
||||
erc-common-server-suffixes '(("oftc.net\\'" . "OFTC")
|
||||
("tilde.chat\\'" . "~")
|
||||
("libera.chat\\'" . "LC"))
|
||||
erc-header-line-face-method
|
||||
#'erc/update-header-line-show-disconnected
|
||||
erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE"
|
||||
"324" "329" "332" "333" "353" "477")
|
||||
erc-interpret-mirc-color t
|
||||
erc-join-buffer 'bury
|
||||
erc-kill-buffer-on-part t
|
||||
erc-kill-queries-on-quit t
|
||||
erc-kill-server-buffer-on-quit t
|
||||
erc-nick "acdw"
|
||||
erc-prompt (lambda () (concat (buffer-name) ">"))
|
||||
erc-prompt-for-password nil ; use ~/.authinfo
|
||||
erc/servers '("irc.libera.chat"
|
||||
"irc.tilde.chat")
|
||||
erc-server-coding-system '(utf-8 . utf-8)
|
||||
erc-track-exclude-types erc-hide-list
|
||||
erc-track-position-in-mode-line 'before-modes)
|
||||
(:option
|
||||
erc-auto-discard-away t
|
||||
erc-autoaway-idle-seconds 600
|
||||
erc-autoaway-message "BRB (autoaway: %i seconds)"
|
||||
erc-autojoin-channels-alist '(("libera.chat"
|
||||
"#emacs" "##webpals")
|
||||
("tilde.chat"
|
||||
"#meta" "#team" "#gemini"
|
||||
"#bread" ; how could I've forgotten!?
|
||||
"#politics" "#bungame"))
|
||||
erc-button-url-regexp browse-url-button-regexp
|
||||
erc-common-server-suffixes '(("tilde.chat\\'" . "~")
|
||||
("libera.chat\\'" . "LC"))
|
||||
erc-header-line-face-method #'erc/update-header-line-show-disconnected
|
||||
erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE"
|
||||
"324" "329" "332" "333" "353" "477")
|
||||
erc-interpret-mirc-color t
|
||||
erc-join-buffer 'bury
|
||||
erc-kill-buffer-on-part t
|
||||
erc-kill-queries-on-quit t
|
||||
erc-kill-server-buffer-on-quit t
|
||||
erc-nick "acdw"
|
||||
erc-prompt (lambda () (concat (buffer-name) ">"))
|
||||
erc-prompt-for-password nil ; use ~/.authinfo
|
||||
erc/servers '("irc.libera.chat"
|
||||
"irc.tilde.chat")
|
||||
erc-server-coding-system '(utf-8 . utf-8)
|
||||
erc-track-exclude-types erc-hide-list
|
||||
erc-track-position-in-mode-line 'before-modes)
|
||||
|
||||
;; Thanks bpalmer!
|
||||
(advice-add 'show-paren-function :around
|
||||
|
@ -407,8 +402,10 @@
|
|||
(:option ibuffer-saved-filter-groups
|
||||
'(("default"
|
||||
("dired" (mode . dired-mode))
|
||||
("customize" (mode . Custom-mode))
|
||||
("emacs" (or (name . "^\\*scratch\\*$")
|
||||
(name . "^\\*Messages\\*$")
|
||||
(name . "^\\*Warnings\\*$")
|
||||
(name . "^\\*straight-process\\*$")
|
||||
(name . "^\\*Calendar\\*$")))
|
||||
("git" (or (name . "^\*magit")
|
||||
|
@ -775,9 +772,9 @@
|
|||
"M-g f" avy-goto-line
|
||||
"M-g w" avy-goto-word-1
|
||||
"C-c C-j" avy-resume)
|
||||
|
||||
(eval-after-load "isearch"
|
||||
'(define-key isearch-mode-map (kbd "C-'") #'avy-isearch)))
|
||||
|
||||
(with-eval-after-load "isearch"
|
||||
(define-key isearch-mode-map (kbd "C-'") #'avy-isearch)))
|
||||
|
||||
(setup (:straight (beginend))
|
||||
(beginend-global-mode +1))
|
||||
|
@ -1151,6 +1148,15 @@ if ripgrep is installed, otherwise `consult-grep'."
|
|||
(add-to-list 'comp-deferred-compilation-deny-list "vertico"))
|
||||
(vertico-mode +1))
|
||||
|
||||
(setup (:straight vuiet)
|
||||
(:needs "youtube-dl"
|
||||
"mpv")
|
||||
|
||||
;; lastfm.el is required too, and needs some setup:
|
||||
;; https://github.com/mihaiolteanu/lastfm.el
|
||||
(setup (:straight lastfm)
|
||||
(require 'lastfm)))
|
||||
|
||||
(setup (:straight web-mode)
|
||||
(:option css-level-offset 2
|
||||
js-indent-level 2
|
||||
|
|
Loading…
Reference in New Issue