           :n "q"  #'elfeed-kill-buffer
           :m "j"  #'evil-next-visual-line
           :m "k"  #'evil-previous-visual-line
-          [remap next-buffer]           #'+rss/next
-          [remap previous-buffer]       #'+rss/previous)))
+          [remap next-buffer]     #'+rss/next
+          [remap previous-buffer] #'+rss/previous)))
 
 
 (def-package! elfeed-org
-  :after (elfeed)
+  :when (featurep! +org)
+  :after elfeed
   :config
   (setq rmh-elfeed-org-files
         (let ((default-directory +org-dir))

  (add-hook 'elfeed-show-mode-hook #'+rss|elfeed-wrap)

  (map! (:map (elfeed-search-mode-map elfeed-show-mode-map)
          [remap kill-this-buffer]      "q"
          [remap kill-buffer]           "q")

        (:map elfeed-search-mode-map
          :n "q"     #'+rss/quit

;; don't care for the UI you can invoke elfeed directly with `elfeed'.

(defvar +rss-elfeed-files (list "elfeed.org")
  "Where to look for elfeed.org files, relative to `+org-dir'. Can be absolute
paths.")

(defvar +rss-split-direction 'below
  "What direction to pop up the entry buffer in elfeed.")
