Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/lib

[lib.git] / emacs_el / configuration / org-mode-configuration.el

diff --git a/emacs_el/configuration/org-mode-configuration.el b/emacs_el/configuration/org-mode-configuration.el
index 63fe923126177d056874c226a7369229ed29e26c..854b8ffb86f6ba105730d07ca1aaa15d9286d1bb 100644 (file)
--- a/emacs_el/configuration/org-mode-configuration.el
+++ b/emacs_el/configuration/org-mode-configuration.el
@@ -103,7 +103,7 @@
              "~/projects/fh/fh.org")))
 
 (setq org-global-properties '(("Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00")))
-(setq org-columns-default-format "%40ITEM(Task) %TAGS %PRIORITY %TODO %13SCHEDULED %13DEADLINE %6Effort{:}  %CLOCKSUM")
+(setq org-columns-default-format "%40ITEM(Task) %6Effort{:} %CLOCKSUM %PRIORITY %TODO %13SCHEDULED %13DEADLINE %TAGS")
 
 (setq org-default-notes-file "~/projects/notes/notes.org")
 (setq org-capture-templates  ;; mail-specific note template, identified by "m"
@@ -165,6 +165,12 @@
 (global-set-key (kbd "<f9> n") 'bh/toggle-next-task-display)
 (global-set-key (kbd "<f9> w") 'widen)
 
+; change the outline mode prefix from C-c @ to C-c C-2
+(setq outline-minor-mode-prefix "C-c C-2")
+(add-hook 'outline-minor-mode-hook
+          (lambda () (local-set-key (kbd "C-c C-2")
+                                    outline-mode-prefix-map)))
+
 (global-set-key (kbd "<f9> I") 'bh/punch-in)
 (global-set-key (kbd "<f9> O") 'bh/punch-out)
 
@@ -410,7 +416,8 @@ Maildir, or by Message-ID."
 ;; org mode ical export
 (setq org-icalendar-timezone "America/Los_Angeles")
 (setq org-icalendar-use-scheduled '(todo-start event-if-todo))
-(setq org-icalendar-store-UID t)
+;; we already add the id manually
+;; (setq org-icalendar-store-UID t)
 
 ;; org babel support
 (org-babel-do-load-languages