literate configuration

1 files changed, 10 insertions, 36 deletions

diff --git a/bard-emacs-modules/bard-emacs-calendar.el b/bard-emacs-modules/bard-emacs-calendar.el
index 54e7795..25a5c8d 100644
--- a/bard-emacs-modules/bard-emacs-calendar.el
+++ b/bard-emacs-modules/bard-emacs-calendar.el
@@ -14,6 +14,15 @@
   (calendar-mode . denote-journal-calendar-mode)
   (calendar-today-visible . calendar-mark-holidays))
 
+(use-package orthodox-christian-new-calendar-holidays
+  :ensure t
+  :config
+  (setq holiday-other-holidays (append holiday-other-holidays orthodox-christian-new-calendar-holidays))
+
+  (setq holiday-bahai-holidays nil
+        holiday-christian-holidays nil
+        holiday-islamic-holidays nil))
+
 ;; Org todo keywords - changed to using hl-todo faces fixed by modus/ef themes
 (setq org-todo-keywords
       '((sequence "TODO(t)" "EXTRA(e)" "INPROG(i)" "|" "DONE(d)" "KILLED(k)")
@@ -30,8 +39,6 @@
 ;; Automatically clock in
 (add-hook 'org-after-todo-state-change-hook #'bard/auto-clock-in)
 
-;;; Org Agenda
-
 ;; clock tables
 (setq org-clock-clocktable-default-properties '(:maxlevel 7 :scope agenda)
       org-clock-persist 'history
@@ -43,20 +50,15 @@
   :hook
   ((org-clock-out . bard/org-clock-update-mode-line)))
 
-(global-set-key (kbd "M-<f1>") 'bard/choose-agenda)
-(global-set-key (kbd "C-c a c") 'bard/choose-agenda)
-
 (global-set-key (kbd "<f1>") 'bard/default-agenda)
-(global-set-key (kbd "C-c a a") 'bard/default-agenda)
+(global-set-key (kbd "M-<f1>") 'bard/choose-agenda)
 
-;; Org Agenda
 (setq org-agenda-include-diary t)
 (setq org-agenda-custom-commands
       `(("D" "Daily agenda and top priority tasks"
          ((tags-todo "!TODO"
                      ((org-agenda-overriding-header "Unscheduled Tasks \n")
                       (org-agenda-skip-function '(org-agenda-skip-entry-if 'timestamp))))
-          
           (agenda "" ((org-agenda-span 1)
                       (org-agenda-start-day nil)
                       (org-deadline-warning-days 14)
@@ -88,32 +90,4 @@
         org-habit-show-all-today t)
   )
 
-(use-package orthodox-christian-new-calendar-holidays
-  :ensure t
-  :config
-  (setq holiday-other-holidays (append holiday-other-holidays orthodox-christian-new-calendar-holidays))
-
-  (setq holiday-bahai-holidays nil
-        holiday-christian-holidays nil
-        holiday-islamic-holidays nil))
-
-(defun bard/export-agenda-to-file ()
-  (interactive)
-  (org-eval-in-environment (org-make-parameter-alist
-                            '(org-agenda-span
-                              'week
-                              org-agenda-use-time-grid t
-                              org-agenda-remove-tags t
-                              org-agenda-window-setup 'nope))
-    (let* ((wins (current-window-configuration))
-           org-agenda-sticky)
-      (save-excursion
-        (with-current-buffer
-            (get-buffer-create org-agenda-buffer-name)
-          (pop-to-buffer (current-buffer))
-          (org-agenda nil "a")
-          (let ((result (buffer-string)))
-            (with-temp-file "~/.cache/agenda" (insert result)))))
-      (set-window-configuration wins))))
-
 (provide 'bard-emacs-calendar)