summaryrefslogtreecommitdiff
path: root/emacs/.doom.d
diff options
context:
space:
mode:
authorKjetil Orbekk <kj@orbekk.com>2022-03-15 09:43:28 -0400
committerKjetil Orbekk <kj@orbekk.com>2022-05-12 10:19:56 -0400
commit7f024167db5cf53c13fa705ba383715caf94f72f (patch)
tree226f55c5c6a09ed5d37b50296537cbc68aa6b71d /emacs/.doom.d
parentffa57e9998f5de86b732a8c305df2096a3a0b099 (diff)
config
Diffstat (limited to 'emacs/.doom.d')
-rw-r--r--emacs/.doom.d/config.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el
index 163b2c7..0aeb010 100644
--- a/emacs/.doom.d/config.el
+++ b/emacs/.doom.d/config.el
@@ -241,6 +241,7 @@
(setq org-capture-templates
`(("g" "Go to current journal entry" plain (function kj/org-journal-find-location)
"%i%?" :jump-to-captured t :immediate-finish t)
+<<<<<<< HEAD
("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location)
"** TODO %?\n%i\n%a")
("w" "Log bodyweight" table-line
@@ -248,6 +249,13 @@
"Body weight log")
"| %t | %^{Weight} | |"
:prepend t :immediate-finish t)))
+||||||| parent of e40f80f (config)
+ ("t" "Create a TODO in current journal entry" plain (function kj/org-journal-narrowed-location)
+ "** TODO %?\n%i\n%a")))
+=======
+ ("t" "Create a TODO" entry (file+headline "~/org/roam/tasks.org" "Inbox")
+ "** TODO %?\n%i\n%a")))
+>>>>>>> e40f80f (config)
(defun kj/find-agenda-files-containing-tag (tag)
(setq org-agenda-archives-mode nil)