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

1 files changed, 148 insertions, 102 deletions

@@ -81,15 +81,31 @@
                 browse-url-firefox-new-window-is-tab t)
 
   (acdw/browse-url-set-handlers
-   `(("\\.jpe?g\\'" . ,(if (executable-find "feh")
-                           #'browse-url-feh
-                         #'eww-browse-url))
-     ("youtube\\.com\\|youtu\\.be" . ,(if (executable-find "mpv")
-                                          #'browse-url-mpv
-                                        #'eww-browse-url))
-     ("google\\.com" . browse-url-default-browser)
-     ("\\(twitter\\.com\\|t\\.co\\)" . acdw/eww-browse-twitter-url)
-     ("." . eww-browse-url)))
+   (list
+    (cons (rx (seq "." (or "jpeg" "jpg" ; images
+                           "png")
+                   eos))
+          (lambda (&rest args)
+            (apply (if (executable-find "feh")
+                       #'browse-url-feh
+                     #'eww-browse-url)
+                   args)))
+    (cons (rx (or "youtube.com"         ; videos
+                  "youtu.be"
+                  (seq "." (or "mp4"
+                               "gif")
+                       eos)))
+          (lambda (&rest args)
+            (apply (if (executable-find "mpv")
+                       #'browse-url-mpv
+                     browse-url-secondary-browser-function)
+                   args)))
+    (cons (rx (or "google.com"         ; websites that don't work with eww
+                  "reddit.com"
+                  "twitter.com"))
+          browse-url-secondary-browser-function)
+    (cons "."                          ; everything else
+          #'eww-browse-url)))
 
   ;; Buttonize gemini:// links.
   (acdw/add-button-url-regexp-protocol "gemini"))
@@ -153,8 +169,7 @@
              ("Variables" "^\\(?:Show Value\\|Hide\\) \\([^:\n]*\\)" 1))))))
 
 (setup debugger
-  (:hook visual-line-mode)
-  (:global  "C-c d" toggle-debug-on-error))
+  (:hook visual-line-mode))
 
 (setup dired
   (setq-default dired-recursive-copies 'always
@@ -323,6 +338,7 @@
   
   (:option
    erc-auto-discard-away t
+   erc-auto-set-away t
    erc-autoaway-idle-seconds 600
    erc-autoaway-message "BRB (autoaway: %i seconds)"
    erc-button-url-regexp browse-url-button-regexp
@@ -333,7 +349,7 @@
    erc-fill-static-center 14
    erc-format-nick-function #'erc-format-truncate-@nick
    erc-header-line-face-method #'erc/update-header-line-show-disconnected
-   erc-hide-list '("NICK" "MODE" "JOIN" "PART" "QUIT")
+   erc-hide-list '("NICK" "MODE" "JOIN" "PART" "QUIT" "AWAY")
    erc-interpret-controls-p t
    erc-interpret-mirc-color t
    erc-join-buffer 'bury
@@ -353,7 +369,9 @@
    erc-server-coding-system '(utf-8 . utf-8)
    erc-timestamp-intangible t
    erc-track-exclude-types (append erc-hide-list
-                                   '("AWAY"
+                                   '("AWAY" ; for some reason this triggers
+                                        ; track anyway... so it's in
+                                        ; `erc-hide-list'
                                      "353" "324" "329" "332" "333" "477"))
    erc-track-exclude-server-buffer t
    erc-track-position-in-mode-line 'before-modes
@@ -487,74 +505,6 @@ like a dumbass."
                 (define-key flyspell-mode-map
                   (kbd (car keybind)) (cdr keybind))))))
 
