Revert moving events to diary.gpg

Moved back to using org for diary/calendar events, so reverted
associated changes

init.el

@@ -199,7 +199,6 @@
   :bind (("C-c >" . calendar))
   :hook ((calendar-today-visible . calendar-mark-today))
   :custom
-  (diary-file (locate-user-emacs-file "diary.gpg"))
   (calendar-date-style 'iso)
   (calendar-mark-holidays-flag t)
   (calendar-mark-diary-entries-flag nil)
@@ -516,6 +515,7 @@
          ("C-c r n" . org-roam-capture)
          ("C-c r j" . org-roam-dailies-capture-today)
          ("M-g j" . org-roam-dailies-goto-today)
+         ("M-g C-j" . org-roam-dailies-goto-date)
          :map org-mode-map
          ("C-c r b" . org-roam-buffer-toggle))
   :custom
@@ -543,14 +543,7 @@
   (org-roam-dailies-directory "./")
   (org-roam-dailies-capture-templates
    '(("d" "default" entry
-      "* %?"
-      :target (file+datetree "journal.org.gpg" week))
-     ("t" "task")
-     ("tp" "personal" entry
-      "* TODO [#B] %? :personal:"
-      :target (file+datetree "journal.org.gpg" week))
-     ("tw" "work" entry
-      "* TODO [#B] %? :work:"
+      "* %?\n%U"
       :target (file+datetree "journal.org.gpg" week)))))
 
 (use-package org-agenda
@@ -563,8 +556,8 @@
   (org-agenda-sticky nil)
   (org-agenda-window-setup 'current-window)
   (org-agenda-tags-column 0)
-  (org-agenda-diary-file 'diary-file)
-  (org-agenda-include-diary t)
+  (org-agenda-diary-file (expand-file-name "calendar/diary.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)
@@ -575,6 +568,7 @@
   (org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'")
   (org-agenda-files (list
                      (expand-file-name org-directory)
+                     (expand-file-name "calendar" org-directory)
                      (expand-file-name "journal" org-directory)
                      (expand-file-name "roam" org-directory)
                      (expand-file-name "citar" org-directory))))

lib/mu4e-custom.el

@@ -270,7 +270,7 @@
 (use-package gnus-icalendar
   :after (mu4e org-agenda)
   :custom
-  (gnus-icalendar-org-capture-file (expand-file-name "email-events.org.gpg" org-directory))
+  (gnus-icalendar-org-capture-file (expand-file-name "calendar/email.org.gpg" org-directory))
   (gnus-icalendar-org-capture-headline '("Inbox"))
   :config
   (require 'org-agenda)