diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2022-05-13 11:07:37 -0400 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2022-05-13 11:07:37 -0400 |
commit | 798d1a520f5f6f38fadf1b8027d3131f50f5c2f1 (patch) | |
tree | 57bd48683cc2bfdbd3c0ef74068e2d594cf9f1ef /emacs/.doom.d/config.el | |
parent | 7f024167db5cf53c13fa705ba383715caf94f72f (diff) |
fix config
Diffstat (limited to 'emacs/.doom.d/config.el')
-rw-r--r-- | emacs/.doom.d/config.el | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 0aeb010..fbace34 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -241,21 +241,13 @@ (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) + ("t" "Create a TODO" entry (file+headline "~/org/roam/tasks.org" "Inbox") "** TODO %?\n%i\n%a") ("w" "Log bodyweight" table-line (file+headline ,(concat org-roam-directory "bodyweight.org") "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) |