pixelifytica/emacs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert moving events to diary.gpg

Browse source 
Moved back to using org for diary/calendar events, so reverted
associated changes
This commit is contained in:
Evie Litherland-Smith 2024-07-01 13:30:08 +01:00
parent af6b6219cc
commit d0ff09ffb7
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
diary.gpg
View file

Binary file not shown.

16
init.el
View file

@ -199,7 +199,6 @@
:bind (("C-c >" . calendar)) :bind (("C-c >" . calendar))
:hook ((calendar-today-visible . calendar-mark-today)) :hook ((calendar-today-visible . calendar-mark-today))
:custom :custom
(diary-file (locate-user-emacs-file "diary.gpg"))
(calendar-date-style 'iso) (calendar-date-style 'iso)
(calendar-mark-holidays-flag t) (calendar-mark-holidays-flag t)
(calendar-mark-diary-entries-flag nil) (calendar-mark-diary-entries-flag nil)
@ -516,6 +515,7 @@
("C-c r n" . org-roam-capture) ("C-c r n" . org-roam-capture)
("C-c r j" . org-roam-dailies-capture-today) ("C-c r j" . org-roam-dailies-capture-today)
("M-g j" . org-roam-dailies-goto-today) ("M-g j" . org-roam-dailies-goto-today)
("M-g C-j" . org-roam-dailies-goto-date)
:map org-mode-map :map org-mode-map
("C-c r b" . org-roam-buffer-toggle)) ("C-c r b" . org-roam-buffer-toggle))
:custom :custom
@ -543,14 +543,7 @@
(org-roam-dailies-directory "./") (org-roam-dailies-directory "./")
(org-roam-dailies-capture-templates (org-roam-dailies-capture-templates
'(("d" "default" entry '(("d" "default" entry
"* %?" "* %?\n%U"
: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:"
:target (file+datetree "journal.org.gpg" week))))) :target (file+datetree "journal.org.gpg" week)))))
(use-package org-agenda (use-package org-agenda
@ -563,8 +556,8 @@
(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 'diary-file) (org-agenda-diary-file (expand-file-name "calendar/diary.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)
@ -575,6 +568,7 @@
(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 "calendar" org-directory)
(expand-file-name "journal" org-directory) (expand-file-name "journal" org-directory)
(expand-file-name "roam" org-directory) (expand-file-name "roam" org-directory)
(expand-file-name "citar" org-directory)))) (expand-file-name "citar" org-directory))))

2
lib/mu4e-custom.el
View file

@ -270,7 +270,7 @@
(use-package gnus-icalendar (use-package gnus-icalendar
:after (mu4e org-agenda) :after (mu4e org-agenda)
:custom :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")) (gnus-icalendar-org-capture-headline '("Inbox"))
:config :config
(require 'org-agenda) (require 'org-agenda)