Revert "MU4E ical invites to email diary file instead of org file"

This reverts commit bedef7a545.

Also remove overridden capture template for gnus-icalendar

config/email.org

@@ -295,8 +295,11 @@
 ** 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/email.org.gpg" gnus-home-directory))
+    (setq gnus-icalendar-org-capture-headline '("Inbox"))
+    (gnus-icalendar-org-setup))
 #+end_src

config/org-mode.org

@@ -80,9 +80,6 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
           ("d" "Diary Event" entry
            (file+datetree "diary.org")
            "* %?\n%^T")
-          ("#" "used by gnus-icalendar-org" entry
-           (file+datetree "diary.org")
-           "%i" :immediate-finish t)
           ("m" "Email Workflow")
           ("mf" "Follow Up" entry
            (file+olp+datetree "tasks.org" "Inbox")