linly/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflict oop

Browse Source
This commit is contained in:
Aura Farmer
2025-09-13 10:18:22 +03:00
parent 9b02482290 430e06c7fd
commit 69d798d1b8
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
private_dot_config/doom/config.el
View File

@@ -191,10 +191,10 @@
(:calendar-id "home" (:calendar-id "home"
:files: ("~/org/home.org") :files: ("~/org/home.org")
:inbox "~/org/home.org") :inbox "~/org/home.org")
(:calendar-id "studies-1" ;; (:calendar-id "studies-1"
:files: ("~/org/studies.org") ;; :files: ("~/org/studies.org")
:inbox "~/org/studies.org" ;; :inbox "~/org/studies.org"
) ;; )
;; (:calendar-id "some-day-1" ;; (:calendar-id "some-day-1"
;; :files: ("~/org/.archive/someday.org") ;; :files: ("~/org/.archive/someday.org")
;; :inbox "~/org/.archive/someday.org") ;; :inbox "~/org/.archive/someday.org")
@@ -287,6 +287,25 @@
'("l" "Someday" entry '("l" "Someday" entry
(file+headline "~/org/someday.org" "Inbox") (file+headline "~/org/someday.org" "Inbox")
"* TODO %? \n %i " :empty-lines 1) t) "* TODO %? \n %i " :empty-lines 1) t)
<<<<<<< HEAD
=======
;; (add-to-list 'org-capture-templates
;; '("s" "Studies" entry
;; (file+headline "~/org/studies.org" "Inbox")
;; "* TODO [#C] %?\n %i" :empty-lines 1) t)
;; (add-to-list 'org-capture-templates
;; '("S" "Lecture" entry
;; (file+headline "~/org/studies.org" "Schedule")
;; "* %^{Subject} %^{Type|Lecture|Section}
;; :PROPERTIES:
;; :WILD_NOTIFY_BEFORE: %^{Reminders}
;; :LOCATION: %^{Location}
;; :END:
;; %^{Time}T"
;; :empty-lines 1) t)
;; add this for reminder stuff
;; :PROPERTIES:\n\n:WILD_NOTIFY_BEFORE: %^{Reminders}\n:END:\n
>>>>>>> 430e06c7fd9cb312399d98d25820a5d3940e7ce7
(add-to-list 'org-capture-templates (add-to-list 'org-capture-templates
'("W" "Event" entry '("W" "Event" entry
(file+headline "~/org/work.org" "Schedule") (file+headline "~/org/work.org" "Schedule")