Stop using elfeed-tube, move feeds.org to emacs config directory

Change bind for starting elfeed

Change calendar bind to match org calendar bind

Change feed directory function to feed file instead

feeds.org

@@ -0,0 +1,19 @@
+#+title: RSS Feeds
+#+author: Evie Litherland-Smith
+#+email: evie@xenia.me.uk
+#+language: en
+#+filetags: rss
+* root :elfeed:
+** Blogs :blog:
+*** https://proton.me/blog/feed
+** FOSS Software :foss:software:
+*** https://forgejo.org/rss.xml :git:
+** News :news:
+*** Linux :linux:
+**** https://libera.chat/atom.xml :irc:
+**** https://nyxt.atlas.engineer/feed :browser:
+**** https://systemcrafters.net/rss/news.xml
+** Podcasts :podcast:
+*** https://podcasts.watchnebula.com/chilloutpod
+** Programming :programming:
+*** Python :python:

init.el

@@ -361,14 +361,14 @@
 (keymap-global-set "C-c w b" #'my/open-global-bibliography)
 
 ;; Elfeed feeds directory shortcut
-(defun my/open-feeds-directory ()
-  "Open directory containing elfeed sources."
+(defun my/open-feeds-file ()
+  "Open elfeed org source file."
   (interactive)
   (require 'org)
   (require 'elfeed)
   (require 'elfeed-org)
-  (find-file (file-name-directory (car rmh-elfeed-org-files))))
-(keymap-global-set "C-c w f" #'my/open-feeds-directory)
+  (find-file (car rmh-elfeed-org-files)))
+(keymap-global-set "C-c w f" #'my/open-feeds-file)
 
 (defun my/open-documents-directory ()
   "Open Documents directory."
@@ -393,7 +393,7 @@ Try `magit-clone-default-directory' if available, fall back to
 (keymap-global-set "C-c w p" #'my/open-projects-directory)
 
 (use-package calendar
-  :bind (("C-c ." . calendar))
+  :bind (("C-c >" . calendar))
   :custom
   (calendar-date-style 'iso)
   (calendar-mark-holidays-flag t)
@@ -1416,47 +1416,20 @@ Try `magit-clone-default-directory' if available, fall back to
   (gnus-icalendar-org-setup))
 
 (use-package elfeed
-  :bind (("C-c f f" . elfeed)
-         ("C-c f u" . elfeed-update))
+  :bind (("C-c f" . elfeed))
   :hook (elfeed-search-mode . elfeed-update)
   :custom
   (elfeed-search-filter "@2-weeks-ago +unread")
   :config
-  (require 'elfeed-org)
-  (require 'elfeed-tube))
+  (require 'elfeed-org))
 
 (use-package elfeed-org
   :after (elfeed org)
   :custom
-  (rmh-elfeed-org-files
-   (list
-    (expand-file-name "rss.org" elfeed-db-directory)
-    (expand-file-name "youtube.org" elfeed-db-directory)))
+  (rmh-elfeed-org-files (list (locate-user-emacs-file "feeds.org")))
   :config
   (elfeed-org))
 
-(use-package elfeed-tube
-  :after elfeed
-  :bind ( :map elfeed-show-mode-map
-          ("F" . elfeed-tube-fetch)
-          ([remap save-buffer] . elfeed-tube-save)
-          :map elfeed-search-mode-map
-          ("F" . elfeed-tube-fetch)
-          ([remap save-buffer] . elfeed-tube-save))
-  :custom
-  (elfeed-tube-auto-save-p nil)
-  (elfeed-tube-auto-fetch-p t)
-  :config
-  (elfeed-tube-setup)
-  (require 'elfeed-tube-mpv))
-
-(use-package elfeed-tube-mpv
-  :after elfeed-tube
-  :init (require 'mpv)
-  :bind ( :map elfeed-show-mode-map
-          ("C-c C-f" . elfeed-tube-mpv-follow-mode)
-          ("C-c C-w" . elfeed-tube-mpv-where)))
-
 (use-package password-store
   :defer t)
 

install.el

@@ -34,8 +34,8 @@
           markdown-mode pandoc-mode auctex auctex-latexmk latex-preview-pane
           ;; Email
           mu4e
-          ;; RSS/YouTube feeds
-          elfeed elfeed-org elfeed-tube elfeed-tube-mpv
+          ;; RSS feeds
+          elfeed elfeed-org
           ))
 (package-install-selected-packages)
 (package-autoremove)