-;; (setup flyspell
-;;   ;; follow the directions here: https://old.reddit.com/r/emacs/comments/dgj0ae
-;;   ;; in short:
-;;   ;; - download hunspell from GitHub and put in ~/usr/bin
-;;   ;; - download LibreOffice English dictionaries and put in
-;;   ;;   ~/usr/share/hunspell
-;;   (setq-default
-;;    flyspell-issue-message-flag nil
-;;    ispell-program-name "hunspell"
-;;    ispell-dictionary "default"
-;;    ispell-personal-dictionary "~/.hunspell_personal"
-;;    ispell-local-dictionary-alist '(("default"
-;;                                     "[[:alpha:]]" "[^[:alpha:]]"
-;;                                     "[']" nil
-;;                                     ("-d" "en_US") nil utf-8)))
-
-;;   (acdw/system
-;;    (:work (let ((dicpath (expand-file-name "~/usr/share/hunspell/")))
-;;             (setenv "DICPATH" dicpath))))
-
-;;   ;; new variable `ispell-hunspell-dictionary-alist' is defined in Emacs
-;;   ;; If it's nil, Emacs tries to automatically set up the dictionaries.
-;;   (when (boundp 'ispell-hunspell-dictionary-alist)
-;;     (setq ispell-hunspell-dictionary-alist ispell-local-dictionary-alist))
-
-;;   (:needs ispell-program-name) ; don't proceed if not installed
-
-;;   (unless (file-exists-p ispell-personal-dictionary)
-;;     (write-region "" nil ispell-personal-dictionary nil 0))
-
-;;   (when (executable-find ispell-program-name)
-;;     (add-hook 'text-mode-hook #'flyspell-mode)
-;;     (add-hook 'prog-mode-hook #'flyspell-prog-mode))
-
-;;   (:when-loaded
-;;    (setup (:straight flyspell-correct)
-;;      (:with-map flyspell-mode-map
-;;        (:bind "C-;" flyspell-correct-wrapper
-;;               ;; Remove all other binds
-;;               "C-," nil
-;;               "C-." nil
-;;               "C-M-i" nil)))))
-
-;; (setup flyspell
-;;   (:option
-;;    flyspell-issue-message-flag nil
-;;    ispell-program-name "aspell"
-;;    ispell-dictionary "en_US"
-;;    ispell-personal-dictionary "~/.dictionary"
-;;    ispell-extra-args '("--sug-mode=ultra" "--lang=en_US"))
-
-;;   (:needs ispell-program-name)
-
-;;   (unless (file-exists-p ispell-personal-dictionary)
-;;     (write-region "" nil ispell-personal-dictionary nil 0))
-
-;;   (add-hook 'text-mode-hook #'flyspell-mode)
-;;   (add-hook 'prog-mode-hook #'flyspell-prog-mode)
-
-;;   (:when-loaded
-;;    (setup (:straight flyspell-correct)
-;;      (:with-map flyspell-mode-map
-;;        (:bind "C-;" flyspell-correct-wrapper
-;;               ;; Remove other binds
-;;               "C-," nil
-;;               "C-." nil
-;;               "C-M-i" nil)))))
-
 (setup frames
   (:option frame-title-format '("%b@"
                                 (:eval
@@ -609,11 +559,7 @@ like a dumbass."
                          (mode . gemini-mode)
                          (mode . eww-mode))))))
 
-  (global-set-key (kbd "C-x C-b")
-                  (defun list-buffers-or-ibuffer (arg)
-                    "`list-buffers', or with a prefix arg, `ibuffer'."
-                    (interactive "P")
-                    (if arg (ibuffer) (electric-buffer-list nil))))
+  (global-set-key (kbd "C-x C-b") #'ibuffer)
 
   (add-hook 'ibuffer-mode-hook
             (defun ibuffer@filter-to-default ()
@@ -1006,8 +952,7 @@ like a dumbass."
    kill-read-only-ok t
    load-prefer-newer t
    native-comp-async-report-warnings-errors nil
-   set-mark-command-repeat-pop t
-   )
+   set-mark-command-repeat-pop t)
 
   (when (fboundp 'command-completion-default-include-p)
     (setq read-extended-command-predicate
@@ -1018,13 +963,24 @@ like a dumbass."
            "C-c c" capitalize-dwim
            "C-c u" upcase-dwim
            "C-c l" downcase-dwim
-           "C-c t" acdw/insert-iso-date)
+           "C-c d" acdw/insert-iso-date
+           "M-`" nil)
+
+  ;; toggle bindings
+  (defvar toggle-map (make-sparse-keymap)
+    "A keymap for toggling!")
+  (global-set-key (kbd "C-c t") toggle-map)
+
+  (:with-map toggle-map
+    (:bind "c" column-number-mode
+           "l" display-line-numbers-mode
+           "d" toggle-debug-on-error))
 
   (defalias 'forward-word-with-case 'forward-word
     "Alias for `forward-word' for use in `case-repeat-map'.")
   (defalias 'backward-word-with-case 'backward-word
     "Alias for `backward-word for use in `case-repeat-map'.")
-  
+
   (defvar case-repeat-map
     (let ((map (make-sparse-keymap)))
       (define-key map "c" #'capitalize-word)
@@ -1035,6 +991,7 @@ like a dumbass."
       (define-key map "b" #'backward-word-with-case)
       map)
     "A map to repeat word-casing commands.  For use with `repeat-mode'.")
+  
   (dolist (command '(capitalize-word
                      capitalize-dwim
                      upcase-word
@@ -1092,10 +1049,17 @@ like a dumbass."
       (define-key gnus-article-mode-map key #'ace-link-gnus))
     (with-eval-after-load 'ert
       (define-key ert-results-mode-map "o" #'ace-link-help))
+    (with-eval-after-load 'mastodon
+      (define-key mastodon-mode-map "o" #'ace-link-addr))
     ;; And still everything else
     (setq ace-link-fallback-function #'ace-link-addr)
     (global-set-key key #'ace-link)))
 
+(setup (:straight alert)
+  (:option alert-default-style (acdw/system
+                                (:home 'libnotify)
+                                (_ 'message))))
+
 (setup (:straight avy)
   (:global "C-'" avy-goto-char-timer
            "M-g f" avy-goto-line
@@ -1108,6 +1072,74 @@ like a dumbass."
 (setup (:straight (beginend))
   (beginend-global-mode +1))
 
+(setup (:straight circe)
+  (require 'circe)
+  (require 'acdw-irc)
+  
+  (setq acdw-irc/post-my-nick "-> ")
+  
+  (setq circe-default-part-message "See You, Space Cowpokes . . ."
+        circe-highlight-nick-type 'all
+        ;; circe-network-options in private.el
+        circe-reduce-lurker-spam t
+        circe-server-auto-join-default-type :after-auth)
+
+  (add-hook 'circe-chat-mode-hook
+            (defun circe-chat@setup ()
+              (lui-set-prompt
+               (concat (propertize (acdw-irc/margin-format (buffer-name)
+                                                           ""
+                                                           ">")
+                                   'face 'circe-prompt-face
+                                   'read-only t 'intangible t
+                                   'cursor-intangible t)
+                       " "))
+              (enable-circe-color-nicks)
+              (enable-circe-display-images)
+              (enable-circe-new-day-notifier)))
+
+  (let ((len (number-to-string (- acdw-irc/left-margin 1
+                                  (+ (length acdw-irc/pre-nick)
+                                     (length acdw-irc/post-nick)))))
+        (my-len (number-to-string (- acdw-irc/left-margin 1
+                                     (+ (length acdw-irc/pre-my-nick)
+                                        (length acdw-irc/post-my-nick))))))
+    (setq circe-format-say (concat acdw-irc/pre-nick
+                                   "{nick:" len "." len "s} "
+                                   acdw-irc/post-nick
+                                   "{body}")
+          circe-format-self-say (concat acdw-irc/pre-my-nick
+                                        "{nick:" my-len "." my-len "s} "
+                                        acdw-irc/post-my-nick
+                                        "{body}")
+          circe-format-action (concat "*"
+                                      (repeat-string
+                                       (- acdw-irc/left-margin 3)
+                                       " ")
+                                      "* {nick} {body}")
+          circe-format-self-action (concat "-*"
+                                           (repeat-string
+                                            (- acdw-irc/left-margin 4)
+                                            " ")
+                                           "* {nick} {body}")
+          lui-fill-type (concat
+                         (repeat-string (- acdw-irc/left-margin 2)
+                                        " ")
+                         "  ")))
+
+  (setq lui-time-stamp-position 'right-margin
+        lui-time-stamp-format "%H:%M")
+  (add-hook 'lui-mode-hook
+            (defun lui-mode@setup ()
+              (setq-local fringes-outside-margins t
+                          lui-track-bar-behavior 'before-switch-to-buffer
+                          right-margin-width 5
+                          scroll-margin 0
+                          word-wrap t
+                          wrap-prefix (repeat-string
+                                       (1+ acdw-irc/left-margin) " "))
+              (enable-lui-track-bar))))
+
 (setup (:straight (consult
                    :host github
                    :repo "minad/consult"))
@@ -1263,7 +1295,10 @@ like a dumbass."
   (when (and (daemonp)
              (require 'edit-server nil :noerror))
     (edit-server-start)
-    (add-hook 'edit-server-done-hook #'unfill-buffer)))
+
+    (advice-add 'edit-server-make-frame :before
+                (defun edit-server@set-a-variable (&rest _)
+                  (setq edit-server-frame-p t)))))
 
 (setup (:straight (electric-cursor
                    :host github
@@ -1420,7 +1455,7 @@ successive invocations."
 
 (setup (:straight helpful)
   (:option helpful-max-buffers 5
-           helpful-switch-buffer-function #'pop-to-buffer
+           ;; helpful-switch-buffer-function #'pop-to-buffer
            ;; helpful-switch-buffer-function
            ;; (lambda (buf)
            ;;   (pop-to-buffer buf
@@ -1434,13 +1469,14 @@ successive invocations."
            "<help> k" helpful-key
            "<help> o" helpful-symbol
            "C-c C-d" helpful-at-point)
-  (with-eval-after-load 'helpful
-    (define-key helpful-mode-map "q"
-      (defun helpful-mode|quit ()
-        (interactive)
-        (bury-buffer)
-        (unless (window-parameter (frame-selected-window) 'no-other-window)
-          (delete-window))))))
+  ;; (with-eval-after-load 'helpful
+  ;;   (define-key helpful-mode-map "q"
+  ;;     (defun helpful-mode|quit ()
+  ;;       (interactive)
+  ;;       (bury-buffer)
+  ;;       (unless (window-parameter (frame-selected-window) 'no-other-window)
+  ;;         (delete-window)))))
+  )
 
 (setup (:straight iscroll)
   (:hook-into text-mode))
@@ -1476,7 +1512,9 @@ successive invocations."
   (:straight request)
   (:option mastodon-instance-url "https://writing.exchange"
            mastodon-auth-source-file (car auth-sources)
-           mastodon-client--token-file (acdw/dir "mastodon.plstore")))
+           mastodon-client--token-file (acdw/dir "mastodon.plstore"))
+  (:hook hl-line-mode
+         olivetti-mode))
 
 (setup (:straight (modus-themes
                    :host gitlab
@@ -1492,6 +1530,8 @@ successive invocations."
   (acdw/sunrise-sunset #'modus-themes-load-operandi
                        #'modus-themes-load-vivendi))
 
+(setup (:straight markdown-mode))
+
 (setup (:straight mwim)
   (:global "C-a" mwim-beginning
            "C-e" mwim-end))
@@ -1673,6 +1713,11 @@ successive invocations."
   (dolist (mode lispy-modes)
     (add-hook (intern (concat (symbol-name mode) "-hook")) #'paren-face-mode)))
 
+(setup (:straight persistent-scratch)
+  (:option persistent-scratch-backup-directory (acdw/dir "scratch" t)
+           persistent-scratch-keep-n-newest-backups 12))
+(persistent-scratch-setup-default))
+
 (setup (:straight restart-emacs)
   (defun emacs-upgrade (&optional update-packages)
     "Pull config, upgrade packages, restart Emacs."
@@ -1695,11 +1740,12 @@ successive invocations."
                                acdw-modeline/wc
                                acdw-modeline/text-scale
                                simple-modeline-segment-process
+                               acdw-modeline/track
                                acdw-modeline/god-mode-indicator
                                acdw-modeline/winum
                                acdw-modeline/minions
                                acdw-modeline/narrowed
-                               simple-modeline-segment-major-mode)))
+                               acdw-modeline/major-mode)))
 
   ;; I've put in a pull request to add the (- 0 right-margin) bit here.
   (advice-add 'simple-modeline--format :override
@@ -1947,7 +1993,7 @@ call `zzz-to-char'."
 
   (add-hook 'after-make-frame-functions
             (defun after-make-frame@maximize (frame)
-              (unless (or edit-server-edit-mode)
+              (unless (bound-and-true-p edit-server-frame-p)
                 (toggle-frame-maximized frame)))))
 
 ;;;; Work