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

1 files changed, 35 insertions, 7 deletions

@@ -78,9 +78,6 @@
   (global-auto-revert-mode +1))
 
 (setup browse-url
-  (when (acdw/system :work)
-    (add-to-list 'exec-path "C:/Program Files/Mozilla Firefox"))
-  
   (setq-default browse-url-secondary-browser-function
                 (if (executable-find "firefox") ; prefer Firefox
                     'browse-url-firefox
@@ -317,7 +314,9 @@
    erc-nick "acdw"
    erc-prompt (lambda () (acdw-erc/prompt))
    erc-prompt-for-password nil ; use ~/.authinfo
-   erc/servers (mapcar #'car erc-autojoin-channels-alist)
+   erc/servers
+   (when (boundp 'erc-autojoin-channels-alist)
+     (mapcar #'car erc-autojoin-channels-alist))
    erc-server-coding-system '(utf-8 . utf-8)
    erc-track-exclude-types erc-hide-list
    erc-track-exclude-server-buffer t
@@ -962,8 +961,32 @@ if ripgrep is installed, otherwise `consult-grep'."
   (:needs "mpv")
   (:option
    eradio-player '("mpv" "--no-video" "--no-terminal")
-   eradio-channels '(("tilderadio" .
-                      "https://radio.tildeverse.org/radio/8000/radio.ogg"))))
+   eradio-channels `(("KLSU" .
+                      "http://130.39.238.143:8010/stream.mp3")
+                     ("Soma FM Synphaera" .
+                      "https://somafm.com/synphaera256.pls")
+                     ("SomaFM BAGel Radio" .
+                      "https://somafm.com/bagel.pls")
+                     ("SomaFM Boot Liquor" .
+                      "https://somafm.com/bootliquor320.pls")
+                     ("SomaFM Deep Space One" .
+                      "https://somafm.com/deepspaceone.pls")
+                     ("SomaFM Fluid" .
+                      "https://somafm.com/fluid.pls")
+                     ("SomaFM Underground 80s" .
+                      "https://somafm.com/u80s256.pls")
+                     ("WRKF HD-2" .
+                      ,(concat "https://playerservices.streamtheworld.com/"
+                               "api/livestream-redirect/WRKFHD2.mp3"))
+                     ("WRKF" .
+                      ,(concat "https://playerservices.streamtheworld.com/"
+                               "api/livestream-redirect/WRKFFM.mp3"))
+                     ("tilderadio" .
+                      "https://radio.tildeverse.org/radio/8000/radio.ogg")))
+  (: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
+           ))
 
 (setup (:straight expand-region)
   (:global "C-=" er/expand-region))
@@ -1181,7 +1204,8 @@ if ripgrep is installed, otherwise `consult-grep'."
 
 (setup (:straight sly)
   (defvar acdw/lisp-bin (or (executable-find "sbcl")
-                            (executable-find "clisp")))
+                            (executable-find "clisp")
+                            ""))
   (:needs acdw/lisp-bin)
   (:option inferior-lisp-program acdw/lisp-bin
            sly-kill-without-query-p t)
@@ -1321,3 +1345,7 @@ call `zzz-to-char'."
     (pdf-loader-install))
 
   (setup (:straight vterm)))
+
+;;;; Work
+(when (acdw/system :work)
+  (setup (:straight ahk-mode)))