summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-07-02 21:47:09 -0500
committerCase Duckworth2021-07-02 21:47:09 -0500
commit7ac294a1366dfb34cb67a97021990c96093ae93b (patch)
tree330c6afe3ce825f7c2cce4ecfd70ef66c3d8baef
parentModify erc config (diff)
parentMerge branch 'main' of tildegit.org:acdw/emacs (diff)
downloademacs-7ac294a1366dfb34cb67a97021990c96093ae93b.tar.gz
emacs-7ac294a1366dfb34cb67a97021990c96093ae93b.zip
Merge branch 'main' of https://tildegit.org/acdw/emacs
-rw-r--r--init.el14
-rw-r--r--lisp/acdw-erc.el9
2 files changed, 20 insertions, 3 deletions
diff --git a/init.el b/init.el index bea881c..3efed13 100644 --- a/init.el +++ b/init.el
@@ -138,6 +138,10 @@
138(setup buffers 138(setup buffers
139 (:global "C-x k" acdw/kill-a-buffer)) 139 (:global "C-x k" acdw/kill-a-buffer))
140 140
141(setup calendar
142 (:option calendar-week-start-day 1 ; Monday
143 ))
144
141(setup completion 145(setup completion
142 (:option completion-ignore-case t 146 (:option completion-ignore-case t
143 read-buffer-completion-ignore-case t 147 read-buffer-completion-ignore-case t
@@ -335,6 +339,8 @@
335 erc-track-mode 339 erc-track-mode
336 erc-truncate-mode) 340 erc-truncate-mode)
337 341
342 (:bind "C-c C-b" acdw-erc/erc-switch-to-buffer)
343
338 (with-eval-after-load 'erc 344 (with-eval-after-load 'erc
339 (setup (:straight erc-hl-nicks) 345 (setup (:straight erc-hl-nicks)
340 (:option (append erc-modules) 'hl-nicks 346 (:option (append erc-modules) 'hl-nicks
@@ -764,8 +770,8 @@ like a dumbass."
764 "<help> h" nil ; HELLO takes a long time to load on Windows 770 "<help> h" nil ; HELLO takes a long time to load on Windows
765 ) 771 )
766 772
767 (when (display-graphic-p) 773 ;; (when (display-graphic-p)
768 (:global "<escape>" keyboard-escape-quit)) 774 ;; (:global "<escape>" keyboard-escape-quit))
769 775
770 ;; Remap C-h to DEL -- <f1> can be the "help" key 776 ;; Remap C-h to DEL -- <f1> can be the "help" key
771 (define-key key-translation-map [?\C-h] [?\C-?]) 777 (define-key key-translation-map [?\C-h] [?\C-?])
@@ -982,7 +988,9 @@ if ripgrep is installed, otherwise `consult-grep'."
982 ,(concat "https://playerservices.streamtheworld.com/" 988 ,(concat "https://playerservices.streamtheworld.com/"
983 "api/livestream-redirect/WRKFFM.mp3")) 989 "api/livestream-redirect/WRKFFM.mp3"))
984 ("tilderadio" . 990 ("tilderadio" .
985 "https://radio.tildeverse.org/radio/8000/radio.ogg"))) 991 "https://radio.tildeverse.org/radio/8000/radio.ogg")
992 ("vantaradio" .
993 "https://vantaa.black/radio")))
986 (:global "C-c r r" eradio-play ; mnemonic: radio 994 (:global "C-c r r" eradio-play ; mnemonic: radio
987 "C-c r s" eradio-stop ; mnemonic: stop 995 "C-c r s" eradio-stop ; mnemonic: stop
988 "C-c r p" eradio-toggle ; mnemonic: play/pause 996 "C-c r p" eradio-toggle ; mnemonic: play/pause
diff --git a/lisp/acdw-erc.el b/lisp/acdw-erc.el index 6038f5a..ba00355 100644 --- a/lisp/acdw-erc.el +++ b/lisp/acdw-erc.el
@@ -102,5 +102,14 @@ If USE-TLS is non-nil, use TLS."
102 (setq num (1- num))) 102 (setq num (1- num)))
103 (apply #'concat ss)))))) 103 (apply #'concat ss))))))
104 104
105
106;;; Uh
107
108(defun acdw-erc/erc-switch-to-buffer (&optional arg)
109 "Prompt for ERC buffer to switch to.
110Reverse prefix argument from `erc-switch-to-buffer'."
111 (interactive "P")
112 (erc-switch-to-buffer (not arg)))
113
105(provide 'acdw-erc) 114(provide 'acdw-erc)
106;;; acdw-erc.el ends here 115;;; acdw-erc.el ends here