Monorepo my org stuff

Move Citar (was ~/Documents/References) and Elfeed (was ~/.elfeed)
directories into org-directory (~/Documents/Org), name
appropriately (and rename some accordingly) for package that uses them

Update various uses and references to these files/directories in config

feeds.org

@@ -1,104 +0,0 @@
-#+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
-** Creators :creators:
-*** Nerdforge
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCggHsHce2n3vvbJf_8YKrMA
-** Explainers :explainers:
-*** CGP Grey
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UC2C_jShtL725hvbm1arSV9w
-*** Kurzgesagt - In a Nutshell
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCsXVk37bltHxD1rDPwtNM8Q
-*** Maths :maths:
-**** 3Blue1Brown
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCYO_jab_esuFRV4b17AJtAw
-**** Numberphile
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCoxcjq-8xIDTYp3uz647V5A
-**** Stand-up Maths
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCSju5G2aFaWMqn-_0YBtq5A
-*** Physics :physics:
-**** minutephysics
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCUHW94eEFW7hkUMVaZz4eDg
-**** Physics for the Birds
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCeXksuVW8H1x9v4gh7DWoyQ
-*** Steve Mould
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCEIwxahdLz7bap-VDs9h35A
-*** Tom Scott
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCBa659QWEk1AI4Tg--mrJ2A
-** FOSS Software :foss:software:
-*** https://forgejo.org/rss.xml :git:
-** Games :games:
-*** Elden Ring :eldenring:
-**** illusory wall
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCmBXkjKD8w6bbjUzNjcDtQA
-**** Miss Chalice
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCY3Q74Y-FE8XZUBaNuaWJLw
-**** Rusty.
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCL-Tm21Rft-u6EI18n0EN2w
-**** VaatiVidya
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCe0DNp0mKMqrYVaTundyr9w
-*** Minecraft :minecraft:
-**** FalseSymmetry
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCuQYHhF6on6EXXO-_i_ClHQ
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCpArlUtSgiPGBklMDzwrr2g
-**** GoodTimesWithScar
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCodkNmk9oWRTIYZdr_HuSlg
-**** Grian
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCR9Gcq0CMm6YgTzsDxAxjOQ
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCDiznUV6dtdB9PQj__XVhnA
-**** mattbatwings
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCz28y3fThmxHaIh7Zl-i6KA
-**** Mumbo Jumbo
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UChFur_NwVSbUozOcF_F2kMg
-**** PearlescentMoon
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UC1GJ5aeqpEWklMBQ3oXrPQQ
-*** Miscellaneous :misc:
-**** Bandit
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCDgK6UKKrwcECeF-PcAd12A
-**** Ceave Perspective 
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCepgG8BiC4jlGTSZfYkpHiQ
-**** Jim Sterling
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCWCw2Sd7RlYJ2yuNVHDWNOA
-**** outsidexbox
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCKk076mm-7JjLxJcFSXIPJA
-**** Outside Xtra
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCjf6YzmyaKi8880IXMJ5kGA
-*** Zelda :zelda:
-**** Gossip Geist
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCVBEE2TpAUD4T2OP7fHKCXg
-**** Linkus7 :speedrunning:
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCAnzaHhB0ONtwDkYdc3MFCw
-***** https://www.youtube.com/feeds/videos.xml?channel_id=UCqzES41DEZpg_UppWyaRlDQ
-** Linux :linux:
-*** System Crafters
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCAiiOTio8Yu69c3XnR7nQBQ
-*** The Linux Experiment
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw
-** News :news:
-*** Linux :linux:
-**** https://libera.chat/atom.xml :irc:
-**** https://nyxt.atlas.engineer/feed :browser:
-**** https://systemcrafters.net/rss/news.xml
-** Other :other:
-*** Curious Archive
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCweDKPSF65wRw5VHFUJYiow
-*** Jaiden Animations
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCGwu0nbY2wSkW8N-cghnLpA
-*** James Hoffmann :coffee:
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCMb0O2CdPBNi-QqPk5T3gsQ
-*** PointlessHub
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCKNbAYjhxVS5Y8p3FhhUxoA
-*** The Slow Mo Guys
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCUK0HBIBWgM2c4vsPhkYY4w
-** Podcasts :podcast:
-*** https://podcasts.watchnebula.com/chilloutpod
-** Programming :programming:
-*** CodeAesthetic
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCaSCt8s_4nfkRglWCvNSDrg
-*** Dreams of Code
-**** https://www.youtube.com/feeds/videos.xml?channel_id=UCWQaM7SpSECp9FELz-cHzuQ

init.el

