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

1 files changed, 48 insertions, 16 deletions

@@ -140,10 +140,23 @@ AKA, DO NOT USE THIS FUNCTION!!!"
                            "png")
                    eos))
           (lambda (&rest args)
-            (apply (if (executable-find "feh")
-                       #'browse-url-feh
-                     #'eww-browse-url)
-                   args)))
+            (apply
+             (cond ((executable-find "feh") #'browse-url-feh)
+                   ((executable-find "mpv")
+                    (defun browse-image-url-mpv (url &rest _args)
+                      "View an image URL in mpv."
+                      (let ((url (browse-url-encode-url url))
+                            (process-environment
+                             (browse-url-process-environment)))
+                        (message "Viewing %s in mpv..." url)
+                        (apply #'start-process
+                               (concat "mpv " url) nil
+                               "mpv"
+                               (append browse-url-mpv-arguments
+                                       (list "--image-display-duration=inf"
+                                             url))))))
+                   (t #'eww-browse-url))
+             args)))
     (cons (rx (or "youtube.com"         ; videos
                   "youtu.be"
                   (seq "." (or "mp4"
@@ -219,7 +232,9 @@ AKA, DO NOT USE THIS FUNCTION!!!"
               :channels ("#basement")
               :sasl-username ,circe-default-nick
               :sasl-password ,(acdw/make-password-fetcher
-                               :host "m455.casa")))
+                               :host "m455.casa"))
+             ;; TODO: irc.chat.twitch.tv
+             )
            circe-reduce-lurker-spam t
            circe-server-auto-join-default-type :after-auth)
 
@@ -247,6 +262,12 @@ AKA, DO NOT USE THIS FUNCTION!!!"
                  (with-current-buffer buf
                    (kill-buffer))))))
 
+  (defun circe-command-SHORTEN (url)
+    "Shorten URL using `0x0-shorten-uri'."
+    (interactive "sURL to shorten: ")
+    (let ((short-url (0x0-shorten-uri (0x0--choose-server) url)))
+      (circe-command-SAY short-url)))
+
   (:with-mode circe-chat-mode
     (:hook  #'acdw/stop-paren-annoyances
             #'enable-circe-color-nicks
@@ -440,8 +461,8 @@ AKA, DO NOT USE THIS FUNCTION!!!"
   (:hook visual-line-mode))
 
 (setup (:straight-if (define-repeat-map
-                         :host nil
-                         :repo "https://tildegit.org/acdw/define-repeat-map.el")
+                                     :host nil
+                                     :repo "https://tildegit.org/acdw/define-repeat-map.el")
                      (acdw/system :home))
 
   (defun acdw/other-window-or-switch-buffer-backward ()
@@ -728,7 +749,9 @@ AKA, DO NOT USE THIS FUNCTION!!!"
            "M-`" nil
            "C-x o" #'acdw/other-window-or-switch-buffer
            "C-x O" #'acdw/other-window-or-switch-buffer-backward
-           "C-c _" #'add-file-local-variable)
+           "C-c _" #'add-file-local-variable
+           "C-x C-c" #'delete-frame ; I keep fat-fingering and exiting
+           )
 
   (:with-map toggle-map
     (:bind "c" #'column-number-mode
@@ -740,7 +763,13 @@ AKA, DO NOT USE THIS FUNCTION!!!"
     (:bind "c" #'capitalize-dwim
            "t" #'titlecase-dwim
            "u" #'upcase-dwim
-           "l" #'downcase-dwim))
+           "l" #'downcase-dwim
+           "s" (defun studlify-dwim (count)
+                 "Studlify region if active, or COUNT words if not."
+                 (interactive "*p")
+                 (if (region-active-p)
+                     (studlify-region (region-beginning) (region-end))
+                   (studlify-word count)))))
   
   (add-hook 'after-make-frame-functions
             (defun after-make-frame@maximize (frame)
@@ -989,10 +1018,10 @@ specific to most general, they are these:
          "M-p" #'flymake-goto-prev-error))
 
 (setup flyspell
-  (add-hook 'text-mode-hook #'flyspell-mode))
+  (:hook-into text-mode))
 
 (setup (:straight flyspell-correct)
-  (:with-mode flyspell-mode
+  (:with-feature flyspell
     (:hook (defun flyspell@correct ()
              (:bind "C-;" #'flyspell-correct-wrapper)
              (:unbind "C-," "C-." "C-M-i")))))
@@ -1184,11 +1213,11 @@ specific to most general, they are these:
                    :repo "https://tildegit.org/acdw/kaomoji-insert"))
   (require 'kaomoji-insert)
   (dolist (km '(("(Ծ‸ Ծ)" "suspicious")
-                ("(¬‿¬)═ɜ ɛ═(⌐‿⌐ )" "pound it" "fist bump")
-                ("▬▬▬▬▬▬▬▋ Ò╭╮Ó" "hammer")
-                ("👁👄👁" "lewk")
-                ("( ͡~ ͜ʖ ͡°)" "wink")
-                ("⊙﹏⊙" "uhhh" "unsure")))
+                        ("(¬‿¬)═ɜ ɛ═(⌐‿⌐ )" "pound it" "fist bump")
+                        ("▬▬▬▬▬▬▬▋ Ò╭╮Ó" "hammer")
+                        ("👁👄👁" "lewk")
+                        ("( ͡~ ͜ʖ ͡°)" "wink")
+                        ("⊙﹏⊙" "uhhh" "unsure")))
     (add-to-list 'kaomoji-insert-alist km))
   (:global "C-x 8 k" #'kaomoji-insert))
 
@@ -1340,6 +1369,9 @@ browser defined in `browse-url-secondary-browser-function'."
   (acdw/sunrise-sunset #'modus-themes-load-operandi
                        #'modus-themes-load-vivendi))
 
+(setup mouse-avoidance
+  (mouse-avoidance-mode 'exile))
+
 (setup (:straight mwim)
   (:global "C-a" #'mwim-beginning
            "C-e" #'mwim-end))