From 7f6ec9be70a5c4e6652d4aa24e00f45a7c2f3c93 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 6 Apr 2024 12:21:20 +0100
Subject: [PATCH] Start switching back to using emacs diary file(s)

Add main diary file and an included birthday file so far
---
 config/{agenda.org => diary.org} |  14 +++++++++++---
 config/org-mode.org              |   4 ++--
 diary/birthdays.gpg              | Bin 0 -> 408 bytes
 diary/main.gpg                   | Bin 0 -> 220 bytes
 4 files changed, 13 insertions(+), 5 deletions(-)
 rename config/{agenda.org => diary.org} (57%)
 create mode 100644 diary/birthdays.gpg
 create mode 100644 diary/main.gpg

diff --git a/config/agenda.org b/config/diary.org
similarity index 57%
rename from config/agenda.org
rename to config/diary.org
index 2d17917..61a5d4c 100644
--- a/config/agenda.org
+++ b/config/diary.org
@@ -1,14 +1,22 @@
-#+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-view-holidays-initially-flag t
+          calendar-view-diary-initially-flag t)
 #+end_src
 * Appointment reminders
 #+begin_src emacs-lisp
diff --git a/config/org-mode.org b/config/org-mode.org
index 2977342..2be6642 100644
--- a/config/org-mode.org
+++ b/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-include-diary nil
+        org-agenda-diary-file 'diary-file
+        org-agenda-include-diary t
         org-agenda-include-deadlines t
         org-agenda-todo-ignore-scheduled 'future
         org-agenda-todo-ignore-deadlines 'far
diff --git a/diary/birthdays.gpg b/diary/birthdays.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..e395af7f6d281e5514bcc411bb70e502989b5ea1
GIT binary patch
literal 408
zcmV;J0cZY%UIWGo2?4p8ufq}n2S8->oP*pOWXeiqK*%v-KCi(hU)B1cZe*J33OMGv
zW_~a=T=2=?B=fzE_$G8v2WDOCD<99GGAW%V!*e5#+pro9&k0XhZ1Jz$9?d!+(O4$Z
zz;ywM0{hS1ualux20|9Qy;bNNN-3@VKcdb`4^8ENK@&<pvXs=yLcKnoaB@!NROR5p
zs)sl#{SzL1#+-MI{*ZNL6BXn5^LFWA1W?aNA28e1)!Z>RH~*6`(YEWfY5qIK7_CsC
zFoD`aB<n$&|9iJ5qG)7sr#3V-6(nFETs-$4uC&7<VR@R1`Teh{-`AqLnMTDhnorIV
z%uqsNpuniS!Q}hO&gqHQC#?tW)1aIuQPa_HeK6(#1*J%9|I`Yljh|5pD*vZqV_lrY
zv~iJO94GZJ(#hxVQUxQ?OJ2A0;mC^LjbW&O2dElLWjuPQkU3zDdab4)Y(}^ZRY0nJ
zs%h%WF*DuwkD{WIo;&#oA`pls;qnx}N4tzuKHaJ}$R564mE&R{LEX;(fetpM62%<J
C4a}AR

literal 0
HcmV?d00001

diff --git a/diary/main.gpg b/diary/main.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..62c44ab118c323738ca07adaccd6bd56b64436bc
GIT binary patch
literal 220
zcmV<203-i|UIWGo2?4p8ufq}n2S7okBgZ-H(DeXd9QzVR^LKA#TRjHl@tnB`uT%~+
zw<j?4<ov+imbiR154mnhpsO1>de-+TVqf9h={AKewxNZ<e%^4_F#Vw=@9X{B1U^gB
zdI5#P(qwTb$ET&QxWDE9W9G`a4&`qvp_9^8&CkddG);Il?>QJ6`PH^Js6ZETVIT`U
ztZd;aADtf(6Qt79z+S&hn{)%t?L1NYDkh^Ee>8+WE+fKWd~Y3TFmPf{$!`d;FWb6m
Wv_Bye2zg*jiP)8-P{n2?@&L+S25Ghc

literal 0
HcmV?d00001