From d0ff09ffb76f7afa0721d6be42be1207f2a08522 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 1 Jul 2024 13:30:08 +0100 Subject: [PATCH] Revert moving events to diary.gpg Moved back to using org for diary/calendar events, so reverted associated changes --- diary.gpg | Bin 4339 -> 0 bytes init.el | 16 +++++----------- lib/mu4e-custom.el | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 diary.gpg diff --git a/diary.gpg b/diary.gpg deleted file mode 100644 index 4c531f42b86b43b99ac20b40e7d912e16dd3b6e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4339 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 diff --git a/init.el b/init.el index cf8dc44..9edb28a 100644 --- a/init.el +++ b/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)))) diff --git a/lib/mu4e-custom.el b/lib/mu4e-custom.el index 5f4df10..7b52bf2 100644 --- a/lib/mu4e-custom.el +++ b/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)