dot/emacs: File organizational stuff under `brain'.

Also, the alternative to using the shared brain diary is a local diary
index, which just contains `#include' lines.  This is generally more
versatile, and lets me control the sorting better.

diff --git a/dot/emacs b/dot/emacs
index 0ec4931..8ceafea 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -185,7 +185,7 @@
 
 (or mdw-fast-startup
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
-(setq bbdb-file "~/etc/state/bbdb"
+(setq bbdb-file "~/etc/brain/bbdb"
       bbdb-north-american-phone-numbers-p nil
       bbdb/news-auto-create-p
       (lambda ()
@@ -370,10 +370,10 @@
 ;;; Calendar configuration.
 
 (setq diary-file
-      (let ((main-diary "~/etc/state/diary")
-           (private-diary "~/etc/state.private/diary.private"))
-       (if (file-exists-p private-diary)
-           private-diary
+      (let ((main-diary "~/etc/brain/diary")
+           (index "~/etc/index.diary"))
+       (if (file-exists-p index)
+           index
          main-diary)))
 
 ;; Trivial stuff for the sunrise/sunset calculations.
@@ -430,6 +430,8 @@
 ;; Org-mode agenda.
 
 (setq org-agenda-include-diary t
+      org-directory "~/etc/brain.local/"
+      org-default-notes-file (concat org-directory "local.org")
       org-tags-column -77)
 
 ;; Cosmetic stuff.