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 e290d3fa56246f620aea602f9ecf6c1cd3a4c307..bb3ff9c0ea26fef57ae014ca44bba30854b8d237 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"
@@ -125,6 +125,8 @@
          "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
         ("p" "Phone call" entry (file "~/projects/notes/refile.org")
          "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
+        ("J" "job" entry (file "~/projects/notes/refile.org")
+         "* TODO Apply for %a%? :job:\n%U\n" :clock-in t :clock-resume t)
         ("h" "Habit" entry (file "~/projects/notes/refile.org")
          "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"<%Y-%m-%d %a .+1d/3d>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n")
         )
@@ -163,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)
 
@@ -324,6 +332,9 @@ do not already have one."
 (defadvice org-protocol-capture (before set-org-protocol-flag activate)
   (setq my-org-protocol-flag t))
 
+(defadvice org-insert-todo-heading (after dla/create-id activate)
+  (org-id-get-create)
+  )
 
 ;; org modules
 (add-to-list 'org-modules 'org-habit)
@@ -405,14 +416,17 @@ 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
  'org-babel-load-languages
  '((emacs-lisp . t )
    (R . t)
-   (latex . t)))
+   (latex . t)
+   (ditaa . t)
+   ))
 ;; org-babel-by-backend
 (defmacro org-babel-by-backend (&rest body)
    `(case (if (boundp 'backend) 
@@ -454,6 +468,18 @@ Maildir, or by Message-ID."
                ("\\paragraph{%s}" . "\\paragraph*{%s}")
                ("\\subparagraph{%s}" . "\\subparagraph*{%s}")))
 
+(add-to-list 'org-latex-classes
+             '("beamer"
+               "\\documentclass[ignorenonframetext]{beamer}
+[NO-DEFAULT-PACKAGES]
+[PACKAGES]
+[EXTRA]"
+               ("\\section{%s}" . "\\section*{%s}")
+               ("\\subsection{%s}" . "\\subsection*{%s}")
+               ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+               ("\\paragraph{%s}" . "\\paragraph*{%s}")
+               ("\\subparagraph{%s}" . "\\subparagraph*{%s}")))
+
 (add-to-list 'org-latex-classes
              '("membook"
                "\\documentclass[11pt,oneside]{memoir}\n"
@@ -515,6 +541,9 @@ Maildir, or by Message-ID."
       (setq ad-return-value contents)
     ad-do-it))
 
+;; keep latex logfiles
+
+(setq org-latex-remove-logfiles nil)
 
 ;; helper functions
 (defun bh/is-project-p ()