MU4E ical invites to email diary file instead of org file

Add work diary, partially filled in at the moment

Import bin collection calendar

Add (empty) email diary file to add accepted email events to

config/diary.org

@@ -1,14 +1,24 @@
-#+title: Agenda config
+#+title: Diary and Calendar config
 #+author: Evie Litherland-Smith
 #+email: evie@xenia.me.uk
 #+language: en
 #+filetags: :emacs:config:org:
 #+property: header-args:emacs-lisp :tangle yes :mkdirp yes :results output silent
+* Diary
+#+begin_src emacs-lisp
+  (setopt diary-file (locate-user-emacs-file "diary/main.gpg")
+          diary-display-function #'diary-fancy-display)
+  (add-hook 'diary-list-entries-hook #'diary-include-other-diary-files)
+  (add-hook 'diary-list-entries-hook #'diary-sort-entries t)
+  (add-hook 'diary-mark-entries-hook #'diary-mark-included-diary-files)
+#+end_src
 * Calendar
 #+begin_src emacs-lisp
   (setopt calendar-date-style 'iso
           calendar-mark-holidays-flag t
-          calendar-mark-diary-entries-flag nil)
+          calendar-mark-diary-entries-flag nil
+          calendar-view-holidays-initially-flag nil
+          calendar-view-diary-initially-flag nil)
 #+end_src
 * Appointment reminders
 #+begin_src emacs-lisp

config/email.org

@@ -295,11 +295,8 @@
 ** iCalendar integration
 #+begin_src emacs-lisp
   (with-eval-after-load 'mu4e
+    (setopt mu4e-icalendar-diary-file (locate-user-emacs-file "diary/email.gpg")
+            mu4e-icalendar-trash-after-reply nil)
     (require 'mu4e-icalendar)
-    (mu4e-icalendar-setup)
+    (mu4e-icalendar-setup))
-    (setq mu4e-icalendar-trash-after-reply nil)
-    (require 'gnus-icalendar)
-    (setq gnus-icalendar-org-capture-file (expand-file-name "diary.org" org-directory))
-    (setq gnus-icalendar-org-capture-headline '("Email"))
-    (gnus-icalendar-org-setup))
 #+end_src

config/org-mode.org

@@ -142,8 +142,8 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-agenda-sticky nil
         org-agenda-window-setup 'current-window
         org-agenda-tags-column 0
-        org-agenda-diary-file (expand-file-name "diary.org" org-directory)
+        org-agenda-diary-file 'diary-file
-        org-agenda-include-diary nil
+        org-agenda-include-diary t
         org-agenda-include-deadlines t
         org-agenda-todo-ignore-scheduled 'future
         org-agenda-todo-ignore-deadlines 'far

diary

@@ -1 +0,0 @@
-%%(org-diary)

diary/email.gpg

@@ -0,0 +1,2 @@
+<EFBFBD>^Ц
+	
Й<>ЏУ
@b'Шt<D0A8>љ_иэ<D0B8>EEЪ0НаЬ<D0B0>6зH<D0B7>ъо>вmўj0 шщюљ*@K4ZУЛЮ6eqLAзЙ<D0B7>e'ўиЖЊАЌ<D090><D08C>ВжЂ/<2F>$сGu5Ћ+<2B>S%в;
e{ѓ@у_]=EIЯ.дwAмыYИХўOГћnKп"!~о<0C><>Vиw7sђїљќRЋцEыи