summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-02-04 16:17:16 -0600
committerCase Duckworth2021-02-04 16:17:16 -0600
commit8ab04790e580a64574acb429da35de10434dc38e (patch)
tree24b328438eb9a62e92421c4d6cbe97b7e80f3a3d
parentwork updates (diff)
parentAdd a link to check out later (diff)
downloademacs-8ab04790e580a64574acb429da35de10434dc38e.tar.gz
emacs-8ab04790e580a64574acb429da35de10434dc38e.zip
Merge branch 'main' of https://tildegit.org/acdw/emacs into work
-rw-r--r--config.org121
1 files changed, 56 insertions, 65 deletions
diff --git a/config.org b/config.org index 8daa8a0..17faf7f 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
@@ -1294,30 +1275,13 @@ that's the only time I accidentally call it, anyway.
1294 1275
1295*** Auto-fill vs. Visual-line 1276*** Auto-fill vs. Visual-line
1296 1277
1297I've mostly been using visual-line mode, and it's been pretty good. 12781. Enable =auto-fill-mode= with text modes.
1298There are some times, however, when lines are just ... really long,
1299and they wrap weird or whatever. Not to mention, in Org mode,
1300=visual-line-mode= screws up the bindings for line movement. So
1301here's what I'm going to do.
1302
13031. Enable =visual-line-mode= with =text-mode=, but /not/ with
1304 =org-mode=.
1305
1306 #+begin_src emacs-lisp :noweb-ref hooks
1307 (defun hook--visual-line-mode ()
1308 (unless (eq major-mode 'org-mode)
1309 (visual-line-mode +1)))
1310
1311 (add-hook 'text-mode-hook #'hook--visual-line-mode)
1312 #+end_src
1313
13142. Enable =auto-fill-mode= with text modes.
1315 1279
1316 #+begin_src emacs-lisp :noweb-ref hooks 1280 #+begin_src emacs-lisp :noweb-ref hooks
1317 (add-hook 'text-mode-hook #'auto-fill-mode) 1281 (add-hook 'text-mode-hook #'auto-fill-mode)
1318 #+end_src 1282 #+end_src
1319 1283
13203. /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=.
1321 1285
1322 #+begin_src emacs-lisp :noweb-ref hooks 1286 #+begin_src emacs-lisp :noweb-ref hooks
1323 (defun hook--visual-line-fix-org-keys () 1287 (defun hook--visual-line-fix-org-keys ()
@@ -1334,6 +1298,26 @@ I think that'll work -- I only care about line aesthetics with text.
1334Programming modes should be /allowed/ to have long lines, regardless 1298Programming modes should be /allowed/ to have long lines, regardless
1335of how /terrible/ it is to have them. 1299of how /terrible/ it is to have them.
1336 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
1337*** Stay snappy with long-lined files 1321*** Stay snappy with long-lined files
1338 1322
1339#+begin_src emacs-lisp :noweb-ref modes 1323#+begin_src emacs-lisp :noweb-ref modes
@@ -1421,6 +1405,9 @@ It manages my whitespace for me, anyway.
1421 1405
1422** The Mark 1406** The Mark
1423 1407
1408see also
1409- [[https://spwhitton.name/blog/entry/transient-mark-mode/][Gnu Emacs' Transient Mark mode]], Sean Whitton
1410
1424*** Repeat popping the mark without repeating the prefix argument 1411*** Repeat popping the mark without repeating the prefix argument
1425 1412
1426#+begin_src emacs-lisp :noweb-ref settings 1413#+begin_src emacs-lisp :noweb-ref settings
@@ -1973,7 +1960,9 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
1973 1960
1974#+begin_src emacs-lisp :noweb-ref settings 1961#+begin_src emacs-lisp :noweb-ref settings
1975 (setq elfeed-feeds 1962 (setq elfeed-feeds
1976 `(("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)
1977 ("https://notes.neeasade.net/rss_full.xml" blags tech) 1966 ("https://notes.neeasade.net/rss_full.xml" blags tech)
1978 ("https://www.uninformativ.de/blog/feeds/en.atom" blags tech) 1967 ("https://www.uninformativ.de/blog/feeds/en.atom" blags tech)
1979 ("http://blog.z3bra.org/rss/feed.xml" blags tech) 1968 ("http://blog.z3bra.org/rss/feed.xml" blags tech)
@@ -1997,35 +1986,37 @@ See [[https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/mast
1997 (,(concat ; long-ass url 1986 (,(concat ; long-ass url
1998 "https://tilde.news/rss?token=" 1987 "https://tilde.news/rss?token="
1999 "FvdFj8rQkhrBy9j1yON1t6RYKDdcuG1MoUlyvRICmbgDGCf2JTWAEObDhdgt") 1988 "FvdFj8rQkhrBy9j1yON1t6RYKDdcuG1MoUlyvRICmbgDGCf2JTWAEObDhdgt")
2000 news tilde tech) 1989 news tildes tech)
2001 ("https://www.acdw.net/atom.xml" fwends) 1990 ("https://www.acdw.net/atom.xml" fwends)
2002 ("https://envs.net/~lucidiot/rsrsss/feed.xml" fwends) 1991 ("https://envs.net/~lucidiot/rsrsss/feed.xml" fwends)
2003 ("https://planet.emacslife.com/atom.xml" emacs) 1992 ("https://planet.emacslife.com/atom.xml" emacs)
2004 ("http://tilde.town/~lucidiot/fridaypostcard.xml" tilde art) 1993 ("http://tilde.town/~lucidiot/fridaypostcard.xml" tildes art)
2005 ("https://quasivoid.net/feed.atom" tilde) 1994 ("https://quasivoid.net/feed.atom" tildes)
2006 ("https://benjaminwil.info/feed.xml" tilde fwends) 1995 ("https://benjaminwil.info/feed.xml" tildes fwends)
2007 ("https://benjaminwil.info/antisocial/feed.xml" tilde) 1996 ("https://benjaminwil.info/antisocial/feed.xml" tildes)
2008 ("https://blog.ryliejamesthomas.net/feed/" tilde) 1997 ("https://blog.ryliejamesthomas.net/feed/" tildes)
2009 ("https://p1k3.com/feed" tilde) 1998 ("https://p1k3.com/feed" tildes)
2010 ("https://cosmic.voyage/rss.xml" tilde fiction sci-fi) 1999 ("https://cosmic.voyage/rss.xml" tildes fiction sci-fi)
2011 ("https://jackreid.xyz/index.xml" tilde) 2000 ("https://jackreid.xyz/index.xml" tildes)
2012 ("http://lambdacreate.com/static/feed.rss" tilde fwends) 2001 ("http://lambdacreate.com/static/feed.rss" tildes fwends)
2013 ("https://gaffen.co.uk/feed.xml" tilde) 2002 ("https://gaffen.co.uk/feed.xml" tildes)
2014 ("https://gmb.21x2.net/rss.xml" tilde) 2003 ("https://gmb.21x2.net/rss.xml" tildes)
2015 ("https://www.insom.me.uk/feed.xml" tilde) 2004 ("https://www.insom.me.uk/feed.xml" tildes)
2016 ("https://invisibleup.com/atom.xml" tilde) 2005 ("https://invisibleup.com/atom.xml" tildes)
2017 ("https://m455.casa/feed.rss" tilde fwends) 2006 ("https://m455.casa/feed.rss" tildes fwends)
2018 ("https://petras.space/index.xml" tilde) 2007 ("https://petras.space/index.xml" tildes)
2019 ("https://www.benovermyer.com/post/index.xml" tilde) 2008 ("https://www.benovermyer.com/post/index.xml" tildes)
2020 ("https://tilde.town/~trm/blog/atom.xml" tilde) 2009 ("https://tilde.town/~trm/blog/atom.xml" tildes)
2021 ("https://tilde.team/feed.rss" tilde) 2010 ("https://tilde.team/feed.rss" tildes)
2022 ("http://ajroach42.com/feed.xml" tilde) 2011 ("http://ajroach42.com/feed.xml" tildes)
2023 ("http://tilde.town/~mroik/blog/rss.xml" tilde) 2012 ("http://tilde.town/~mroik/blog/rss.xml" tildes)
2024 ("https://hamster.dance/blog/rss/" tilde) 2013 ("https://hamster.dance/blog/rss/" tildes)
2025 ("https://m455.neocities.org/feed.rss" tilde fwends) 2014 ("https://m455.neocities.org/feed.rss" tildes fwends)
2026 ("https://eli.li/feed.rss" tilde fwends) 2015 ("https://eli.li/feed.rss" tildes fwends)
2027 ("https://aiweirdness.com/rss" tech) 2016 ("https://aiweirdness.com/rss" tech)
2028 ("http://tilde.town/~m455/javapool.rss" tilde) 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)
2029 )) 2020 ))
2030#+end_src 2021#+end_src
2031 2022