emacs: simplify org-capture

2 files changed, 11 insertions, 16 deletions

diff --git a/.emacs.local.d/modes/org.el b/.emacs.local.d/modes/org.el
index 7d9ef94..e278230 100644
--- a/.emacs.local.d/modes/org.el
+++ b/.emacs.local.d/modes/org.el
@@ -61,25 +61,20 @@
 ;; I use C-c c to start capture mode
 (global-set-key (kbd "C-c c") 'org-capture)
 
-;; Capture templates for: TODO tasks, Notes, appointments, phone calls, meetings, and org-protocol
 (setq org-capture-templates
-      (quote (("t" "todo" entry (file my-org-refile-path)
-               "* TODO %?\n%U\n%a\n" :clock-in t :clock-resume t)
-              ("r" "respond" entry (file my-org-refile-path)
-               "* 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 my-org-refile-path)
-               "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
-              ("w" "org-protocol" entry (file my-org-refile-path)
-               "* TODO Review %c\n%U\n" :immediate-finish t)
-              ("m" "Meeting" entry (file my-org-refile-path)
-               "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
-              ("p" "Phone call" entry (file my-org-refile-path)
-               "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
-              ("h" "Habit" entry (file my-org-refile-path)
-               "* 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"))))
+      (quote
+       (
+        ("w" "Todo" entry (file+headline my-org-refile-path "Tasks")
+         "* TODO "
+         :empty-lines 1)
+        ("m" "Mail" entry (file+headline my-org-refile-path "Incoming")
+         "* TODO %^{Title}\n\n  Source: %u, %c\n\n  %i"
+         :empty-lines 1)
+        )))
 
 (add-hook 'org-capture-mode-hook 'delete-other-windows)
 (setq my-org-protocol-flag nil)
+
 (defadvice org-capture-finalize (after delete-frame-at-end activate)
   "Delete frame at remember finalization"
   (progn (if my-org-protocol-flag (delete-frame))
diff --git a/bin/mutt-remember-mail b/bin/mutt-remember-mail
index e9898f5..8fafc3d 100755
--- a/bin/mutt-remember-mail
+++ b/bin/mutt-remember-mail
@@ -6,7 +6,7 @@
 # License: GNU General Public License (GPL), version 3 or above
 #
 # Example of mutt macro to invoke this hitting ESC-R (to be put in ~/.muttrc):
-#  macro index \eR "|~/bin/remember-mail\n"
+#  macro index \eR "|~/bin/mutt-remember-mail\n"
 
 use strict;
 use Mail::Internet;