Emacs

1 files changed, 11 insertions, 3 deletions

diff --git a/emacs/.emacs b/emacs/.emacs
index a095f54..5204914 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -7,7 +7,7 @@
 (mapcar (lambda (p)
        (unless (package-installed-p p)
 	 (package-install p))
-       ) (list 'evil 'haskell-mode))
+       ) (list 'evil 'haskell-mode 'bbdb))
 
 (setq evil-want-C-u-scroll t)
 (require 'evil)
@@ -29,15 +29,23 @@
 (setq backup-directory-alist '(("." . "~/.emacs_savefiles")))
 
 (setq indent-tabs-mode nil)
+
 (tool-bar-mode -1)
 (toggle-scroll-bar -1)
 
-(setq org-agenda-files (list "~/Common/org/todo.org"))
+(setq org-agenda-files (list "~/Common/org"))
 
 (add-hook 'org-mode-hook
   (lambda ()
     (evil-local-set-key 'normal (kbd "<SPC>") 'org-cycle)))
 
+;; Contact book
+(setq bbdb-file "~/Common/bbdb")
+(require 'bbdb)
+(bbdb-initialize 'gnus 'message)
+
+(setq org-icalendar-combined-agenda-file "org.ics")
+
 ;; Load email configuration
 (defun load-if-exists (file)
   (if (file-exists-p file) (load file) nil))
@@ -50,7 +58,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-enabled-themes '(tango-dark))
- '(package-selected-packages '(haskell-mode evil)))
+ '(package-selected-packages '(bbdb haskell-mode evil)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.