1 files changed, 10 insertions, 49 deletions
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index 12ca4f2..15e5d03 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -105,10 +105,15 @@
 
 ;; capture
 (setq org-capture-templates
- '(("t" "TODO" entry (file+headline org-default-notes-file "Tasks")
- "* TODO %?\nCaptured on %U")
- ("j" "Journal" entry (file+datetree org-default-notes-file)
- "* %?\nCaptured on %U")))
+ `(("t" "TODO" entry
+ (file+headline org-default-notes-file
+ ,(format-time-string "%Y-%m-%d %A"))
+ "* TODO %?\nCaptured on %U")
+ ("j" "Journal"
+ entry
+ (file+headline org-default-notes-file
+ ,(format-time-string "%Y-%m-%d %A"))
+ "* %?\nCaptured on %U")))
 
 ;; clock
 (setq org-clock-persist 'history)
@@ -128,51 +133,6 @@
 '((shell . t)
 (plantuml . t))))
 
-;; roam
-(when (gx/maybe-require-package 'org-roam)
- (autoload #'org-roam-node-find "org-roam-node" nil t)
- (autoload #'org-roam-dailies-goto-today "org-roam-dailies" nil t)
- (add-hook 'org-mode-hook #'org-roam-db-autosync-mode))
-
-(with-eval-after-load 'org
- (define-key org-mode-map (kbd "C-c n i") #'org-roam-node-insert))
-(with-eval-after-load 'evil
- (evil-define-key 'normal 'global
- (kbd "<leader>fn") 'org-roam-node-find
- (kbd "<leader>cn") 'org-roam-dailies-goto-today)
- (evil-define-key 'normal org-mode-map
- (kbd "<leader><SPC>b") 'org-roam-buffer-toggle
- (kbd "<leader>in") 'org-roam-node-insert
- (kbd "[d") 'org-roam-dailies-goto-previous-note
- (kbd "]d") 'org-roam-dailies-goto-next-note))
-(setq org-roam-directory (file-truename "~/words"))
-(setq org-roam-db-gc-threshold most-positive-fixnum)
-(setq org-roam-dailies-directory "journals/")
-(setq org-roam-dailies-capture-templates
- '(("d" "daily" entry
- "* %?"
- :target (file+head "%<%Y/%Y-%m-%d>.org"
- "#+title: %<%a %d %b %Y>\n"))
- ("w" "weekly" entry
- "* %?"
- :target (file+head "%<%Y/week%V>.org"
- "#+title: Week %<%V %Y>\n"))
- ("m" "monthly" entry
- "* %?"
- :target (file+head "%<%Y/%Y-%m>.org"
- "#+title: %<%B %Y>\n"))
- ("y" "yearly" entry
- "* %?"
- :target (file+head "%<%Y/%Y>.org"
- "#+title: %<%Y>\n"))))
-
-;; roam ui
-(gx/maybe-require-package 'org-roam-ui)
-(setq org-roam-ui-follow t
- org-roam-ui-sync-theme t
- org-roam-ui-update-on-save t
- org-roam-ui-open-at-start t)
-
 ;; alert
 (when (gx/maybe-require-package 'org-alert)
 (autoload 'org-alert-enable "org-alert"))
@@ -182,5 +142,6 @@
 (setq alert-default-style 'osx-notifier))
 (setq org-alert-interval 60)
 
+(require 'init-org-roam)
 (require 'init-org-agenda)
 (provide 'init-org)