emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump :lang org

Browse source 
fuxialexander/org-pdftools@4156b67 -> fuxialexander/org-pdftools@67964a5
integral-dw/org-superstar-mode@4897c33 -> integral-dw/org-superstar-mode@09ddc28
jethrokuan/org-roam@e33c144 -> jethrokuan/org-roam@6175739
magit/orgit@0242088 -> magit/orgit@7d6afa5
This commit is contained in:
Henrik Lissner 2020-04-17 14:05:15 -04:00
parent 9af22a9322
commit 5502013906
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
5 changed files with 23 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/config/default/+emacs-bindings.el
View file

@ -155,10 +155,10 @@
:desc "Insert" "i" #'org-roam-insert :desc "Insert" "i" #'org-roam-insert
:desc "Org Roam" "r" #'org-roam :desc "Org Roam" "r" #'org-roam
(:prefix ("d" . "by date") (:prefix ("d" . "by date")
:desc "Arbitrary date" "d" #'org-roam-date :desc "Arbitrary date" "d" #'org-roam-dailies-date
:desc "Today" "t" #'org-roam-today :desc "Today" "t" #'org-roam-dailies-today
:desc "Tomorrow" "m" #'org-roam-tomorrow :desc "Tomorrow" "m" #'org-roam-dailies-tomorrow
:desc "Yesterday" "y" #'org-roam-yesterday)))) :desc "Yesterday" "y" #'org-roam-dailies-yesterday))))
;;; <leader> o --- open ;;; <leader> o --- open
"o" nil ; we need to unbind it first as Org claims this prefix "o" nil ; we need to unbind it first as Org claims this prefix

8
modules/config/default/+evil-bindings.el
View file

@ -486,10 +486,10 @@
:desc "Insert" "i" #'org-roam-insert :desc "Insert" "i" #'org-roam-insert
:desc "Org Roam" "r" #'org-roam :desc "Org Roam" "r" #'org-roam
(:prefix ("d" . "by date") (:prefix ("d" . "by date")
:desc "Arbitrary date" "d" #'org-roam-date :desc "Arbitrary date" "d" #'org-roam-dailies-date
:desc "Today" "t" #'org-roam-today :desc "Today" "t" #'org-roam-dailies-today
:desc "Tomorrow" "m" #'org-roam-tomorrow :desc "Tomorrow" "m" #'org-roam-dailies-tomorrow
:desc "Yesterday" "y" #'org-roam-yesterday))) :desc "Yesterday" "y" #'org-roam-dailies-yesterday)))
(:when (featurep! :lang org +journal) (:when (featurep! :lang org +journal)
(:prefix ("j" . "journal") (:prefix ("j" . "journal")

28
modules/lang/org/config.el
View file

@ -811,40 +811,18 @@ compelling reason, so..."
:commands org-pdftools-export :commands org-pdftools-export
:init :init
(after! org (after! org
(add-hook 'org-store-link-functions #'org-pdftools-store-link) (org-link-set-parameters (or (bound-and-true-p org-pdftools-link-prefix) "pdf")
;; 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"
:follow #'org-pdftools-open :follow #'org-pdftools-open
:complete #'org-pdftools-complete-link :complete #'org-pdftools-complete-link
:store #'org-pdftools-store-link :store #'org-pdftools-store-link
:export #'org-pdftools-export) :export #'org-pdftools-export)
(add-hook 'org-store-link-functions #'org-pdftools-store-link)
(add-hook! 'org-open-link-functions (add-hook! 'org-open-link-functions
(defun +org-open-old-pdf-links-fn (link) (defun +org-open-old-pdf-links-fn (link)
(let ((regexp "^pdf\\(?:tools\\|view\\):")) (let ((regexp "^pdf\\(?:tools\\|view\\):"))
(when (string-match-p regexp link) (when (string-match-p regexp link)
(org-pdftools-open (replace-regexp-in-string regexp "" link)) (org-pdftools-open (replace-regexp-in-string regexp "" link))
t)))) 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)))))
(use-package! evil-org (use-package! evil-org

16
modules/lang/org/contrib/roam.el
View file

@ -5,14 +5,14 @@
:hook (org-load . org-roam-mode) :hook (org-load . org-roam-mode)
:hook (org-roam-backlinks-mode . turn-on-visual-line-mode) :hook (org-roam-backlinks-mode . turn-on-visual-line-mode)
:commands (org-roam-buffer-toggle-display :commands (org-roam-buffer-toggle-display
org-roam-date
org-roam-find-file org-roam-find-file
org-roam-graph-show org-roam-graph-show
org-roam-insert org-roam-insert
org-roam-switch-to-buffer org-roam-switch-to-buffer
org-roam-today org-roam-dailies-date
org-roam-tomorrow org-roam-dailies-today
org-roam-yesterday) org-roam-dailies-tomorrow
org-roam-dailies-yesterday)
:preface :preface
;; Set this to nil so we can later detect whether the user has set a custom ;; 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. ;; directory for it, and default to `org-directory' if they haven't.
@ -28,10 +28,10 @@
"i" #'org-roam-insert "i" #'org-roam-insert
"m" #'org-roam "m" #'org-roam
(:prefix ("d" . "by date") (:prefix ("d" . "by date")
:desc "Arbitrary date" "d" #'org-roam-date :desc "Arbitrary date" "d" #'org-roam-dailies-date
:desc "Today" "t" #'org-roam-today :desc "Today" "t" #'org-roam-dailies-today
:desc "Tomorrow" "m" #'org-roam-tomorrow :desc "Tomorrow" "m" #'org-roam-dailies-tomorrow
:desc "Yesterday" "y" #'org-roam-yesterday)) :desc "Yesterday" "y" #'org-roam-dailies-yesterday))
:config :config
(setq org-roam-directory (expand-file-name (or org-roam-directory "") (setq org-roam-directory (expand-file-name (or org-roam-directory "")
org-directory) org-directory)

8
modules/lang/org/packages.el
View file

@ -34,7 +34,7 @@
(package! avy) (package! avy)
(package! htmlize :pin "86f22f211e") (package! htmlize :pin "86f22f211e")
(package! org-superstar :pin "4897c333a8") (package! org-superstar :pin "09ddc28383")
(package! org-yt (package! org-yt
:recipe (:host github :repo "TobiasZawada/org-yt") :recipe (:host github :repo "TobiasZawada/org-yt")
:pin "40cc1ac76d") :pin "40cc1ac76d")
@ -47,9 +47,9 @@
:recipe (:host github :repo "hlissner/evil-org-mode") :recipe (:host github :repo "hlissner/evil-org-mode")
:pin "4d44e9bbdc")) :pin "4d44e9bbdc"))
(when (featurep! :tools pdf) (when (featurep! :tools pdf)
(package! org-pdftools :pin "4156b677fc")) (package! org-pdftools :pin "22d9a367ab"))
(when (featurep! :tools magit) (when (featurep! :tools magit)
(package! orgit :pin "0242088fb2")) (package! orgit :pin "e147f05577"))
(when (featurep! +brain) (when (featurep! +brain)
(package! org-brain :pin "3630eb88a3")) (package! org-brain :pin "3630eb88a3"))
(when (featurep! +dragndrop) (when (featurep! +dragndrop)
@ -72,7 +72,7 @@
(package! org-tree-slide :pin "7bf09a02bd") (package! org-tree-slide :pin "7bf09a02bd")
(package! org-re-reveal :pin "61549f4c00")) (package! org-re-reveal :pin "61549f4c00"))
(when (featurep! +roam) (when (featurep! +roam)
(package! org-roam :pin "e33c144298") (package! org-roam :pin "6175739b33")
(when (featurep! :completion company) (when (featurep! :completion company)
(package! company-org-roam :pin "0913d86f16"))) (package! company-org-roam :pin "0913d86f16")))