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

4 files changed, 68 insertions, 47 deletions

@@ -12,6 +12,9 @@
 !var/
 var/*
 !var/elpher-bookmarks.el
+!var/elfeed/
+var/elfeed/*
+!var/elfeed/db
 
 !etc/
 etc/*
@@ -0,0 +1,3 @@
+[submodule "var/elfeed/db"]
+        path = var/elfeed/db
+        url = https://tildegit.org/acdw/elfeed-db
@@ -210,25 +210,6 @@ This is extremely fiddly and I'd love another option.
   (define-key acdw/map (kbd "M-o") #'crux-other-window-or-switch-buffer)
 #+end_src
 
-*** Visual fill column mode
-
-In reading-intensive views, this mode keeps the text from getting too
-wide.
-
-#+begin_src emacs-lisp :noweb-ref packages
-  (straight-use-package 'visual-fill-column)
-#+end_src
-
-#+begin_src emacs-lisp :noweb-ref settings
-  (setq-default visual-fill-column-center-text t)
-#+end_src
-
-#+begin_src emacs-lisp :noweb-ref hooks
-  (add-hook 'visual-line-mode-hook #'visual-fill-column-mode)
-
-  (with-eval-after-load 'visual-fill-column
-    (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
-#+end_src
 
 *** The *Help* window
 
@@ -415,11 +396,11 @@ But on Windows, I use Consolas.
 #+begin_src emacs-lisp :noweb-ref windows-specific
   (set-face-attribute 'default nil
                       :family "Consolas"
-                      :height 110)
+                      :height 100)
 
   (set-face-attribute 'fixed-pitch nil
                       :family "Consolas"
-                      :height 110)
+                      :height 100)
 #+end_src
 
 *** Underlines
@@ -658,6 +639,14 @@ minor-modes from the modeline.
                           :repo "raxod502/blackout"))
 #+end_src
 
+**** Which-function mode
+
+Shows where we are in the modeline.
+
+#+begin_src emacs-lisp :noweb-ref modes
+  (which-function-mode +1)
+#+end_src
+
 *** Setting faces
 
 It took me a while to find a function that'll let me customize faces
@@ -760,7 +749,12 @@ to /hide/ those contents.
                 read-file-name-completion-ignore-case t)
 #+end_src
 
-*** Selectrum                                                       :package:
+*** Selectrum                                                 :package:
+
+*COMMENT 2021-02-01*: For some reason, selectrum will randomly do a thing where
+it, like, flashes up and down in the minibuffer?  I don't know how to explain
+it, it's super weird.  I guess I should file a bug report ... but until then,
+I'll just use =icomplete-vertical=.
 
 My minibuffer completion system uses =selectrum=, =prescient=, =company=,
 and =marginalia=.  At some point, I'd like to take a deep dive in =embark=
@@ -775,6 +769,17 @@ for now .... I just want to see my completions.
   (selectrum-mode +1)
 #+end_src
 
+*** COMMENT Icomplete
+
+#+begin_src emacs-lisp :noweb-ref packages
+  (straight-use-package 'icomplete-vertical)
+#+end_src
+
+#+begin_src emacs-lisp :noweb-ref modes
+  (icomplete-mode +1)
+  (icomplete-vertical-mode +1)
+#+end_src
+
 *** Prescient                                                       :package:
 
 #+begin_src emacs-lisp :noweb-ref packages
@@ -1270,30 +1275,13 @@ that's the only time I accidentally call it, anyway.
 
 *** Auto-fill vs. Visual-line
 
-I've mostly been using visual-line mode, and it's been pretty good.
-There are some times, however, when lines are just ... really long,
-and they wrap weird or whatever.  Not to mention, in Org mode,
-=visual-line-mode= screws up the bindings for line movement.  So
-here's what I'm going to do.
-
-1. Enable =visual-line-mode= with =text-mode=, but /not/ with
-   =org-mode=.
-
-   #+begin_src emacs-lisp :noweb-ref hooks
-     (defun hook--visual-line-mode ()
-       (unless (eq major-mode 'org-mode)
-         (visual-line-mode +1)))
-
-     (add-hook 'text-mode-hook #'hook--visual-line-mode)
-   #+end_src
-
-2. Enable =auto-fill-mode= with text modes.
+1. Enable =auto-fill-mode= with text modes.
 
    #+begin_src emacs-lisp :noweb-ref hooks
      (add-hook 'text-mode-hook #'auto-fill-mode)
    #+end_src
 
-3. /Just/ in case ... let's "fix" =visual-line-mode= if we're in =org-mode=.
+2. /Just/ in case ... let's "fix" =visual-line-mode= if we're in =org-mode=.
 
    #+begin_src emacs-lisp :noweb-ref hooks
      (defun hook--visual-line-fix-org-keys ()
@@ -1310,6 +1298,26 @@ I think that'll work -- I only care about line aesthetics with text.
 Programming modes should be /allowed/ to have long lines, regardless
 of how /terrible/ it is to have them.
 
+*** Visual fill column mode
+
+In reading-intensive views, this mode keeps the text from getting too
+wide.
+
+#+begin_src emacs-lisp :noweb-ref packages
+  (straight-use-package 'visual-fill-column)
+#+end_src
+
+#+begin_src emacs-lisp :noweb-ref settings
+  (setq-default visual-fill-column-center-text t)
+#+end_src
+
+#+begin_src emacs-lisp :noweb-ref hooks
+  (add-hook 'visual-fill-column-mode-hook #'visual-line-mode)
+
+  (with-eval-after-load 'visual-fill-column
+    (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
+#+end_src
+
 *** Stay snappy with long-lined files
 
 #+begin_src emacs-lisp :noweb-ref modes
@@ -1397,6 +1405,9 @@ It manages my whitespace for me, anyway.
 
 ** The Mark
 
+see also
+- [[https://spwhitton.name/blog/entry/transient-mark-mode/][Gnu Emacs' Transient Mark mode]], Sean Whitton
+
 *** Repeat popping the mark without repeating the prefix argument
 
 #+begin_src emacs-lisp :noweb-ref settings
@@ -1929,14 +1940,14 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
 #+end_src
 
 #+begin_src emacs-lisp :noweb-ref settings
-  (setq-default elfeed-goodies/entry-pane-position 'bottom
+  (setq-default elfeed-goodies/entry-pane-position 'top
                 elfeed-goodies/powerline-default-separator nil
                 elfeed-goodies/tag-column-width 16)
 #+end_src
 
 #+begin_src emacs-lisp :noweb-ref hooks
   (defun hook--elfeed-show ()
-    (visual-line-mode +1))
+    (visual-fill-column-mode +1))
 
   (add-hook 'elfeed-show-mode-hook #'hook--elfeed-show)
 #+end_src
@@ -1949,7 +1960,9 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
 
 #+begin_src emacs-lisp :noweb-ref settings
   (setq elfeed-feeds
-        `(("https://rachelbythebay.com/w/atom.xml" blags tech)
+        `(
+          ("https://atthis.link/rss.xml" blags tech)
+          ("https://rachelbythebay.com/w/atom.xml" blags tech)
           ("https://notes.neeasade.net/rss_full.xml" blags tech)
           ("https://www.uninformativ.de/blog/feeds/en.atom" blags tech)
           ("http://blog.z3bra.org/rss/feed.xml" blags tech)
@@ -1961,8 +1974,8 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
           ("https://botanistinthekitchen.blog/feed/" blags food)
           ("https://www.careercenterbr.com/feed/" work)
           ("https://blog.ebrpl.com/feed/" work)
-          (,(concat
-             "https://lemmy.ml/feeds/front/" ; long-ass url
+          (,(concat ; long-ass url
+             "https://lemmy.ml/feeds/front/"
              "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9."
              "eyJpZCI6MTY4MjQsImlzcyI6ImxlbW15Lm1sIn0"
              ".yE2zUGjvlEuTZZi3TiF9HR7L7ITM9f_"
@@ -2001,7 +2014,9 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
           ("https://m455.neocities.org/feed.rss" tildes fwends)
           ("https://eli.li/feed.rss" tildes fwends)
           ("https://aiweirdness.com/rss" tech)
-          ("https://www.gauss-pdf.com/rss" reading)
+          ("http://tilde.town/~m455/javapool.rss" tilde)
+          ("https://spwhitton.name/blog/index.rss" blags)
+          ("https://www.theadvocate.com/search/?f=rss&t=article&l=50" news)
           ))
 #+end_src
 
+Subproject 775f08926041efaed1b1402cfe5eba093864866