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

4 files changed, 128 insertions, 52 deletions

@@ -408,7 +408,9 @@ In short, DO NOT USE THIS FUNCTION!!!"
     (:bind "b" (defun acdw/toggle-lexical-binding ()
                  "Toggle `lexical-binding' in the current buffer."
                  (interactive)
-                 (setq lexical-binding (not lexical-binding)))))
+                 (setq lexical-binding (not lexical-binding))
+                 (message "Lexical-binding is %s"
+                          (if lexical-binding "on." "off.")))))
 
   
   (:with-map case-map
@@ -1261,10 +1263,14 @@ specific to most general, they are these:
   (crux-reopen-as-root-mode +1))
 
 (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))
 
+  (require 'define-repeat-map           ; just for me
+           (acdw/dir
+            "straight/build/define-repeat-map/define-repeat-map.el"))
+
   (defun acdw/other-window-or-switch-buffer-backward ()
     (interactive)
     (setq repeat-map 'other-window-repeat-map)
@@ -1327,6 +1333,21 @@ specific to most general, they are these:
   (:with-map lookup-map
     (:bind "d" #'dictionary-search)))
 
+(setup (:straight (dogears
+                   :host github
+                   :repo "alphapapa/dogears.el"
+                   :files (:defaults
+                           (:exclude "helm-dogears.el"))))
+  (:option (append savehist-additional-variables) 'dogears-list)
+  (dolist (mode '(magit-status-mode
+                  elfeed-show-mode
+                  elfeed-search-mode))
+    (:option (append dogears-ignore-modes) mode))
+  (:global "M-g d" dogears-go
+           "M-g M-b" dogears-back
+           "M-g M-f" dogears-forward)
+  (dogears-mode +1))
+
 (setup (:straight edit-indirect))
 
 ;; requires extension:
@@ -1341,7 +1362,8 @@ specific to most general, they are these:
                               "tildes.net"))
                        'markdown-mode)
                  (cons (rx "github.com")
-                       'gfm-mode)))
+                       'gfm-mode)
+                 (cons "." 'text-mode)))
 
   (:advise edit-server-make-frame :before
            (defun edit-server@set-a-variable (&rest _)
@@ -1355,11 +1377,27 @@ specific to most general, they are these:
 (setup (:straight elfeed
                   elfeed-protocol)
   (:option elfeed-use-curl t
+           elfeed-curl-extra-arguments '("--insecure")
            elfeed-feeds `(("fever+https://acdw@mf.acdw.net"
                            :api-url "https://mf.acdw.net/fever/"
                            :password ,(acdw/make-password-fetcher
-                                       :host "mf.acdw.net"))))
-
+                                       :host "mf.acdw.net")
+                           :autotags    ; do I want to use elfeed-org ?
+                           '(("r/emacs" reddit social emacs)
+                             ("protesilaos.com/codelog.xml" emacs)
+                             ("tildes.net" social)
+                             ("catandgirl.com" comics)
+                             ("qwantz.com" comics)
+                             ("emacsninja.com" emacs)
+                             ("falseknees.com" comics)
+                             ("emacslife.com" emacs)
+                             ("lisp.org" lisp programming)
+                             ("scheme.org" scheme programming)
+                             ("smbc-comics.com" comics)
+                             ("youtube.com" video)
+                             ("tilde.news" social)
+                             ("xkcd.com" comics)))))
+  (elfeed-set-timeout 3600)
   (elfeed-protocol-enable)
   (:advise elfeed :after
            (defun elfeed@protocol-update (&rest _)
@@ -1507,15 +1545,13 @@ specific to most general, they are these:
   (:option flyspell-correct-interface #'flyspell-correct-completing-read
            flyspell-correct--cr-key ";")
 
-  (defun acdw/flyspell-correct-f7 ()
-    "Run a full spell correction on the current buffer."
-    (interactive)
-    (save-mark-and-excursion
-      (flyspell-correct-move 0 :forward :rapid)))
-
   (:with-feature flyspell
     (:bind "C-." #'flyspell-correct-wrapper
-           "<f7>" #'acdw/flyspell-correct-f7)
+           "<f7>" (defun acdw/flyspell-correct-f7 ()
+                    "Run a full spell correction on the current buffer."
+                    (interactive)
+                    (save-mark-and-excursion
+                      (flyspell-correct-move 0 :forward :rapid))))
     (:unbind "C-;" "C-," "C-." "C-M-i")))
 
 (setup (:straight-if forge
@@ -1568,11 +1604,9 @@ specific to most general, they are these:
   (with-eval-after-load 'elpher
     (require 'gemini-write)))
 
-(setup (:straight gitattributes-mode))
-
-(setup (:straight gitconfig-mode))
-
-(setup (:straight gitignore-mode))
+(setup (:straight gitattributes-mode
+                  gitconfig-mode
+                  gitignore-mode))
 
 (setup (:straight helpful)
   (:require-after 3)
@@ -1736,7 +1770,14 @@ browser defined in `browse-url-secondary-browser-function'."
            mastodon-tl--enable-relative-timestamps nil)
 
   (:hook #'hl-line-mode
-         #'reading-mode))
+         #'reading-mode)
+
+  (defun mastodon-goto-toot@recenter ()
+    "Recenter the current toot."
+    (recenter -1))
+  
+  (:advise mastodon-tl--goto-next-toot :after #'mastodon-goto-toot@recenter
+           mastodon-tl--goto-prev-toot :after #'mastodon-goto-toot@recenter))
 
 (setup (:straight (modus-themes
                    :host gitlab
@@ -1947,8 +1988,10 @@ browser defined in `browse-url-secondary-browser-function'."
                          (if transform
                              (substring
                               cand
-                              (next-single-property-change 0 'consult-org--buffer cand))
-                           (let ((m (car (get-text-property 0 'consult-org--heading cand))))
+                              (next-single-property-change
+                               0 'consult-org--buffer cand))
+                           (let ((m (car (get-text-property
+                                          0 'consult-org--heading cand))))
                              (if (member m org-clock-history)
                                  "*Recent*"
                                (buffer-name (marker-buffer m))))))))
@@ -1977,11 +2020,12 @@ the default is \"/\"."
                               (lambda (s) (replace-regexp-in-string "[ \t]+\\'" "" s))
                               (cl-loop for head in path
                                            for n from 0
-                                           collect (el-patch-swap
-                                         (org-add-props
-                                                             head nil 'face
-                                                             (nth (% n org-n-level-faces) org-level-faces))
-                                         head))
+                                           collect
+                               (el-patch-swap
+                                 (org-add-props
+                                  head nil 'face
+                                                  (nth (% n org-n-level-faces) org-level-faces))
+                                 head))
                               separator))))
         (when (> (length fpath) width)
           (if (< width 7)
@@ -2051,13 +2095,6 @@ the default is \"/\"."
               (persistent-scratch-mode +1))))
         (buffer-list)))
 
-(setup (:straight-if pkgbuild-mode
-                     (executable-find "makepkg"))
-  (:file-match "PKGBUILD"))
-
-(setup (:straight powerthesaurus)
-  (:global "C-c l t" #'powerthesaurus-lookup-word-dwim))
-
 (setup (:straight restart-emacs)
   (defun emacs-upgrade (&optional update-packages)
     "Pull config, upgrade packages, restart Emacs."
@@ -2066,9 +2103,11 @@ the default is \"/\"."
     (when update-packages
       (require 'straight-x)
       (straight-x-pull-all))
-    (restart-emacs)))(setup (:straight (shell-command+
-                                        :host nil
-                                        :repo "https://git.sr.ht/~pkal/shell-command-plus"))
+    (restart-emacs)))
+
+(setup (:straight (shell-command+
+                   :host nil
+                   :repo "https://git.sr.ht/~pkal/shell-command-plus"))
   (:option shell-command-prompt "$ ")
   (:with-feature dired
     (:bind "M-!" shell-command+))
@@ -2341,6 +2380,22 @@ If used with a numeric prefix argument N, N backticks will be inserted."
 
 (setup (:straight xr))
 
+(setup (:straight-if ytel
+                     (executable-find "mpv"))
+  ;; This might need to be changed depending on whether the instance goes down.
+  (:option ytel-invidious-api-url "https://invidious.snopyta.org")
+  (:bind "y"
+         (defun ytel-watch ()           ; This could possibly use `browse-url'.
+           "Stream video at point in mpv."
+           (interactive)
+           (let* ((video (ytel-get-current-video))
+                  (id (ytel-video-id video)))
+             (start-process "ytel mpv" nil
+                            "mpv"
+                            (concat "https://www.youtube.com/watch?v=" id)
+                            "--ytdl-format=bestvideo[height<=?720]+bestaudio/best")
+             (message "Starting streaming...")))))
+
 (setup (:straight zzz-to-char)
 
   (:global "M-z"
@@ -2350,5 +2405,3 @@ If used with a numeric prefix argument N, N backticks will be inserted."
              (if prefix
                  (call-interactively #'zzz-to-char)
                (call-interactively #'zzz-up-to-char)))))
-
-;;; init.el ends here
@@ -28,5 +28,5 @@
      1))
   "Show faces and variables in `imenu'.")
 
-(provide 'acdw/cus-edit)
+(provide 'acdw-cus-edit)
 ;;; acdw-cus-edit.el ends here
@@ -11,8 +11,17 @@
 ;; - Don't hurt yourself.
 ;; - Make good choices.
 
+;;; Commentary:
+
+;; here is my attempt at a reading mode.
+
 ;;; Code:
 
+(require 'olivetti)
+
+(defvar-local //indicate-empty-lines nil)
+(defvar-local //indicate-buffer-boundaries nil)
+
 ;;;###autoload
 (define-minor-mode reading-mode
   "A mode for reading."
@@ -22,30 +31,37 @@
   (if reading-mode
       (progn ;; turn on
         ;; settings
-        (setq-local orig-indicate-empty-lines indicate-empty-lines
+        (setq-local //indicate-empty-lines indicate-empty-lines
                     indicate-empty-lines nil
-                    orig-indicate-buffer-boundaries indicate-buffer-boundaries
+                    //indicate-buffer-boundaries indicate-buffer-boundaries
                     indicate-buffer-boundaries nil)
         ;; disable modes
-        (dolist (mode '(display-fill-column-indicator-mode))
+        (dolist (mode '(display-fill-column-indicator-mode
+                        blink-cursor-mode))
           (when (fboundp mode)
+            (set (make-local-variable
+                  (intern (format "//%s" mode)))
+                 (symbol-value mode))
             (funcall mode -1)))
         ;; enable modes
         (dolist (mode '(olivetti-mode))
           (when (fboundp mode)
+            (set (make-local-variable
+                  (intern (format "//%s" mode)))
+                 (symbol-value mode))
             (funcall mode +1))))
     ;; turn off
-    ;; settings
-    (setq-local indicate-empty-lines orig-indicate-empty-lines
-                indicate-buffer-boundaries orig-indicate-buffer-boundaries)
-    ;; enable modes
-    (dolist (mode '(display-fill-column-indicator-mode))
-      (when (fboundp mode)
-        (funcall mode +1)))
-    ;; disable modes
-    (dolist (mode '(olivetti-mode))
+    ;; restore settings
+    (setq-local indicate-empty-lines //indicate-empty-lines
+                indicate-buffer-boundaries //indicate-buffer-boundaries)
+    ;; restore modes
+    (dolist (mode '(display-fill-column-indicator-mode
+                    olivetti-mode
+                    blink-cursor-mode))
       (when (fboundp mode)
-        (funcall mode -1)))))
+        (funcall mode (if (symbol-value (intern (format "//%s" mode)))
+                          +1
+                        -1))))))
 
 (provide 'acdw-reading)
 ;;; acdw-reading.el ends here
@@ -11,8 +11,15 @@
 ;; - Don't hurt yourself.
 ;; - Make good choices.
 
+;;; Commentary:
+
+;; setup.el makes defining local macros for `setup' forms quite simple, at
+;; least to my mind.  Here are some of the ones I've defined.
+
 ;;; Code:
 
+(require 'setup)
+
 (setup-define :autoload
   (lambda (func)
     (if (listp func)