diff --git a/modules/editor/emacs/doom.d/config.el b/modules/editor/emacs/doom.d/config.el
index 65375ef..b7dcd44 100644
--- a/modules/editor/emacs/doom.d/config.el
+++ b/modules/editor/emacs/doom.d/config.el
@@ -38,3 +38,25 @@
 
 ;; Update elfeed on open
 (add-hook 'elfeed-search-mode-hook #'elfeed-update)
+
+(use-package! elfeed-tube
+  ;;:ensure t ;; or :straight t
+  :after elfeed
+  :demand t
+  :config
+  ;; (setq elfeed-tube-auto-save-p nil) ; default value
+  ;; (setq elfeed-tube-auto-fetch-p t)  ; default value
+  (elfeed-tube-setup)
+
+  :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)))
+
+(use-package! elfeed-tube-mpv
+  ;;:ensure t ;; or :straight t
+  :bind (:map elfeed-show-mode-map
+              ("gf" . elfeed-tube-mpv-follow-mode)
+              ("gw" . elfeed-tube-mpv-where)))
diff --git a/modules/editor/emacs/doom.d/init.el b/modules/editor/emacs/doom.d/init.el
index 5cf33c6..a399bdd 100644
--- a/modules/editor/emacs/doom.d/init.el
+++ b/modules/editor/emacs/doom.d/init.el
@@ -180,7 +180,7 @@
 
        :app
        ;;calendar
-       ;;emms
+       emms
        ;;everywhere        ; *leave* Emacs!? You must be joking
        ;;irc               ; how neckbeards socialize
        (rss +org)        ; emacs as an RSS reader
diff --git a/modules/editor/emacs/doom.d/packages.el b/modules/editor/emacs/doom.d/packages.el
index 857f37b..d343f8e 100644
--- a/modules/editor/emacs/doom.d/packages.el
+++ b/modules/editor/emacs/doom.d/packages.el
@@ -1,4 +1,7 @@
 (package! lsp-tailwindcss)
+(package! elfeed-tube)
+(package! elfeed-tube-mpv)
+(package! mpv)
 
 (unpin! org-roam)
 (package! org-roam-ui)
diff --git a/modules/editor/emacs/emacs.nix b/modules/editor/emacs/emacs.nix
index 3e3ba28..529807d 100644
--- a/modules/editor/emacs/emacs.nix
+++ b/modules/editor/emacs/emacs.nix
@@ -23,6 +23,10 @@ in {
         # Used by org-roam
         sqlite
         graphviz
+
+        # Used by elfeed-tube
+        yt-dlp
+        mpv
       ];
 
       services.emacs = {