Merge branch 'develop' into loadConditions

This commit is contained in:
Henrik Lissner 2020-04-10 23:34:57 -04:00 committed by GitHub
commit 1ed0d3555e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions

View file

@ -33,14 +33,16 @@
:desc "Tomorrow" "m" #'org-roam-tomorrow
:desc "Yesterday" "y" #'org-roam-yesterday))
:config
(unless org-roam-directory
(setq org-roam-directory org-directory))
(setq org-roam-completion-system
(setq org-roam-directory (expand-file-name (or org-roam-directory "")
org-directory)
org-roam-verbose nil ; https://youtu.be/fn4jIlFwuLU
org-roam-completion-system
(cond ((featurep! :completion helm) 'helm)
((featurep! :completion ivy) 'ivy)
((featurep! :completion ido) 'ido)
('default))))
;; Since the org module lazy loads org-protocol (waits until an org URL is
;; detected), we can safely chain `org-roam-protocol' to it.
(use-package! org-roam-protocol