commit a6bb1e1bfa5d1050213c223adc92d7da5290b103
parent f58e8363956a94db414cfae349698135097b01b6
Author: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 16 Mar 2020 17:39:37 +0100
Merge commit '12af06c9d5bf1948f2975dbfbd4ea385472ceadd'
Diffstat:
2 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/tmp/emacs-config/config/setup-org.el b/tmp/emacs-config/config/setup-org.el
@@ -225,16 +225,6 @@
;; OrgCaptureOldTemplate
(add-to-list 'org-capture-templates
- `("t" "Task Entry" entry
- (file ,org-default-inbox-file)
- "* %?\n:PROPERTIES:\n:CREATED:%U\n:END:\n\n%i\n\nFrom: %a"
- :empty-lines 1))
- (add-to-list 'org-capture-templates
- `("r" "PR Review" entry
- (file ,org-default-inbox-file)
- "* TODO review gh:%^{issue} :review:\n:PROPERTIES:\n:CREATED:%U\n:END:\n\n%i\n%?\nFrom: %a"
- :empty-lines 1))
- (add-to-list 'org-capture-templates
`("l" "Link" entry
(file ,org-default-inbox-file)
"* %a\n%U\n%?\n%i"
@@ -245,17 +235,39 @@
"* %?\n\n %i\n\n See: %a" :empty-lines 1))
;; -OrgCaptureOldTemplate
+ ;; OrgCaptureTask
+ (add-to-list 'org-capture-templates
+ `("t" "Tasks"))
+ (add-to-list 'org-capture-templates
+ `("tt" "New task" entry
+ (file ,org-default-inbox-file)
+ "* %?\n:PROPERTIES:\n:CREATED:%U\n:END:\n\n%i\n\nFrom: %a"
+ :empty-lines 1))
+ (add-to-list 'org-capture-templates
+ `("tr" "PR Review" entry
+ (file ,org-default-inbox-file)
+ "* TODO review gh:%^{issue} :review:\n:PROPERTIES:\n:CREATED:%U\n:END:\n\n%i\n%?\nFrom: %a"
+ :empty-lines 1))
+ ;; -OrgCaptureTask
+
;; OrgCaptureJournal
(add-to-list 'org-capture-templates
- `("j" "Journal entry" entry
+ `("j" "Journal"))
+ ;; -OrgCaptureJournal
+
+ ;; OrgCaptureJournalEntry
+ (add-to-list 'org-capture-templates
+ `("j" "Journal entry"))
+ (add-to-list 'org-capture-templates
+ `("jj" "Journal entry" entry
(file+datetree ,org-default-journal-file)
(file ,(concat user-emacs-directory "/etc/orgmode/journal.org"))
:empty-lines 1 :clock-in t :clock-resume t))
- ;; -OrgCaptureJournal
+ ;; -OrgCaptureJournalEntry
;; OrgCaptureWorklog
(add-to-list 'org-capture-templates
- `("w" "Worklog (journal) entry" entry
+ `("jw" "Worklog (journal) entry" entry
(file+datetree ,org-default-journal-file)
(file ,(concat user-emacs-directory "/etc/orgmode/worklog.org"))
:unnarrowed t))
@@ -263,7 +275,7 @@
;; OrgCaptureWeekly
(add-to-list 'org-capture-templates
- `("e" "Weekly review" entry
+ `("je" "Weekly review" entry
(file+datetree,org-default-journal-file)
(file ,(concat user-emacs-directory "/etc/orgmode/weekly.org"))
:clock-in t :clock-resume t :unnarrowed t))
diff --git a/tmp/emacs-config/emacs.org b/tmp/emacs-config/emacs.org
@@ -514,7 +514,7 @@
database and other /applications/ that runs in Emacs. Most of those should be the "killer
apps" of the Emacs ecosystem.
-** TODO Org-mode (personal information manager)
+** Org-mode (personal information manager)
:PROPERTIES:
:header-args: :tangle config/setup-org.el
:CUSTOM_ID: h:c8fd2624-6c91-4b89-9645-4261ca85d584
@@ -686,7 +686,7 @@
/The =ensure org-plus-contrib= is there to make sure I am loading the =org= module from my
nix configuration and not the built-in =org= module (that might lag in terms of version)/
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgMain" :range-end "-OrgMain" :lines "25-89"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgMain" :range-end "-OrgMain" :lines "25-90"
I've set-up an =org-mode= hook to add few modes to the default setup.
- I am really annoyed by trailing white-space so I want them to be shown
@@ -695,15 +695,15 @@
+ I turn on =auto-revert-mode= so that the buffer is always up-to-date.
+ I like to have header indented, so I'm enabling =org-indent-mode=.
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgHook" :range-end "-OrgHook" :lines "92-101"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgHook" :range-end "-OrgHook" :lines "93-102"
Let's also use =org-id=…
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgId" :range-end "-OrgId" :lines "104-133"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgId" :range-end "-OrgId" :lines "105-134"
… and =org-crypt= (for encrypted =org-mode= files).
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCrypt" :range-end "-OrgCrypt" :lines "136-141"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCrypt" :range-end "-OrgCrypt" :lines "137-142"
*** TODO Agenda
:PROPERTIES:
@@ -730,11 +730,11 @@
agenda views. This allows to group things and overall set-up the agenda view I want. This
agenda view uses the =n= key.
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgAgenda" :range-end "-OrgAgenda" :lines "144-181"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgAgenda" :range-end "-OrgAgenda" :lines "145-182"
Let's try to get my work calendar entries in my agenda too. It is a little bit tricky 👼.
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgGcal" :range-end "-OrgGcal" :lines "184-198"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgGcal" :range-end "-OrgGcal" :lines "185-199"
*** Habits :ATTACH:
:PROPERTIES:
@@ -767,14 +767,14 @@
[[att:2020-02-29-14-41-59.png]]
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgHabit" :range-end "-OrgHabit" :lines "201-206"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgHabit" :range-end "-OrgHabit" :lines "202-207"
*** TODO Sources
:PROPERTIES:
:CUSTOM_ID: h:82c3b800-9d80-408d-b3b6-54dc15b0590c
:END:
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgSrc" :range-end "-OrgSrc" :lines "209-216"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgSrc" :range-end "-OrgSrc" :lines "210-217"
*** TODO Capture
:PROPERTIES:
@@ -791,7 +791,7 @@
options. This is very interesting when you want to group some capture template together
(like templates related to /work/, …).
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureStart" :range-end "-OrgCaptureStart" :lines "219-223"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureStart" :range-end "-OrgCaptureStart" :lines "220-224"
#+begin_src emacs-lisp
(use-package org-capture
:after org
@@ -803,39 +803,46 @@
code. The good thing is that =org-mode= is able to load the template from files too 💃.
Here is a list of my templates:
-- Default :: /I need to rework those/
+- Default :: Store a link (mainly used with =org-protocol=) and take a random note
- #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureOldTemplate" :range-end "-OrgCaptureOldTemplate" :lines "226-245"
+ #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureOldTemplate" :range-end "-OrgCaptureOldTemplate" :lines "227-236"
+
+- Tasks :: /work/ task, like reviewing a PR, or cleaning a folder.
+
+ #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureTask" :range-end "-OrgCaptureTask" :lines "239-251"
- journaling :: As I use =org-mode= for my /journal/ too, I need capture entry for
it. I currently have two types of journal entry :
+
+ #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureJournal" :range-end "-OrgCaptureJournal" :lines "254-256"
+
+ standard: one title and some text
#+INCLUDE: "etc/orgmode/journal.org" src org
- #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureJournal" :range-end "-OrgCaptureJournal" :lines "248-253"
+ #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureJournalEntry" :range-end "-OrgCaptureJournalEntry" :lines "259-266"
+ worklog: related to work, to be able to say what I did, what I wanted to do, problems,
… during the daily
#+INCLUDE: "etc/orgmode/worklog.org" src org
- #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureWorklog" :range-end "-OrgCaptureWorklog" :lines "256-261"
+ #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureWorklog" :range-end "-OrgCaptureWorklog" :lines "269-274"
- weekly review :: each and every week, I am going through this item to make my review of
the week.
#+INCLUDE: "etc/orgmode/weekly.org" src org
- #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureWeekly" :range-end "-OrgCaptureWeekly" :lines "264-269"
+ #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureWeekly" :range-end "-OrgCaptureWeekly" :lines "277-282"
- blog posts ::
- #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureBlog" :range-end "-OrgCaptureBlog" :lines "272-282"
+ #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureBlog" :range-end "-OrgCaptureBlog" :lines "285-295"
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureEnd" :range-end "-OrgCaptureEnd" :lines "285-286"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureEnd" :range-end "-OrgCaptureEnd" :lines "298-299"
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgProtocol" :range-end "-OrgProtocol" :lines "289-291"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgProtocol" :range-end "-OrgProtocol" :lines "302-304"
*** Clocking
:PROPERTIES:
@@ -855,32 +862,32 @@
In addition to that workflow, I want to switch the state of the task to =STARTED= when I
am clocking-in, if it's not already =STARTED=.
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgClock" :range-end "-OrgClock" :lines "294-387"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgClock" :range-end "-OrgClock" :lines "307-400"
*** TODO Links
:PROPERTIES:
:CUSTOM_ID: h:afc81fbb-f7a0-401c-8b56-19f51edebd88
:END:
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgAttach" :range-end "-OrgAttach" :lines "390-393"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgAttach" :range-end "-OrgAttach" :lines "403-406"
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgLinks" :range-end "-OrgLinks" :lines "396-421"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgLinks" :range-end "-OrgLinks" :lines "409-434"
*** TODO Litterate programming
:PROPERTIES:
:CUSTOM_ID: h:b5f6beba-6195-4ff0-a194-502ac2a9e3da
:END:
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgBabel" :range-end "-OrgBabel" :lines "424-432"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgBabel" :range-end "-OrgBabel" :lines "437-445"
*** TODO Exporting
:PROPERTIES:
:CUSTOM_ID: h:afad00e0-367c-4c7b-b191-e3ed72be754b
:END:
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgExportConstants" :range-end "-OrgExportConstants" :lines "435-437"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgExportConstants" :range-end "-OrgExportConstants" :lines "448-450"
-#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgExportCfg" :range-end "-OrgExportCfg" :lines "440-451"
+#+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgExportCfg" :range-end "-OrgExportCfg" :lines "453-464"
** TODO Email and newsgroup
:PROPERTIES:
