Merge branch 'main' of https://tildegit.org/acdw/emacs

2 files changed, 20 insertions, 3 deletions

@@ -138,6 +138,10 @@
 (setup buffers
   (:global "C-x k" acdw/kill-a-buffer))
 
+(setup calendar
+  (:option calendar-week-start-day 1 ; Monday
+           ))
+
 (setup completion
   (:option completion-ignore-case t
            read-buffer-completion-ignore-case t
@@ -335,6 +339,8 @@
              erc-track-mode
              erc-truncate-mode)
 
+  (:bind "C-c C-b" acdw-erc/erc-switch-to-buffer)
+
   (with-eval-after-load 'erc
     (setup (:straight erc-hl-nicks)
       (:option (append erc-modules) 'hl-nicks
@@ -764,8 +770,8 @@ like a dumbass."
            "<help> h" nil ; HELLO takes a long time to load on Windows
            )
 
-  (when (display-graphic-p)
-    (:global "<escape>" keyboard-escape-quit))
+  ;; (when (display-graphic-p)
+  ;;   (:global "<escape>" keyboard-escape-quit))
 
   ;; Remap C-h to DEL -- <f1> can be the "help" key
   (define-key key-translation-map [?\C-h] [?\C-?])
@@ -982,7 +988,9 @@ if ripgrep is installed, otherwise `consult-grep'."
                       ,(concat "https://playerservices.streamtheworld.com/"
                                "api/livestream-redirect/WRKFFM.mp3"))
                      ("tilderadio" .
-                      "https://radio.tildeverse.org/radio/8000/radio.ogg")))
+                      "https://radio.tildeverse.org/radio/8000/radio.ogg")
+                     ("vantaradio" .
+                      "https://vantaa.black/radio")))
   (:global "C-c r r" eradio-play        ; mnemonic: radio
            "C-c r s" eradio-stop        ; mnemonic: stop
            "C-c r p" eradio-toggle      ; mnemonic: play/pause
@@ -102,5 +102,14 @@ If USE-TLS is non-nil, use TLS."
                   (setq num (1- num)))
                 (apply #'concat ss))))))
 
+
+;;; Uh
+
+(defun acdw-erc/erc-switch-to-buffer (&optional arg)
+  "Prompt for ERC buffer to switch to.
+Reverse prefix argument from `erc-switch-to-buffer'."
+  (interactive "P")
+  (erc-switch-to-buffer (not arg)))
+
 (provide 'acdw-erc)
 ;;; acdw-erc.el ends here