Use org mode instead of the diary

2 files changed, 38 insertions, 5 deletions

diff --git a/gnus.el b/gnus.el
index 429c704..1b80c3f 100644
--- a/gnus.el
+++ b/gnus.el
@@ -8,3 +8,7 @@
 
 (setq mm-text-html-renderer 'gnus-w3m)
 (setq gnus-inhibit-images nil)
+
+(setq gnus-asynchronous t)
+(setq gnus-use-cache t)
+(setq gnus-use-header-prefetch t)
diff --git a/init.el b/init.el
index 98c4b9d..87322f4 100644
--- a/init.el
+++ b/init.el
@@ -426,14 +426,28 @@ https://yannherklotz.com"))
 (use-package appt
   :custom
   (appt-display-diary nil)
-  (appt-disp-window-function #'appt-disp-window)
+  (appt-disp-window-function #'appt-disp-window) ;; 'window
   (appt-display-mode-line t)
   (appt-display-interval 5)
   (appt-audible nil)
   (appt-warning-time-regexp "appt \\([0-9]+\\)")
   (appt-message-warning-time 15)
   :config
-  (run-at-time 10 nil #'appt-activate 1))
+  (defun ymh/org-agenda-to-appt ()
+    (org-agenda-to-appt t '((category "meeting")))
+    (appt-check))
+  (appt-activate t)
+  (ymh/org-agenda-to-appt)
+  (run-at-time "00:01" nil #'ymh/org-agenda-to-appt)
+  ;; (setq appt-disp-window-function (function my-appt-disp-window))
+  ;;(defun my-appt-disp-window (min-to-app new-time msg)
+  ;;  (save-window-excursion (shell-command (concat
+  ;;                                         "/usr/bin/zenity --info --title='Appointment' --text='"
+  ;;                                         msg
+  ;;                                         "' &"
+  ;;                                         ) nil nil)
+  ;;                         ))
+)
 
 (use-package savehist
   :init
@@ -595,6 +609,7 @@ https://yannherklotz.com"))
                                         "main.org"
                                         "tickler.org"
                                         "projects.org"
+                                        "diary.org"
                                         (format-time-string "%Y-%m.org")))))
   (org-agenda-custom-commands
    '(("w" "At work" tags-todo "@work"
@@ -604,7 +619,7 @@ https://yannherklotz.com"))
      ("u" "At uni" tags-todo "@uni"
       ((org-agenda-overriding-header "University")))))
 
-  (org-agenda-include-diary t)
+  (org-agenda-include-diary nil) ;; Do not use diary anymore
   (org-agenda-show-all-dates t)
   (org-agenda-skip-deadline-if-done t)
   (org-agenda-skip-scheduled-if-done t)
@@ -639,7 +654,11 @@ https://yannherklotz.com"))
            "* %(org-contacts-template-name)
 :PROPERTIES:
 :EMAIL: %(org-contacts-template-email)
-:END:" :empty-lines 1))))
+:END:" :empty-lines 1)
+          ("m" "Meeting" entry (id "3d358b7c-e192-42f1-97ec-fd99cf8256b0")
+           "* %? :meeting:
+%^{Meeting}T
+" :empty-lines 1))))
 
 (use-package org-habit
   :after org)
@@ -765,6 +784,8 @@ https://yannherklotz.com"))
 
 (use-package notmuch
   :ensure t
+  :demand t
+  :bind (("C-x m" . notmuch-mua-new-mail))
   :config
   (defun ymh/notmuch-search-delete-mail (&optional beg end)
     "Delete a message."
@@ -850,7 +871,7 @@ https://yannherklotz.com"))
 
   (setq notmuch-fcc-dirs
         '(("yann@yannherklotz.com"          . "mailbox/Sent -inbox +sent -unread +mailbox -new")
-          ("git@ymhg.org"                   . "mailbox/Sent -inbox +sent -unread +mailbox -new")
+          ("git@yannherklotz.com"                   . "mailbox/Sent -inbox +sent -unread +mailbox -new")
           ("yann.herklotz15@imperial.ac.uk" . "\"imperial/Sent Items\" -inbox +sent -unread +imperial -new")))
 
   (setq +notmuch-home-function (lambda () (notmuch-search "tag:inbox"))))
@@ -1241,6 +1262,14 @@ https://yannherklotz.com"))
   :init
   (org-super-agenda-mode 1))
 
+(use-package bbdb
+  :ensure t
+  :custom
+  (bbdb-phone-style 'none))
+
+(use-package bbdb-vcard
+  :ensure t)
+
 (setq gc-cons-threshold (* 1024 1024 10))
 
 (setq custom-file (expand-file-name "custom.el" user-emacs-directory))