about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-02-04 18:32:05 -0600
committerCase Duckworth2021-02-04 18:32:05 -0600
commit740d0eaf34a7266d7f95cbd5c021ca8364c9399e (patch)
tree41f157d8f6b7719e2692a45a21d5db45a784016b
parentChange spacing; add org-archive-location (diff)
parentUpdate elfeed-db (diff)
downloademacs-740d0eaf34a7266d7f95cbd5c021ca8364c9399e.tar.gz
emacs-740d0eaf34a7266d7f95cbd5c021ca8364c9399e.zip
Merge branch 'main' of tildegit.org:acdw/emacs
-rw-r--r--.gitignore3
-rw-r--r--.gitmodules3
-rw-r--r--config.org109
m---------var/elfeed/db0
4 files changed, 68 insertions, 47 deletions
diff --git a/.gitignore b/.gitignore index e7db798..82566c8 100644 --- a/.gitignore +++ b/.gitignore
@@ -12,6 +12,9 @@
12!var/ 12!var/
13var/* 13var/*
14!var/elpher-bookmarks.el 14!var/elpher-bookmarks.el
15!var/elfeed/
16var/elfeed/*
17!var/elfeed/db
15 18
16!etc/ 19!etc/
17etc/* 20etc/*
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..017ee57 --- /dev/null +++ b/.gitmodules
@@ -0,0 +1,3 @@
1[submodule "var/elfeed/db"]
2 path = var/elfeed/db
3 url = https://tildegit.org/acdw/elfeed-db
diff --git a/config.org b/config.org index 2b7a83d..39bec13 100644 --- a/config.org +++ b/config.org
@@ -210,25 +210,6 @@ This is extremely fiddly and I'd love another option.
210 (define-key acdw/map (kbd "M-o") #'crux-other-window-or-switch-buffer) 210 (define-key acdw/map (kbd "M-o") #'crux-other-window-or-switch-buffer)
211#+end_src 211#+end_src
212 212
213*** Visual fill column mode
214
215In reading-intensive views, this mode keeps the text from getting too
216wide.
217
218#+begin_src emacs-lisp :noweb-ref packages
219 (straight-use-package 'visual-fill-column)
220#+end_src
221
222#+begin_src emacs-lisp :noweb-ref settings
223 (setq-default visual-fill-column-center-text t)
224#+end_src
225
226#+begin_src emacs-lisp :noweb-ref hooks
227 (add-hook 'visual-line-mode-hook #'visual-fill-column-mode)
228
229 (with-eval-after-load 'visual-fill-column
230 (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
231#+end_src
232 213
233*** The *Help* window 214*** The *Help* window
234 215
@@ -415,11 +396,11 @@ But on Windows, I use Consolas.
415#+begin_src emacs-lisp :noweb-ref windows-specific 396#+begin_src emacs-lisp :noweb-ref windows-specific
416 (set-face-attribute 'default nil 397 (set-face-attribute 'default nil
417 :family "Consolas" 398 :family "Consolas"
418 :height 110) 399 :height 100)
419 400
420 (set-face-attribute 'fixed-pitch nil 401 (set-face-attribute 'fixed-pitch nil
421 :family "Consolas" 402 :family "Consolas"
422 :height 110) 403 :height 100)
423#+end_src 404#+end_src
424 405
425*** Underlines 406*** Underlines
@@ -658,6 +639,14 @@ minor-modes from the modeline.
658 :repo "raxod502/blackout")) 639 :repo "raxod502/blackout"))
659#+end_src 640#+end_src
660 641
642**** Which-function mode
643
644Shows where we are in the modeline.
645
646#+begin_src emacs-lisp :noweb-ref modes
647 (which-function-mode +1)
648#+end_src
649
661*** Setting faces 650*** Setting faces
662 651
663It took me a while to find a function that'll let me customize faces 652It took me a while to find a function that'll let me customize faces
@@ -760,7 +749,12 @@ to /hide/ those contents.
760 read-file-name-completion-ignore-case t) 749 read-file-name-completion-ignore-case t)
761#+end_src 750#+end_src
762 751
763*** Selectrum :package: 752*** Selectrum :package:
753
754*COMMENT 2021-02-01*: For some reason, selectrum will randomly do a thing where
755it, like, flashes up and down in the minibuffer? I don't know how to explain
756it, it's super weird. I guess I should file a bug report ... but until then,
757I'll just use =icomplete-vertical=.
764 758
765My minibuffer completion system uses =selectrum=, =prescient=, =company=, 759My minibuffer completion system uses =selectrum=, =prescient=, =company=,
766and =marginalia=. At some point, I'd like to take a deep dive in =embark= 760and =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.
775 (selectrum-mode +1) 769 (selectrum-mode +1)
776#+end_src 770#+end_src
777 771
772*** COMMENT Icomplete
773
774#+begin_src emacs-lisp :noweb-ref packages
775 (straight-use-package 'icomplete-vertical)
776#+end_src
777
778#+begin_src emacs-lisp :noweb-ref modes
779 (icomplete-mode +1)
780 (icomplete-vertical-mode +1)
781#+end_src
782
778*** Prescient :package: 783*** Prescient :package:
779 784
780#+begin_src emacs-lisp :noweb-ref packages 785#+begin_src emacs-lisp :noweb-ref packages
@@ -1270,30 +1275,13 @@ that's the only time I accidentally call it, anyway.
1270 1275
1271*** Auto-fill vs. Visual-line 1276*** Auto-fill vs. Visual-line
1272 1277
1273I've mostly been using visual-line mode, and it's been pretty good. 12781. Enable =auto-fill-mode= with text modes.
1274There are some times, however, when lines are just ... really long,
1275and they wrap weird or whatever. Not to mention, in Org mode,
1276=visual-line-mode= screws up the bindings for line movement. So
1277here's what I'm going to do.
1278
12791. Enable =visual-line-mode= with =text-mode=, but /not/ with
1280 =org-mode=.
1281
1282 #+begin_src emacs-lisp :noweb-ref hooks
1283 (defun hook--visual-line-mode ()
1284 (unless (eq major-mode 'org-mode)
1285 (visual-line-mode +1)))
1286
1287 (add-hook 'text-mode-hook #'hook--visual-line-mode)
1288 #+end_src
1289
12902. Enable =auto-fill-mode= with text modes.
1291 1279
1292 #+begin_src emacs-lisp :noweb-ref hooks 1280 #+begin_src emacs-lisp :noweb-ref hooks
1293 (add-hook 'text-mode-hook #'auto-fill-mode) 1281 (add-hook 'text-mode-hook #'auto-fill-mode)
1294 #+end_src 1282 #+end_src
1295 1283
12963. /Just/ in case ... let's "fix" =visual-line-mode= if we're in =org-mode=. 12842. /Just/ in case ... let's "fix" =visual-line-mode= if we're in =org-mode=.
1297 1285
1298 #+begin_src emacs-lisp :noweb-ref hooks 1286 #+begin_src emacs-lisp :noweb-ref hooks
1299 (defun hook--visual-line-fix-org-keys () 1287 (defun hook--visual-line-fix-org-keys ()
@@ -1310,6 +1298,26 @@ I think that'll work -- I only care about line aesthetics with text.
1310Programming modes should be /allowed/ to have long lines, regardless 1298Programming modes should be /allowed/ to have long lines, regardless
1311of how /terrible/ it is to have them. 1299of how /terrible/ it is to have them.
1312 1300
1301*** Visual fill column mode
1302
1303In reading-intensive views, this mode keeps the text from getting too
1304wide.
1305
1306#+begin_src emacs-lisp :noweb-ref packages
1307 (straight-use-package 'visual-fill-column)
1308#+end_src
1309
1310#+begin_src emacs-lisp :noweb-ref settings
1311 (setq-default visual-fill-column-center-text t)
1312#+end_src
1313
1314#+begin_src emacs-lisp :noweb-ref hooks
1315 (add-hook 'visual-fill-column-mode-hook #'visual-line-mode)
1316
1317 (with-eval-after-load 'visual-fill-column
1318 (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
1319#+end_src
1320
1313*** Stay snappy with long-lined files 1321*** Stay snappy with long-lined files
1314 1322
1315#+begin_src emacs-lisp :noweb-ref modes 1323#+begin_src emacs-lisp :noweb-ref modes
@@ -1397,6 +1405,9 @@ It manages my whitespace for me, anyway.
1397 1405
1398** The Mark 1406** The Mark
1399 1407
1408see also
1409- [[https://spwhitton.name/blog/entry/transient-mark-mode/][Gnu Emacs' Transient Mark mode]], Sean Whitton
1410
1400*** Repeat popping the mark without repeating the prefix argument 1411*** Repeat popping the mark without repeating the prefix argument
1401 1412
1402#+begin_src emacs-lisp :noweb-ref settings 1413#+begin_src emacs-lisp :noweb-ref settings
@@ -1929,14 +1940,14 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
1929#+end_src 1940#+end_src
1930 1941
1931#+begin_src emacs-lisp :noweb-ref settings 1942#+begin_src emacs-lisp :noweb-ref settings
1932 (setq-default elfeed-goodies/entry-pane-position 'bottom 1943 (setq-default elfeed-goodies/entry-pane-position 'top
1933 elfeed-goodies/powerline-default-separator nil 1944 elfeed-goodies/powerline-default-separator nil
1934 elfeed-goodies/tag-column-width 16) 1945 elfeed-goodies/tag-column-width 16)
1935#+end_src 1946#+end_src
1936 1947
1937#+begin_src emacs-lisp :noweb-ref hooks 1948#+begin_src emacs-lisp :noweb-ref hooks
1938 (defun hook--elfeed-show () 1949 (defun hook--elfeed-show ()
1939 (visual-line-mode +1)) 1950 (visual-fill-column-mode +1))
1940 1951
1941 (add-hook 'elfeed-show-mode-hook #'hook--elfeed-show) 1952 (add-hook 'elfeed-show-mode-hook #'hook--elfeed-show)
1942#+end_src 1953#+end_src
@@ -1949,7 +1960,9 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
1949 1960
1950#+begin_src emacs-lisp :noweb-ref settings 1961#+begin_src emacs-lisp :noweb-ref settings
1951 (setq elfeed-feeds 1962 (setq elfeed-feeds
1952 `(("https://rachelbythebay.com/w/atom.xml" blags tech) 1963 `(
1964 ("https://atthis.link/rss.xml" blags tech)
1965 ("https://rachelbythebay.com/w/atom.xml" blags tech)
1953 ("https://notes.neeasade.net/rss_full.xml" blags tech) 1966 ("https://notes.neeasade.net/rss_full.xml" blags tech)
1954 ("https://www.uninformativ.de/blog/feeds/en.atom" blags tech) 1967 ("https://www.uninformativ.de/blog/feeds/en.atom" blags tech)
1955 ("http://blog.z3bra.org/rss/feed.xml" blags tech) 1968 ("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
1961 ("https://botanistinthekitchen.blog/feed/" blags food) 1974 ("https://botanistinthekitchen.blog/feed/" blags food)
1962 ("https://www.careercenterbr.com/feed/" work) 1975 ("https://www.careercenterbr.com/feed/" work)
1963 ("https://blog.ebrpl.com/feed/" work) 1976 ("https://blog.ebrpl.com/feed/" work)
1964 (,(concat 1977 (,(concat ; long-ass url
1965 "https://lemmy.ml/feeds/front/" ; long-ass url 1978 "https://lemmy.ml/feeds/front/"
1966 "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9." 1979 "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9."
1967 "eyJpZCI6MTY4MjQsImlzcyI6ImxlbW15Lm1sIn0" 1980 "eyJpZCI6MTY4MjQsImlzcyI6ImxlbW15Lm1sIn0"
1968 ".yE2zUGjvlEuTZZi3TiF9HR7L7ITM9f_" 1981 ".yE2zUGjvlEuTZZi3TiF9HR7L7ITM9f_"
@@ -2001,7 +2014,9 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
2001 ("https://m455.neocities.org/feed.rss" tildes fwends) 2014 ("https://m455.neocities.org/feed.rss" tildes fwends)
2002 ("https://eli.li/feed.rss" tildes fwends) 2015 ("https://eli.li/feed.rss" tildes fwends)
2003 ("https://aiweirdness.com/rss" tech) 2016 ("https://aiweirdness.com/rss" tech)
2004 ("https://www.gauss-pdf.com/rss" reading) 2017 ("http://tilde.town/~m455/javapool.rss" tilde)
2018 ("https://spwhitton.name/blog/index.rss" blags)
2019 ("https://www.theadvocate.com/search/?f=rss&t=article&l=50" news)
2005 )) 2020 ))
2006#+end_src 2021#+end_src
2007 2022
diff --git a/var/elfeed/db b/var/elfeed/db new file mode 160000
Subproject 775f08926041efaed1b1402cfe5eba093864866