From 46e2f79cc0e6ba46eefa8c480afb87cf3a64dbbb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 12 Jun 2024 10:43:29 +0100
Subject: [PATCH] Move agenda/calendar into single, gpg encrypted, file

Point org-agenda and gnus-icalendar to correct file

Add BBDB anniversaries to org-agenda, remove diary integration since
it's handled by org-calendar-holiday function
---
 init.el        | 9 +++------
 mu4e-custom.el | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/init.el b/init.el
index f52e3f3..0853646 100644
--- a/init.el
+++ b/init.el
@@ -526,16 +526,14 @@
   :after org
   :bind (("C-c a" . org-agenda))
   :hook (org-agenda-mode . org-agenda-to-appt)
-  :init
-  (setopt diary-file (expand-file-name "agenda/diary" org-directory))
   :custom
   (org-agenda-span 'week)
   (org-agenda-start-on-weekday 1)
   (org-agenda-sticky nil)
   (org-agenda-window-setup 'current-window)
   (org-agenda-tags-column 0)
-  (org-agenda-diary-file (expand-file-name "agenda/calendar.org" org-directory))
-  (org-agenda-include-diary t)
+  (org-agenda-diary-file (expand-file-name "calendar.org.gpg" org-directory))
+  (org-agenda-include-diary nil)
   (org-agenda-include-deadlines t)
   (org-agenda-todo-ignore-scheduled 'future)
   (org-agenda-todo-ignore-deadlines 'far)
@@ -546,7 +544,6 @@
   (org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'")
   (org-agenda-files (list
                      (expand-file-name org-directory)
-                     (expand-file-name "agenda" org-directory)
                      (expand-file-name "journal" org-directory))))
 
 (use-package ox-icalendar
@@ -1113,7 +1110,7 @@ Calls `project-remember-projects-under' for ~/Projects/"
   (message-kill-buffer-on-exit t))
 
 (use-package bbdb
-  :bind (("M-g b" . bbdb))
+  :bind (("M-g b" . bbdb-display-all-records))
   :custom
   (bbdb-file (locate-user-emacs-file "bbdb.gpg")))
 
diff --git a/mu4e-custom.el b/mu4e-custom.el
index 1ae6742..1b17661 100644
--- a/mu4e-custom.el
+++ b/mu4e-custom.el
@@ -78,7 +78,6 @@
                   (mu4e-sent-folder . "/Proton/Sent")
                   (mu4e-trash-folder . "/Proton/Trash")
                   (mu4e-refile-folder . "/Proton/Archive")
-                  (gnus-icalendar-org-capture-headline . '("Email" "Personal"))
                   (message-cite-style . message-cite-style-thunderbird)
                   (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
                   ))
@@ -90,7 +89,6 @@
                   (mu4e-sent-folder . "/iCloud/Sent Messages")
                   (mu4e-trash-folder . "/iCloud/Deleted Messages")
                   (mu4e-refile-folder . "/iCloud/Archive")
-                  (gnus-icalendar-org-capture-headline . '("Email" "Personal"))
                   (message-cite-style . message-cite-style-thunderbird)
                   (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
                   ))
@@ -102,7 +100,6 @@
                   (mu4e-sent-folder . "/Outlook/Sent")
                   (mu4e-trash-folder . "/Outlook/Trash")
                   (mu4e-refile-folder . "/Outlook/Archive")
-                  (gnus-icalendar-org-capture-headline . '("Email" "Work"))
                   (message-cite-style . message-cite-style-outlook)
                   (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"
                                                "Spectroscopy Diagnostic Physicist\n"
@@ -266,10 +263,10 @@
   (setq mu4e-notification-support t))
 
 (use-package gnus-icalendar
-  :after mu4e
+  :after (mu4e org-agenda)
   :custom
-  (gnus-icalendar-org-capture-file (expand-file-name "agenda/invited.org" org-directory))
-  (gnus-icalendar-org-capture-headline '("Email" "Inbox"))
+  (gnus-icalendar-org-capture-file org-agenda-diary-file)
+  (gnus-icalendar-org-capture-headline '("Email"))
   :config
   (require 'org-agenda)
   (require 'org-capture)