@@ -369,7 +369,6 @@
 (defun my/open-feeds-file ()
   "Open elfeed org source file."
   (interactive)
-  (require 'org)
   (require 'elfeed)
   (require 'elfeed-org)
   (find-file (car rmh-elfeed-org-files)))
@@ -585,6 +584,8 @@
   (add-hook 'emms-player-started-hook #'emms-show))
 
 (use-package org
+  :demand
+  :hook ((org-mode . turn-on-auto-fill))
   :custom
   (org-directory "~/Documents/Org")
   (org-default-notes-file (expand-file-name "notes.org" org-directory))
@@ -605,12 +606,7 @@
                               (table . t)))
   (org-babel-load-languages '((emacs-lisp . t)
                               (lua . t)
-                              (python . t)))
+                              (python . t))))
-  :config
-  ;; Enable auto-fill in org-mode buffers
-  (add-hook 'org-mode-hook #'turn-on-auto-fill)
-  ;; Extra `setq' calls to be moved somewhere else
-  (setq org-attach-id-dir (expand-file-name "data/" org-directory)))
 
 (use-package org-faces
   :after org
@@ -625,6 +621,7 @@
   (set-face-attribute 'org-verse nil :inherit 'variable-pitch))
 
 (use-package org-keys
+  :after org
   :custom
   (org-return-follows-link t)
   (org-mouse-1-follows-link t))
@@ -633,10 +630,13 @@
   :after org
   :hook org-mode)
 
-(use-package org-refile
+(use-package org-attach
   :after org
-  :init
+  :custom
-  (require 'org-agenda)
+  (org-attach-id-dir (expand-file-name "data/" org-directory)))
+
+(use-package org-refile
+  :after (org org-agenda)
   :custom
   (org-outline-path-complete-in-steps nil)
   (org-refile-use-outline-path t)
@@ -646,6 +646,7 @@
                         (org-agenda-files . (:maxlevel . 2)))))
 
 (use-package org-src
+  :after org
   :custom
   (org-src-window-setup 'current-window))
 
@@ -674,12 +675,13 @@
   :custom
   (org-roam-directory (expand-file-name "roam" org-directory))
   (org-roam-completion-everywhere nil)
-  (org-roam-node-display-template (concat "${title:*} "
+  (org-roam-node-display-template (concat
+                                   "${title:*} "
                                    (propertize "${tags:24}" 'face 'org-tag)))
-  (org-roam-capture-templates '(("d" "default" plain "%?"
+  ;; (org-roam-capture-templates '(("d" "default" plain "%?"
-                                 :target
+  ;;                                :target
-                                 (file+head "${slug}.org" "#+title: ${title}\n#+author: %n")
+  ;;                                (file+head "${slug}.org" "#+title: ${title}\n#+author: %n")
-                                 :unnarrowed t)))
+  ;;                                :unnarrowed t)))
   :config
   (mkdir org-roam-directory t)
   (add-to-list 'display-buffer-alist
@@ -702,7 +704,7 @@
   (org-agenda-sticky nil)
   (org-agenda-window-setup 'current-window)
   (org-agenda-tags-column 0)
-  (org-agenda-diary-file (expand-file-name "calendar/diary.org" org-directory))
+  (org-agenda-diary-file (expand-file-name "agenda/calendar.org" org-directory))
   (org-agenda-include-diary nil)
   (org-agenda-include-deadlines t)
   (org-agenda-todo-ignore-scheduled 'future)
@@ -713,9 +715,11 @@
                               (search . " %-12:c")))
   (org-agenda-files (list
                      (expand-file-name org-directory)
-                     (expand-file-name "calendar" org-directory)
+                     (expand-file-name "agenda" org-directory)
+                     (expand-file-name "citar" org-directory)
                      (expand-file-name "journal" org-directory)
-                     (expand-file-name "projects" org-directory))))
+                     (expand-file-name "projects" org-directory)
+                     (expand-file-name "roam" org-directory))))
 
 (use-package ox-icalendar
   :after org
@@ -737,7 +741,7 @@
   (org-journal-file-format "%Y-%m.org"))
 
 (use-package org-noter
-  :after (org doc-view)
+  :after (org doc-view citar)
   :commands (org-noter)
   :custom
   (org-noter-always-create-frame nil)
@@ -745,19 +749,23 @@
   (org-noter-auto-save-last-location t)
   (org-noter-default-notes-file-names '("noter.org"))
   (org-noter-doc-property-in-notes t)
-  (org-noter-notes-search-path '("~/Documents/References/notes/"
+  (org-noter-notes-search-path (list (expand-file-name "notes" org-directory)
-                                 "~/Documents"))
+                                     (car citar-notes-paths)))
   (org-noter-prefer-root-as-file-level nil))
 
 (use-package citar
+  :after org
   :custom
-  (org-cite-global-bibliography '("~/Documents/References/main.bib"))
+  (org-cite-global-bibliography (list
+                                 (expand-file-name "citar/main.bib" org-directory)))
   (org-cite-insert-processor 'citar)
   (org-cite-follow-processor 'citar)
   (org-cite-activate-processor 'citar)
   (citar-bibliography org-cite-global-bibliography)
-  (citar-library-paths '("~/Documents/References/library/"))
+  (citar-library-paths (list
-  (citar-notes-paths '("~/Documents/References/notes/"))
+                        (expand-file-name "citar/library/" org-directory)))
+  (citar-notes-paths (list
+                      (expand-file-name "citar/notes/" org-directory)))
   :hook
   (LaTeX-mode . citar-capf-setup)
   (org-mode . citar-capf-setup)
@@ -1351,7 +1359,7 @@ Calls `project-remember-project-under' for ~/.config/,
 (use-package gnus-icalendar
   :after mu4e
   :custom
-  (gnus-icalendar-org-capture-file (expand-file-name "calendar/invited.org" org-directory))
+  (gnus-icalendar-org-capture-file (expand-file-name "agenda/invited.org" org-directory))
   (gnus-icalendar-org-capture-headline '("Email" "Inbox"))
   :config
   (require 'org-agenda)
@@ -1373,12 +1381,19 @@ Calls `project-remember-project-under' for ~/.config/,
   :custom
   (elfeed-search-filter "@2-months-ago +unread")
   :config
+  (require 'elfeed-db)
   (require 'elfeed-org))
 
-(use-package elfeed-org
+(use-package elfeed-db
   :after (elfeed org)
   :custom
-  (rmh-elfeed-org-files (list (locate-user-emacs-file "feeds.org")))
+  (elfeed-db-directory (expand-file-name "elfeed" org-directory)))
+
+(use-package elfeed-org
+  :after (elfeed elfeed-db org)
+  :custom
+  (rmh-elfeed-org-files (list
+                         (expand-file-name "feeds.org" elfeed-db-directory)))
   :config
   (elfeed-org))