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

1 files changed, 37 insertions, 17 deletions

@@ -531,8 +531,8 @@ I want the git version.
                 modus-themes-bold-constructs t
                 modus-themes-region 'bg-only
                 modus-themes-org-blocks 'grayscale
-                modus-themes-headings '((1 . line)
-                                        (t . t))
+                modus-themes-headings '((1 . section)
+                                        (t . no-color))
                 modus-themes-scale-headings nil
                 modus-themes-mode-line 'borderless-3d)
 #+end_src
@@ -1620,14 +1620,13 @@ don't know if it's that useful.
   (add-hook 'text-mode-hook #'hook--wc-mode-no-keybinds)
 #+end_src
 
-*** Keybinding                                                           :crux:
+*** Keybinding
 
 I just found out that =M-== counts the words in a region.  That's great, but I
-often want to count the words in the whole buffer.  Enter
-=crux-with-region-or-buffer=.  I could change the binding. .... but I don't want to.
+often want to count the words in the whole buffer.
 
 #+begin_src emacs-lisp :noweb-ref bindings
-  (crux-with-region-or-buffer count-words-region)
+  (define-key acdw/map (kbd "M-=") #'count-words)
 #+end_src
 
 ** Spell checking
@@ -1685,10 +1684,27 @@ Display corrections with =completing-read=.
             #'(lambda () (blackout 'iscroll-mode)))
 #+end_src
 
-** TODO Reading mode
+** Reading mode
 
 A custom mode to make reading comfy
 
+#+begin_src emacs-lisp :noweb-ref modes
+  (define-minor-mode acdw/reading-mode
+      "Make reading comfier."
+    :lighter " Read" ; later: book emoji
+    (if acdw/reading-mode
+        (progn ;; turn on
+          (text-scale-increase +1)
+          (visual-fill-column-mode +1)
+          (iscroll-mode +1)
+          (display-fill-column-indicator-mode -1))
+      (progn ;; turn off
+        (text-scale-increase 0)
+        (visual-fill-column-mode -1)
+        (iscroll-mode -1)
+        (display-fill-column-indicator-mode +1))))
+#+end_src
+
 * Programming
 
 ** Comments
@@ -2123,12 +2139,7 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
 #+end_src
 
 #+begin_src emacs-lisp :noweb-ref hooks
-  (defun hook--elfeed-show ()
-    (text-scale-adjust +1)
-    (visual-fill-column-mode +1)
-    (iscroll-mode +1))
-
-  (add-hook 'elfeed-show-mode-hook #'hook--elfeed-show)
+  (add-hook 'elfeed-show-mode-hook #'acdw/reading-mode)
 #+end_src
 
 #+begin_src emacs-lisp :noweb-ref bindings
@@ -2140,6 +2151,8 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
 #+begin_src emacs-lisp :noweb-ref settings
   (setq elfeed-feeds
         `(
+          ("https://blog.astrosnail.pt.eu.org/feed.atom" tech blags)
+          ("https://www.greghendershott.com/feeds/all.atom.xml" tech blags)
           ("https://hans.gerwitz.com/feeds/writing.rss" fwends)
           ("http://planet.lisp.org/rss20.xml" tech lisp)
           ("https://wflewis.com/feed.xml" blags fwends)
@@ -2287,11 +2300,14 @@ others.
   (setq-default elpher-ipv4-always t)
 
   (doremi-face-set 'elpher-gemini-heading1
-                   '((t (:inherit (modus-theme-heading-1)))))
+                   '((t (:inherit (modus-theme-heading-1)
+                         :height 1.0))))
   (doremi-face-set 'elpher-gemini-heading2
-                   '((t (:inherit (modus-theme-heading-2)))))
+                   '((t (:inherit (modus-theme-heading-2)
+                         :height 1.0))))
   (doremi-face-set 'elpher-gemini-heading3
-                   '((t (:inherit (modus-theme-heading-3)))))
+                   '((t (:inherit (modus-theme-heading-3)
+                         :height 1.0))))
 #+end_src
 
 #+begin_src emacs-lisp :noweb-ref no-littering
@@ -2308,6 +2324,10 @@ others.
     (define-key elpher-mode-map "G" #'elpher-go-current))
 #+end_src
 
+#+begin_src emacs-lisp :noweb-ref hooks
+  (add-hook 'elpher-mode-hook #'acdw/reading-mode)
+#+end_src
+
 *** Gemini-mode                                                       :package:
 
 #+begin_src emacs-lisp :noweb-ref packages
@@ -2778,7 +2798,7 @@ TODO, and Diary.
           :empty-lines 1)
      ;; Books to read
      ("b" "Book to read" entry
-          (file "books.org")
+          (file+headline "books.org" "Later")
           "* TOREAD %^{Title}
   :PROPERTIES:
   :Author: %^{Author}