From d7f92879b3763fec08c5e945fa299d377c63632a Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 10 Feb 2025 17:03:54 +0000
Subject: [PATCH] Restructure org files a bit

---
 init.el | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/init.el b/init.el
index 8fc75fa..e199992 100644
--- a/init.el
+++ b/init.el
@@ -672,10 +672,10 @@
   :defines (org-journal-dir)
   :bind ("C-c n d" . org-journal-new-entry)
   :custom
-  (org-journal-dir (expand-file-name "journal" org-directory))
+  (org-journal-dir org-directory)
   (org-journal-file-header "#+category: Journal")
   (org-journal-file-type 'yearly)
-  (org-journal-file-format "%Y.org")
+  (org-journal-file-format "journal-%Y.org")
   (org-journal-date-format "%A, %F")
   (org-journal-encrypt-journal t)
   (org-journal-carryover-items nil))
@@ -703,7 +703,6 @@
 (use-package org-agenda
   :after org
   :bind (("C-c a" . org-agenda))
-  :hook ((org-agenda-mode . (lambda () (visual-line-mode -1))))
   :custom
   (org-agenda-span 'day)
   (org-agenda-start-on-weekday 1)
@@ -732,12 +731,12 @@
                               (tags . " %-12:c")
                               (search . " %-12:c")))
   (org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'")
-  (org-agenda-files (list (expand-file-name org-directory)))
+  (org-agenda-files (list (expand-file-name org-directory)
+                          (expand-file-name "project" org-directory)
+                          (expand-file-name "area" org-directory)))
   :config
   (require 'appt)
   (require 'khalel)
-  (require 'org-journal)
-  (add-to-list 'org-agenda-files (expand-file-name org-journal-dir))
   (khalel-import-events)
   (advice-add 'appt-check
               :before