diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index 7cfdb43dc..d7a82ec22 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -155,10 +155,10 @@ :desc "Insert" "i" #'org-roam-insert :desc "Org Roam" "r" #'org-roam (:prefix ("d" . "by date") - :desc "Arbitrary date" "d" #'org-roam-date - :desc "Today" "t" #'org-roam-today - :desc "Tomorrow" "m" #'org-roam-tomorrow - :desc "Yesterday" "y" #'org-roam-yesterday)))) + :desc "Arbitrary date" "d" #'org-roam-dailies-date + :desc "Today" "t" #'org-roam-dailies-today + :desc "Tomorrow" "m" #'org-roam-dailies-tomorrow + :desc "Yesterday" "y" #'org-roam-dailies-yesterday)))) ;;; o --- open "o" nil ; we need to unbind it first as Org claims this prefix diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index e0fe4744b..83bc73ac5 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -486,10 +486,10 @@ :desc "Insert" "i" #'org-roam-insert :desc "Org Roam" "r" #'org-roam (:prefix ("d" . "by date") - :desc "Arbitrary date" "d" #'org-roam-date - :desc "Today" "t" #'org-roam-today - :desc "Tomorrow" "m" #'org-roam-tomorrow - :desc "Yesterday" "y" #'org-roam-yesterday))) + :desc "Arbitrary date" "d" #'org-roam-dailies-date + :desc "Today" "t" #'org-roam-dailies-today + :desc "Tomorrow" "m" #'org-roam-dailies-tomorrow + :desc "Yesterday" "y" #'org-roam-dailies-yesterday))) (:when (featurep! :lang org +journal) (:prefix ("j" . "journal") diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 449b6c150..40d4b053e 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -811,40 +811,18 @@ compelling reason, so..." :commands org-pdftools-export :init (after! org - (add-hook 'org-store-link-functions #'org-pdftools-store-link) - - ;; HACK `org-pdftools' hard-codes "pdftools:" for its links. We want to use - ;; a generic link so that the backend doesn't matter. These hacks are - ;; in place so that the old pdf(view|tools) links still work, but that - ;; org-pdftools will only generate pdf: links. - (org-link-set-parameters "pdf" + (org-link-set-parameters (or (bound-and-true-p org-pdftools-link-prefix) "pdf") :follow #'org-pdftools-open :complete #'org-pdftools-complete-link :store #'org-pdftools-store-link :export #'org-pdftools-export) - + (add-hook 'org-store-link-functions #'org-pdftools-store-link) (add-hook! 'org-open-link-functions (defun +org-open-old-pdf-links-fn (link) (let ((regexp "^pdf\\(?:tools\\|view\\):")) (when (string-match-p regexp link) (org-pdftools-open (replace-regexp-in-string regexp "" link)) - t)))) - - ;; TODO Perhaps PR a variable for changing the link upstream? - (defadvice! +org--use-generic-link-a (link) - :filter-return '(org-pdftools-complete-link - org-pdftools-get-link) - (replace-regexp-in-string "^pdftools:" "pdf:" link)) - - (defadvice! +org--store-generic-link-a (orig-fn &rest args) - :around #'org-pdftools-store-link - (cl-letf* ((old-store-props (symbol-function #'org-link-store-props)) - ((symbol-function #'org-link-store-props) - (lambda (&rest plist) - (plist-put! plist :type "pdf") - (plist-put! plist :link (+org--use-generic-link-a (plist-get plist :link))) - (apply old-store-props plist)))) - (apply orig-fn args))))) + t)))))) (use-package! evil-org diff --git a/modules/lang/org/contrib/roam.el b/modules/lang/org/contrib/roam.el index eea56ec8b..a5dcc3e83 100644 --- a/modules/lang/org/contrib/roam.el +++ b/modules/lang/org/contrib/roam.el @@ -5,14 +5,14 @@ :hook (org-load . org-roam-mode) :hook (org-roam-backlinks-mode . turn-on-visual-line-mode) :commands (org-roam-buffer-toggle-display - org-roam-date org-roam-find-file org-roam-graph-show org-roam-insert org-roam-switch-to-buffer - org-roam-today - org-roam-tomorrow - org-roam-yesterday) + org-roam-dailies-date + org-roam-dailies-today + org-roam-dailies-tomorrow + org-roam-dailies-yesterday) :preface ;; Set this to nil so we can later detect whether the user has set a custom ;; directory for it, and default to `org-directory' if they haven't. @@ -28,10 +28,10 @@ "i" #'org-roam-insert "m" #'org-roam (:prefix ("d" . "by date") - :desc "Arbitrary date" "d" #'org-roam-date - :desc "Today" "t" #'org-roam-today - :desc "Tomorrow" "m" #'org-roam-tomorrow - :desc "Yesterday" "y" #'org-roam-yesterday)) + :desc "Arbitrary date" "d" #'org-roam-dailies-date + :desc "Today" "t" #'org-roam-dailies-today + :desc "Tomorrow" "m" #'org-roam-dailies-tomorrow + :desc "Yesterday" "y" #'org-roam-dailies-yesterday)) :config (setq org-roam-directory (expand-file-name (or org-roam-directory "") org-directory) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index f63159d6a..7f6db9d68 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -34,7 +34,7 @@ (package! avy) (package! htmlize :pin "86f22f211e") -(package! org-superstar :pin "4897c333a8") +(package! org-superstar :pin "09ddc28383") (package! org-yt :recipe (:host github :repo "TobiasZawada/org-yt") :pin "40cc1ac76d") @@ -47,9 +47,9 @@ :recipe (:host github :repo "hlissner/evil-org-mode") :pin "4d44e9bbdc")) (when (featurep! :tools pdf) - (package! org-pdftools :pin "4156b677fc")) + (package! org-pdftools :pin "22d9a367ab")) (when (featurep! :tools magit) - (package! orgit :pin "0242088fb2")) + (package! orgit :pin "e147f05577")) (when (featurep! +brain) (package! org-brain :pin "3630eb88a3")) (when (featurep! +dragndrop) @@ -72,7 +72,7 @@ (package! org-tree-slide :pin "7bf09a02bd") (package! org-re-reveal :pin "61549f4c00")) (when (featurep! +roam) - (package! org-roam :pin "e33c144298") + (package! org-roam :pin "6175739b33") (when (featurep! :completion company) (package! company-org-roam :pin "0913d86f16")))