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

1 files changed, 61 insertions, 7 deletions

@@ -86,12 +86,51 @@
                 browse-url-firefox-arguments '("--new-tab") ; for firefox
                 browse-url-firefox-new-window-is-tab t)
 
+  (defvar browse-url-mpv-arguments nil
+    "Arguments to pass to mpv in `browse-url-mpv'.")
+  
+  (defun browse-url-mpv (url &optional new-window)
+    "Play `URL' in mpv."
+    (interactive (browse-url-interactive-arg "Video URL: "))
+    (ignore new-window) ;; mpv always opens a new window
+    (let* ((url (browse-url-encode-url url))
+           (process-environment (browse-url-process-environment)))
+      (message "Playing %s in mpv..." url)
+      (apply #'start-process
+             (concat "mpv " url) nil
+             "mpv"
+             (append
+              browse-url-mpv-arguments
+              (list url)))))
+
+  (defvar browse-url-feh-arguments '("--auto-zoom"
+                                     "--geometry" "800x600")
+    "Arguments to pass to feh in `browse-url-feh'.")
+
+  (defun browse-url-feh (url &optional new-window)
+    "Open `URL' in feh."
+    (interactive (browse-url-interactive-arg "Video URL: "))
+    (ignore new-window) ;; mpv always opens a new window
+    (let* ((url (browse-url-encode-url url))
+           (process-environment (browse-url-process-environment)))
+      (message "Opening %s in feh..." url)
+      (apply #'start-process
+             (concat "feh " url) nil
+             "feh"
+             (append
+              browse-url-feh-arguments
+              (list url)))))
+
   ;; `browse-url-browser-function' as an alist is deprecated in Emacs 28 for
   ;; `browse-url-handlers'.
   (set-default (if (version<= emacs-version "28")
                    'browse-url-browser-function
                  'browse-url-handlers)
-               '(("." . eww-browse-url)))
+               `(,(when (executable-find "feh")
+                    '("\\.jpe?g\\'" . browse-url-feh))
+                 ,(when (executable-find "mpv")
+                    '("youtube\\.com\\|youtu\\.be" . browse-url-mpv))
+                 ("." . eww-browse-url)))
 
   ;; Buttonize gemini:// links.
   (acdw/add-button-url-regexp-protocol "gemini"))
@@ -302,12 +341,23 @@
 
   (:bind "C-c C-b" acdw-erc/erc-switch-to-buffer)
 
-  ;; (setup (:straight erc-hl-nicks)
-  ;;   (with-eval-after-load 'erc
-  ;;     (require 'erc-hl-nicks)
-  ;;     (:option erc-hl-nicks-minimum-contrast-ratio 4.5)
-  ;;     (:hook-into erc-mode)))
-  )
+  (with-eval-after-load 'erc
+    (setup (:straight erc-hl-nicks)
+      (:option (append erc-modules) 'hl-nicks
+               erc-hl-nicks-minimum-contrast-ratio 4.5
+               erc-hl-nicks-color-contrast-strategy '(invert contrast))
+      (:hook-into erc-mode)
+      ;; Refresh nick colors after changing modus theme
+      ;; Ideally, there'd be a hook for /any/ time we changed theme... but
+      ;; whatever.
+      (add-hook 'modus-themes-after-load-theme-hook
+                #'erc-hl-nicks-refresh-colors))
+
+    (setup (:straight erc-image)
+      (:option (append erc-modules) 'image
+               erc-image-inline-rescale 'window))
+    
+    (erc-update-modules)))
 
 (setup eshell
   (:also-load acdw-eshell
@@ -407,6 +457,10 @@ like a dumbass."
            gnus-init-file (expand-file-name "gnus.el" user-emacs-directory))
   (:global "C-c n" gnus))
 
+(setup goto-addr
+  (add-hook 'text-mode-hook #'goto-address-mode)
+  (add-hook 'prog-mode-hook #'goto-address-prog-mode))
+
 (setup ibuffer
   (:option ibuffer-saved-filter-groups
            '(("default"