refactor(sterni/emacs): use use-package for elfeed

When I first added elfeed, for some reason I couldn't set it up with
use-package. Now the situation has reversed itself and elfeed started to
crash with cryptic elisp error messages. Copying tazjin's approach to
configuring elfeed has solved this issue luckily.

Change-Id: I57ec8f8d8ace6aa6545483f7b2559065a56792f1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5649
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2022-05-23 19:08:16 +02:00 committed by clbot
parent f31edeec1b
commit c93527d8a1
2 changed files with 95 additions and 92 deletions

View file

@ -196,16 +196,7 @@
(display-fill-column-indicator-mode 'toggle))) (display-fill-column-indicator-mode 'toggle)))
;; org-mode ;; org-mode
(evil-define-key 'normal 'global (kbd "<leader>oa") 'org-agenda) (evil-define-key 'normal 'global (kbd "<leader>oa") 'org-agenda)
(evil-define-key 'normal 'global (kbd "<leader>oc") 'org-capture) (evil-define-key 'normal 'global (kbd "<leader>oc") 'org-capture))
;; elfeed bindings for evil (can't use-package elfeed apparently)
(evil-define-key 'normal 'global (kbd "<leader>ff") 'elfeed)
(evil-define-key '(normal visual) elfeed-search-mode-map
(kbd "o") 'elfeed-search-browse-url
(kbd "r") 'elfeed-search-untag-all-unread
(kbd "u") 'elfeed-search-tag-all-unread
(kbd "<leader>ff") 'elfeed-search-fetch
(kbd "<leader>fc") 'elfeed-db-compact
(kbd "<leader>fr") 'elfeed-search-update--force))
(use-package evil-collection (use-package evil-collection
:after evil :after evil
@ -290,7 +281,7 @@
(unless (server-running-p) (unless (server-running-p)
(server-start)) (server-start))
(require 'subscriptions) (require 'subscriptions) ; elfeed config
(require 'nix-inject) (require 'nix-inject)
(provide 'init) (provide 'init)

View file

@ -1,84 +1,96 @@
;;; elfeed subscriptions ;;; elfeed
(use-package elfeed
:after evil
:config
;; elfeed bindings for evil
(evil-define-key 'normal 'global (kbd "<leader>ff") 'elfeed)
(evil-define-key '(normal visual) elfeed-search-mode-map
(kbd "o") 'elfeed-search-browse-url
(kbd "r") 'elfeed-search-untag-all-unread
(kbd "u") 'elfeed-search-tag-all-unread
(kbd "<leader>ff") 'elfeed-search-fetch
(kbd "<leader>fc") 'elfeed-db-compact
(kbd "<leader>fr") 'elfeed-search-update--force)
;; elfeed subscriptions
(setq elfeed-feeds
(append
;; immutable subscriptions tracked in git
'(("https://repology.org/maintainer/sternenseemann%40systemli.org/feed-for-repo/nix_unstable/atom" dashboard releases)
("http://hundimbuero.blogspot.com/feeds/posts/default?alt=rss" blog cool-and-nice)
("gopher://text.causal.agency/0feed.atom" blog)
("http://xsteadfastx.org/feed/" blog cool-and-nice)
("https://tvl.fyi/feed.atom" blog cool-and-nice)
("https://hannes.robur.coop/atom" blog)
("https://stevelosh.com/rss.xml" blog)
("https://planet.lisp.org/rss20.xml" blog)
("https://hyperthings.garden/rss/all-posts.xml" blog)
("https://blog.benjojo.co.uk/rss.xml" blog)
("https://leahneukirchen.org/blog/index.atom" blog cool-and-nice)
("https://leahneukirchen.org/trivium/index.atom" blog links cool-and-nice)
("https://firefly.nu/feeds/all.atom.xml" blog cool-and-nice)
("https://tazj.in/feed.atom" blog cool-and-nice)
("https://alyssa.is/feed.xml" blog cool-and-nice)
("https://eta.st/feed.xml" blog cool-and-nice)
("https://spectrum-os.org/git/www/atom/bibliography.html" links blog)
("https://rachelbythebay.com/w/atom.xml" blog)
("http://evrl.com/feed.xml" blog)
("https://vulns.xyz/feed.xml" blog)
("https://www.german-foreign-policy.com/?type=9818" news)
("https://niedzejkob.p4.team/rss.xml" blog)
("https://grahamc.com/feed/" blog)
("https://michael.stapelberg.ch/feed.xml" blog)
("https://kazu-yamamoto.hatenablog.jp/feed" blog)
("https://ariadne.space/feed/" blog)
("https://bodil.lol/rss.xml" blog)
("http://blog.nullspace.io/feed.xml" blog)
("https://blog.kingcons.io/rss.xml" blog)
("http://jaspervdj.be/rss.xml" blog)
("https://www.imperialviolet.org/iv-rss.xml" blog)
("https://latacora.micro.blog/feed.xml" blog)
("https://22gato.tumblr.com/rss" pictures cool-and-nice)
("https://theprofoundprogrammer.com/rss" blog)
("https://wiki.openlab-augsburg.de/_feed" openlab)
("http://shitopenlabsays.tumblr.com/rss" openlab)
("http://suckless.org/atom.xml" releases)
("https://kristaps.bsd.lv/lowdown/atom.xml" releases)
("http://0pointer.net/blog/index.atom" blog)
("https://emacsninja.com/feed.atom" blog)
("https://emacshorrors.com/feed.atom" blog)
("http://therealmntmn.tumblr.com/rss" blog)
("http://blog.duangle.com/feeds/posts/default" blog)
("http://blog.johl.io/atom.xml" blog)
("http://blog.z3bra.org/rss/feed.xml" blog)
("http://ccc.de/de/rss/updates.xml" news)
;; ("http://fabienne.us/feed/" blog) ; database error
("http://feeds.feedburner.com/baschtcom" blog)
("http://ffaaaffaffaffaa.tumblr.com/rss" pictures)
("http://fnordig.de/feed.xml" blog)
("http://fotografiona.tumblr.com/rss" pictures)
("https://grandhotel-cosmopolis.org/de/feed" news)
("http://guteaussicht.org/rss" pictures)
("http://konvergenzfehler.de/feed/" blog)
("https://markuscisler.com/feed.xml" blog)
("http://n00bcore.de/feed/" podcast)
("http://spacethatneverwas.tumblr.com/rss" pictures)
("http://theresa.someserver.de/blog/?feed=rss2" blog)
("http://www.frumble.de/blog/feed/" blog)
("http://www.plomlompom.de/PlomRogue/plomwiki.php?action=Blog_Atom" blog)
("http://www.whvrt.de/rss" pictures)
("http://www.windytan.com/feeds/posts/default" blog)
("https://echtsuppe.wordpress.com/feed/" blog defunct)
("https://mgsloan.com/feed.xml" blog)
("https://notes.sterni.lv/atom.xml" me)
("http://arduina.net/feed/" defunct blog)
("http://beza1e1.tuxen.de/blog_en.atom" blog)
("https://anchor.fm/s/94bb000/podcast/rss" podcast))
;; http://www.wollenzin.de/feed/ ;_;
(setq elfeed-feeds ;; add more feeds from an untracked file in $HOME
(append (let ((file (concat (getenv "HOME")
;; immutable subscriptions tracked in git "/.config/emacs-custom/mutable-subscriptions.el")))
'(("https://repology.org/maintainer/sternenseemann%40systemli.org/feed-for-repo/nix_unstable/atom" dashboard releases) (when (file-exists-p file)
("http://hundimbuero.blogspot.com/feeds/posts/default?alt=rss" blog cool-and-nice) (read (with-temp-buffer
("gopher://text.causal.agency/0feed.atom" blog) (insert-file-contents file)
("http://xsteadfastx.org/feed/" blog cool-and-nice) (buffer-string))))))))
("https://tvl.fyi/feed.atom" blog cool-and-nice)
("https://hannes.robur.coop/atom" blog)
("https://stevelosh.com/rss.xml" blog)
("https://planet.lisp.org/rss20.xml" blog)
("https://hyperthings.garden/rss/all-posts.xml" blog)
("https://blog.benjojo.co.uk/rss.xml" blog)
("https://leahneukirchen.org/blog/index.atom" blog cool-and-nice)
("https://leahneukirchen.org/trivium/index.atom" blog links cool-and-nice)
("https://firefly.nu/feeds/all.atom.xml" blog cool-and-nice)
("https://tazj.in/feed.atom" blog cool-and-nice)
("https://alyssa.is/feed.xml" blog cool-and-nice)
("https://eta.st/feed.xml" blog cool-and-nice)
("https://spectrum-os.org/git/www/atom/bibliography.html" links blog)
("https://rachelbythebay.com/w/atom.xml" blog)
("http://evrl.com/feed.xml" blog)
("https://vulns.xyz/feed.xml" blog)
("https://www.german-foreign-policy.com/?type=9818" news)
("https://niedzejkob.p4.team/rss.xml" blog)
("https://grahamc.com/feed/" blog)
("https://michael.stapelberg.ch/feed.xml" blog)
("https://kazu-yamamoto.hatenablog.jp/feed" blog)
("https://ariadne.space/feed/" blog)
("https://bodil.lol/rss.xml" blog)
("http://blog.nullspace.io/feed.xml" blog)
("https://blog.kingcons.io/rss.xml" blog)
("http://jaspervdj.be/rss.xml" blog)
("https://www.imperialviolet.org/iv-rss.xml" blog)
("https://latacora.micro.blog/feed.xml" blog)
("https://22gato.tumblr.com/rss" pictures cool-and-nice)
("https://theprofoundprogrammer.com/rss" blog)
("https://wiki.openlab-augsburg.de/_feed" openlab)
("http://shitopenlabsays.tumblr.com/rss" openlab)
("http://suckless.org/atom.xml" releases)
("https://kristaps.bsd.lv/lowdown/atom.xml" releases)
("http://0pointer.net/blog/index.atom" blog)
("https://emacsninja.com/feed.atom" blog)
("https://emacshorrors.com/feed.atom" blog)
("http://therealmntmn.tumblr.com/rss" blog)
("http://blog.duangle.com/feeds/posts/default" blog)
("http://blog.johl.io/atom.xml" blog)
("http://blog.z3bra.org/rss/feed.xml" blog)
("http://ccc.de/de/rss/updates.xml" news)
;; ("http://fabienne.us/feed/" blog) ; database error
("http://feeds.feedburner.com/baschtcom" blog)
("http://ffaaaffaffaffaa.tumblr.com/rss" pictures)
("http://fnordig.de/feed.xml" blog)
("http://fotografiona.tumblr.com/rss" pictures)
("https://grandhotel-cosmopolis.org/de/feed" news)
("http://guteaussicht.org/rss" pictures)
("http://konvergenzfehler.de/feed/" blog)
("https://markuscisler.com/feed.xml" blog)
("http://n00bcore.de/feed/" podcast)
("http://spacethatneverwas.tumblr.com/rss" pictures)
("http://theresa.someserver.de/blog/?feed=rss2" blog)
("http://www.frumble.de/blog/feed/" blog)
("http://www.plomlompom.de/PlomRogue/plomwiki.php?action=Blog_Atom" blog)
("http://www.whvrt.de/rss" pictures)
("http://www.windytan.com/feeds/posts/default" blog)
("https://echtsuppe.wordpress.com/feed/" blog defunct)
("https://mgsloan.com/feed.xml" blog)
("https://notes.sterni.lv/atom.xml" me)
("http://arduina.net/feed/" defunct blog)
("http://beza1e1.tuxen.de/blog_en.atom" blog)
("https://anchor.fm/s/94bb000/podcast/rss" podcast))
;; http://www.wollenzin.de/feed/ ;_;
;; add more feeds from an untracked file in $HOME
(let ((file (concat (getenv "HOME")
"/.config/emacs-custom/mutable-subscriptions.el")))
(when (file-exists-p file)
(read (with-temp-buffer
(insert-file-contents file)
(buffer-string)))))))
(provide 'subscriptions) (provide 'subscriptions)