nit: more dynamic jao-org-dir

1 files changed, 3 insertions, 6 deletions

diff --git a/init.el b/init.el
index d20afeb..95578c6 100644
--- a/init.el
+++ b/init.el
@@ -58,8 +58,6 @@
 
 (defvar jao-doc-dir (expand-file-name (jao-d-l "~/Documents" "~/doc")))
 
-(setq jao-org-dir (expand-file-name "org" jao-doc-dir))
-
 (defvar jao-sink-dir
   (file-name-as-directory (expand-file-name "sink" jao-doc-dir))
   "Directory used for downloads and such.")
@@ -638,8 +636,7 @@
 
 ;;; Calendar, diary
 ;;;; diary
-(setq ;; diary-file (expand-file-name "diary" jao-org-dir)
-      diary-display-function 'diary-fancy-display
+(setq diary-display-function 'diary-fancy-display
       diary-mail-addr "jao@localhost"
       diary-comment-start ";;"
       diary-comment-end "")
@@ -649,12 +646,12 @@
 ;;;; calendar
 
 (use-package calendar
+  :custom (calendar-month-width 30)
   :init
   (setq appt-display-format nil
         calendar-latitude 55.9533
         calendar-longitude -3.1883
         calendar-left-margin 2
-        calendar-month-width 30
         calendar-location-name "Edinburgh, Scotland"
         calendar-mark-diary-entries-flag t
         calendar-week-start-day 1 ;; 0 sunday
@@ -875,7 +872,7 @@
 
   (defun jao-recoll-consult-docs ()
     (interactive)
-    (consult-recoll (format "dir:%s/doc " jao-org-dir)))
+    (consult-recoll (format "dir:%s/doc " (jao-org-dir))))
 
   (defun jao-recoll-consult-notes ()
     "Use consult-recoll to search notes."