update org capture templates and keys

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index d6a21fa86711e604b52b459a9eec10b79495c03e..03de60c7bf743e750196016e0024bb851a0b19fb 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -1519,37 +1519,37 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 #+END_SRC
 ** Capture Templates
 #+BEGIN_SRC emacs-lisp
-    (setq org-capture-templates  ;; mail-specific note template, identified by "m"
-          `(("m" "Mail" entry (file "~/projects/org-notes/refile.org")
-             "* %?\n\n  Source: %u, [[%:link][%:description]]\n  %:initial")
-            ("t" "todo" entry (file "~/projects/org-notes/refile.org")
-             "* TODO %?\n  :PROPERTIES:\n  :END:\n  :LOGBOOK:\n  :END:\n%U\n%a\n" :clock-in t :clock-resume t)
-            ("r" "respond" entry (file "~/projects/org-notes/refile.org")
-             "* NEXT Respond to %:from on %:subject\nSCHEDULED: %t\n%U\n%a\n" :clock-in t :clock-resume t :immediate-finish t)
-            ("n" "note" entry (file "~/projects/org-notes/refile.org")
-             "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
-            ("s" "schedule" entry (file "~/projects/org-notes/refile.org")
-             "* %? :cal:\n%^{scheduled:}t\n%U\n%a\n" :clock-in t :clock-resume t)
-            ("j" "Journal" entry (file+datetree "~/projects/org-notes/diary.org")
-             "* %?\n%U\n" :clock-in t :clock-resume t)
-            ("w" "org-protocol" entry (file "~/projects/org-notes/refile.org")
-             "* TODO Review %c\n%U\n" :immediate-finish t)
-            ("M" "Meeting" entry (file "~/projects/org-notes/refile.org")
-             "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
-            ("S" "Seminar" entry (file "~/projects/org-notes/refile.org")
-             "* SEMINAR notes %? :SEMINAR:\n%U" :clock-in t :clock-resume t)
-            ("P" "Paper to read" entry (file+headline "~/projects/research/papers_to_read.org" "Refile")
-             "* TODO Get/Read %? \n%U" :clock-in t :clock-resume t)
-            ("p" "Phone call" entry (file "~/projects/org-notes/refile.org")
-             "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
-             ("J" "job" entry (file+olp "~/projects/org-notes/notes.org"
-                                         "Jobs"
-                                         ,(format-time-string "Positions %Y"))
-             "* TODO Apply for %? :job:\nSCHEDULED: <%<%Y-%m-%d>>\n%U\n%x\n" :clock-in t :clock-resume t)
-            ("h" "Habit" entry (file "~/projects/org-notes/refile.org")
-             "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"<%Y-%m-%d .+1d/3d>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n%a\n")
-            )
+  (setq org-capture-templates  ;; mail-specific note template, identified by "m"
+        `(("m" "Mail" entry (file "~/projects/org-notes/refile.org")
+           "* %?\n\n  Source: %u, [[%:link][%:description]]\n  %:initial")
+          ("t" "todo" entry (file "~/projects/org-notes/refile.org")
+           "* TODO %?\n  :PROPERTIES:\n  :END:\n  :LOGBOOK:\n  :END:\n%U\n%a\n" :clock-in t :clock-resume t)
+          ("r" "respond" entry (file "~/projects/org-notes/refile.org")
+           "* NEXT Respond to %:from on %:subject\nSCHEDULED: %t\n%U\n%a\n" :clock-in t :clock-resume t :immediate-finish t)
+          ("n" "note" entry (file "~/projects/org-notes/refile.org")
+           "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
+          ("s" "schedule" entry (file "~/projects/org-notes/refile.org")
+           "* %? :cal:\n%^{scheduled:}t\n%U\n%a\n" :clock-in t :clock-resume t)
+          ("j" "Journal" entry (file+datetree "~/projects/org-notes/diary.org")
+           "* %?\n%U\n" :clock-in t :clock-resume t)
+          ("w" "org-protocol" entry (file "~/projects/org-notes/refile.org")
+           "* TODO Review %c\n%U\n" :immediate-finish t)
+          ("M" "Meeting" entry (file "~/projects/org-notes/refile.org")
+           "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
+          ("S" "Seminar" entry (file "~/projects/org-notes/refile.org")
+           "* SEMINAR notes %? :SEMINAR:\n%U" :clock-in t :clock-resume t)
+          ("P" "Paper to read" entry (file+headline "~/projects/research/papers_to_read.org" "Refile")
+           "* TODO Get/Read %? \n%U" :clock-in t :clock-resume t)
+          ("p" "Phone call" entry (file "~/projects/org-notes/refile.org")
+           "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
+           ("J" "job" entry (file+olp "~/projects/org-notes/notes.org"
+                                       "Jobs"
+                                       ,(format-time-string "Positions %Y"))
+           "* TODO Apply for %? :job:\nSCHEDULED: <%<%Y-%m-%d>>\n%U\n%x\n" :clock-in t :clock-resume t)
+          ("h" "Habit" entry (file "~/projects/org-notes/refile.org")
+           "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"<%Y-%m-%d .+1d/3d>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n%a\n")
           )
+        )
 
   ;; Remove empty LOGBOOK drawers on clock out
   (defun bh/remove-empty-drawer-on-clock-out ()
@@ -1583,7 +1583,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
           ("<S-f5>" . bh/widen)
           ("<f7>" . bh/set-truncate-lines)
           ("<f8>" . org-cycle-agenda-files)
-          ("<f9> <f9>" . bh/show-org-agenda)
+          ("<f9> <f9>" . org-agenda)
           ("<f9> b" . bbdb)
           ("<f9> c" . calendar)
           ("<f9> f" . boxquote-insert-file)
@@ -1591,8 +1591,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
           ("<f9> n" . bh/toggle-next-task-display)
           ("<f9> w" . widen)
 
-          ("<f9> o" . bh/make-org-scratch)
-
           ("<f9> r" . boxquote-region)
           ("<f9> s" . bh/switch-to-scratch)
 
@@ -1632,11 +1630,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
       (set-window-start (selected-window)
                         (window-start (selected-window)))))
 
-  (defun bh/make-org-scratch ()
-    (interactive)
-    (find-file "/tmp/publish/scratch.org")
-    (gnus-make-directory "/tmp/publish"))
-
   (defun bh/switch-to-scratch ()
     (interactive)
     (switch-to-buffer "*scratch*"))