calendar: european-style dates

1 files changed, 49 insertions, 44 deletions

diff --git a/init.el b/init.el
index 80aebf3..232e6e7 100644
--- a/init.el
+++ b/init.el
@@ -593,53 +593,58 @@
 (add-hook 'diary-list-entries-hook 'diary-sort-entries t)
 
 ;;;; calendar
-(setq appt-display-format nil)
-(appt-activate 1)
-(setq calendar-date-style 'european
-      calendar-latitude 55.9533
-      calendar-longitude -3.1883
-      calendar-left-margin 4
-      calendar-location-name "Edinburgh, Scotland"
-      calendar-mark-diary-entries-flag t
-      calendar-week-start-day 1 ;; 0 sunday
-      calendar-date-echo-text '(format "ISO date: %s"
-                                       (calendar-iso-date-string
-                                        (list month day year))))
-
-(setq calendar-holidays
-      '((holiday-fixed 1 1 "New Year's Day")
-        (holiday-fixed 4 1 "April Fools' Day")
-        (holiday-float 5 0 2 "Mother's Day")
-        (holiday-fixed 3 19 "Father's Day")
-        (holiday-float 11 4 4 "Thanksgiving")
-        (holiday-fixed 12 25 "Christmas")
-        (holiday-chinese-new-year)
-        (solar-equinoxes-solstices)
-        (holiday-sexp calendar-daylight-savings-starts
-                      (format "Daylight Saving Time Begins %s"
-                              (solar-time-string
-                               (/ calendar-daylight-savings-starts-time
-                                  (float 60))
-                               calendar-standard-time-zone-name)))
-        (holiday-sexp calendar-daylight-savings-ends
-                      (format "Daylight Saving Time Ends %s"
-                              (solar-time-string
-                               (/ calendar-daylight-savings-ends-time
-                                  (float 60))
-                               calendar-daylight-time-zone-name)))))
 
-(add-to-list 'display-buffer-alist
-             `(,(regexp-quote diary-fancy-buffer)
-               (display-buffer-at-bottom)
-               (window-parameters (mode-line-format . none))
-               (window-height . fit-window-to-buffer)))
+(use-package calendar
+  :init
+  (setq appt-display-format nil
+        calendar-latitude 55.9533
+        calendar-longitude -3.1883
+        calendar-left-margin 4
+        calendar-location-name "Edinburgh, Scotland"
+        calendar-mark-diary-entries-flag t
+        calendar-week-start-day 1 ;; 0 sunday
+        calendar-date-echo-text '(format "ISO date: %s"
+                                         (calendar-iso-date-string
+                                          (list month day year))))
+  (setq calendar-holidays
+        '((holiday-fixed 1 1 "New Year's Day")
+          (holiday-fixed 4 1 "April Fools' Day")
+          (holiday-float 5 0 2 "Mother's Day")
+          (holiday-fixed 3 19 "Father's Day")
+          (holiday-float 11 4 4 "Thanksgiving")
+          (holiday-fixed 12 25 "Christmas")
+          (holiday-chinese-new-year)
+          (solar-equinoxes-solstices)
+          (holiday-sexp calendar-daylight-savings-starts
+                        (format "Daylight Saving Time Begins %s"
+                                (solar-time-string
+                                 (/ calendar-daylight-savings-starts-time
+                                    (float 60))
+                                 calendar-standard-time-zone-name)))
+          (holiday-sexp calendar-daylight-savings-ends
+                        (format "Daylight Saving Time Ends %s"
+                                (solar-time-string
+                                 (/ calendar-daylight-savings-ends-time
+                                    (float 60))
+                                 calendar-daylight-time-zone-name)))))
+
+  (setq org-calendar-insert-diary-entry-key nil
+        org-agenda-diary-file 'diary-file)
+
+  :config
+  (appt-activate 1)
+  (calendar-set-date-style 'european)
+
+  (add-to-list 'display-buffer-alist
+               `(,(regexp-quote diary-fancy-buffer)
+                 (display-buffer-at-bottom)
+                 (window-parameters (mode-line-format . none))
+                 (window-height . fit-window-to-buffer)))
 
-(defun jao-diary--select ()
-  (switch-to-buffer diary-fancy-buffer))
+  (defun jao-diary--select ()
+    (switch-to-buffer diary-fancy-buffer))
 
-(add-hook 'diary-fancy-display-mode-hook #'jao-diary--select)
-(setq org-calendar-insert-diary-entry-key nil
-      org-agenda-diary-file 'diary-file)
+  (add-hook 'diary-fancy-display-mode-hook #'jao-diary--select))
 
 ;;;; winttr
 (defun jao-weather (&optional wide)