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
This commit is contained in:
Evie Litherland-Smith 2024-06-12 10:43:29 +01:00
parent 0ad8d0f334
commit 46e2f79cc0
2 changed files with 6 additions and 12 deletions

View file

@ -526,16 +526,14 @@
:after org :after org
:bind (("C-c a" . org-agenda)) :bind (("C-c a" . org-agenda))
:hook (org-agenda-mode . org-agenda-to-appt) :hook (org-agenda-mode . org-agenda-to-appt)
:init
(setopt diary-file (expand-file-name "agenda/diary" org-directory))
:custom :custom
(org-agenda-span 'week) (org-agenda-span 'week)
(org-agenda-start-on-weekday 1) (org-agenda-start-on-weekday 1)
(org-agenda-sticky nil) (org-agenda-sticky nil)
(org-agenda-window-setup 'current-window) (org-agenda-window-setup 'current-window)
(org-agenda-tags-column 0) (org-agenda-tags-column 0)
(org-agenda-diary-file (expand-file-name "agenda/calendar.org" org-directory)) (org-agenda-diary-file (expand-file-name "calendar.org.gpg" org-directory))
(org-agenda-include-diary t) (org-agenda-include-diary nil)
(org-agenda-include-deadlines t) (org-agenda-include-deadlines t)
(org-agenda-todo-ignore-scheduled 'future) (org-agenda-todo-ignore-scheduled 'future)
(org-agenda-todo-ignore-deadlines 'far) (org-agenda-todo-ignore-deadlines 'far)
@ -546,7 +544,6 @@
(org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'") (org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'")
(org-agenda-files (list (org-agenda-files (list
(expand-file-name org-directory) (expand-file-name org-directory)
(expand-file-name "agenda" org-directory)
(expand-file-name "journal" org-directory)))) (expand-file-name "journal" org-directory))))
(use-package ox-icalendar (use-package ox-icalendar
@ -1113,7 +1110,7 @@ Calls `project-remember-projects-under' for ~/Projects/"
(message-kill-buffer-on-exit t)) (message-kill-buffer-on-exit t))
(use-package bbdb (use-package bbdb
:bind (("M-g b" . bbdb)) :bind (("M-g b" . bbdb-display-all-records))
:custom :custom
(bbdb-file (locate-user-emacs-file "bbdb.gpg"))) (bbdb-file (locate-user-emacs-file "bbdb.gpg")))

View file

@ -78,7 +78,6 @@
(mu4e-sent-folder . "/Proton/Sent") (mu4e-sent-folder . "/Proton/Sent")
(mu4e-trash-folder . "/Proton/Trash") (mu4e-trash-folder . "/Proton/Trash")
(mu4e-refile-folder . "/Proton/Archive") (mu4e-refile-folder . "/Proton/Archive")
(gnus-icalendar-org-capture-headline . '("Email" "Personal"))
(message-cite-style . message-cite-style-thunderbird) (message-cite-style . message-cite-style-thunderbird)
(message-signature . (concat "Evelyn Litherland-Smith (she/they)\n")) (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
)) ))
@ -90,7 +89,6 @@
(mu4e-sent-folder . "/iCloud/Sent Messages") (mu4e-sent-folder . "/iCloud/Sent Messages")
(mu4e-trash-folder . "/iCloud/Deleted Messages") (mu4e-trash-folder . "/iCloud/Deleted Messages")
(mu4e-refile-folder . "/iCloud/Archive") (mu4e-refile-folder . "/iCloud/Archive")
(gnus-icalendar-org-capture-headline . '("Email" "Personal"))
(message-cite-style . message-cite-style-thunderbird) (message-cite-style . message-cite-style-thunderbird)
(message-signature . (concat "Evelyn Litherland-Smith (she/they)\n")) (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
)) ))
@ -102,7 +100,6 @@
(mu4e-sent-folder . "/Outlook/Sent") (mu4e-sent-folder . "/Outlook/Sent")
(mu4e-trash-folder . "/Outlook/Trash") (mu4e-trash-folder . "/Outlook/Trash")
(mu4e-refile-folder . "/Outlook/Archive") (mu4e-refile-folder . "/Outlook/Archive")
(gnus-icalendar-org-capture-headline . '("Email" "Work"))
(message-cite-style . message-cite-style-outlook) (message-cite-style . message-cite-style-outlook)
(message-signature . (concat "Evelyn Litherland-Smith (she/they)\n" (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"
"Spectroscopy Diagnostic Physicist\n" "Spectroscopy Diagnostic Physicist\n"
@ -266,10 +263,10 @@
(setq mu4e-notification-support t)) (setq mu4e-notification-support t))
(use-package gnus-icalendar (use-package gnus-icalendar
:after mu4e :after (mu4e org-agenda)
:custom :custom
(gnus-icalendar-org-capture-file (expand-file-name "agenda/invited.org" org-directory)) (gnus-icalendar-org-capture-file org-agenda-diary-file)
(gnus-icalendar-org-capture-headline '("Email" "Inbox")) (gnus-icalendar-org-capture-headline '("Email"))
:config :config
(require 'org-agenda) (require 'org-agenda)
(require 'org-capture) (require 'org-capture)