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

2 files changed, 94 insertions, 30 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
@@ -1266,6 +1266,12 @@ contents of the files the represent on-disk.  Thus, we have
   (setq-default fill-column 80)
 #+end_src
 
+I also want to display the fill-column:
+
+#+begin_src emacs-lisp :noweb-ref modes
+  (global-display-fill-column-indicator-mode +1)
+#+end_src
+
 By default, Emacs uses =C-x f= to set the =fill-column=.  I think it's
 pretty dumb that such an easy-to-reach binding (for Emacs) is set to a function
 that I /literally/ never use.  So I'm going to bind it to =find-file= ... since
@@ -1570,14 +1576,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
@@ -1635,10 +1640,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
@@ -1775,6 +1797,15 @@ checks for a shebang).
 
 ** Language-specific
 
+*** Generic-x
+
+from [[https://www.reddit.com/r/emacs/comments/lfww57/weekly_tipstricketc_thread/gmtk79e/][u/Bodertz]], apparently =generic-x= just ... has syntax highlighting for a ton
+of (I suppose) generic files.
+
+#+begin_src emacs-lisp :noweb-ref packages
+  (require 'generic-x)
+#+end_src
+
 *** Emacs Lisp
 
 **** Don't limit the length of evaluated expressions
@@ -2064,12 +2095,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
@@ -2229,11 +2255,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
@@ -2250,6 +2279,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
@@ -2720,7 +2753,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}
@@ -2870,22 +2903,46 @@ Emacs (or the [[https://chrome.google.com/webstore/detail/edit-with-emacs/ljobjl
   (add-hook 'after-init-hook #'edit-server-start)
 #+end_src
 
-*** =git-sync= ~/org
+*** =git-sync= stuff
 
-I don't know where else to put this, but it's just a little command to
-run =git-sync= in =org-directory=.
+This function require [[https://github.com/simonthum/git-sync][git-sync]].
 
 #+begin_src emacs-lisp :noweb-ref functions
-  (defun acdw/org-sync ()
-    "Run git-sync in `org-directory'.
+  (defun acdw/git-sync (directory)
+    "Run git-sync in DIRECTORY."
+    (interactive)
+    (message "Git-Syncing %s..." directory)
+    (let ((proc (start-process "git-sync"
+                               (get-buffer-create (format "*git-sync:%s*" directory))
+                               "git" "-C" (expand-file-name directory) "sync")))
+      (add-function :after (process-sentinel proc)
+                    (lambda (proc ev)
+                      (cond
+                        ((string-match "finished\n\\'" ev)
+                         (message "Git-Syncing %s...Done." directory)))))))
+#+end_src
+
+**** ~/org
+
+#+begin_src emacs-lisp :noweb-ref bindings
+  (defun acdw/git-sync-org ()
+    "Run `acdw/git-sync' on `org-directory'."
+    (interactive)
+    (acdw/git-sync org-directory))
+
+  (define-key acdw/leader (kbd "C-M-o") #'acdw/git-sync-org)
+#+end_src
+
+**** ~/.cache/elfeed/db
 
-  Requires git-sync."
+#+begin_src emacs-lisp :noweb-ref bindings
+  (defun acdw/git-sync-elfeed-db ()
+    "Run `acdw/git-sync' on `elfeed-db-directory'."
     (interactive)
     (save-some-buffers :no-query nil)
-    (async-shell-command
-     (format "git -C %s sync" (expand-file-name org-directory))))
+    (acdw/git-sync elfeed-db-directory))
 
-  (define-key acdw/leader (kbd "C-M-o") #'acdw/org-sync)
+  (define-key acdw/leader (kbd "C-M-f") #'acdw/git-sync-elfeed-db)
 #+end_src
 
 ** Linux (home)
@@ -2893,8 +2950,6 @@ run =git-sync= in =org-directory=.
 :header-args: :noweb-ref linux-specific
 :END:
 
-*** Settings
-
 *** Scripts
 
 **** em
@@ -2943,6 +2998,15 @@ I use Windows at work, where I /also/ don't have Admin rights.  So I
 kind of fly-by-night there.  Many of the ideas and scripts in this
 section come from [[https://github.com/termitereform/JunkPile/blob/master/emacs-on-windows.md][termitereform]] on Github.
 
+*** Environment variables
+
+**** DICPATH, for Hunspell
+
+#+begin_src emacs-lisp :noweb-ref windows-specific
+  (setenv "DICPATH" (expand-file-name "exe/share/hunspell"
+                                      "~/Applications/"))
+#+end_src
+
 *** Settings
 
 See also [[https://www.gnu.org/software/emacs/manual/html_mono/efaq-w32.html][the GNU FAQ for Windows]].  At some point I should really dig
@@ -3197,7 +3261,7 @@ the needed boolean expression to tangle config.org.  Booleans, yall!
 #+begin_src emacs-lisp
   (let* (;; Speed up init
          (gc-cons-threshold most-positive-fixnum)
-         (gc-cons-percentage 0.6)
+         ;; (gc-cons-percentage 0.6)
          (file-name-handler-alist nil)
          ;; Config file names
          (config (expand-file-name "config"
@@ -18,7 +18,7 @@
 
 (let* (;; Speed up init
        (gc-cons-threshold most-positive-fixnum)
-       (gc-cons-percentage 0.6)
+       ;; (gc-cons-percentage 0.6)
        (file-name-handler-alist nil)
        ;; Config file names
        (config (expand-file-name "config"