From 251e9c02446572e8f837b7a4c4c611f6a15d0393 Mon Sep 17 00:00:00 2001
From: Patrick Elliott <patrick.d.elliott@gmail.com>
Date: Wed, 10 Oct 2018 22:00:30 +0200
Subject: [PATCH 1/2] When :tools pdf is enabled, open org links to pdfs with
 pdf-view-mode

---
 modules/lang/org/config.el   | 6 ++++++
 modules/lang/org/packages.el | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index eb98fe121..5b0504563 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -52,6 +52,12 @@
     :after org-agenda
     :config (evil-org-agenda-set-keys)))
 
+(def-package! org-pdfview
+  :when (featurep! :tools pdf)
+  :config
+  (delete '("\\.pdf\\'" . default) org-file-apps)
+  (add-to-list 'org-file-apps '("\\.pdf\\'" . (lambda (file link) (org-pdfview-open link)))) ;; org links to pdf files are opened in pdf-view-mode
+  (add-to-list 'org-file-apps '("\\.pdf::\\([[:digit:]]+\\)\\'" . (lambda (file link) (org-pdfview-open link))))) ;; support for links to specific pages
 
 ;;
 ;; Bootstrap
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index 2bb2260fa..c3d5abedd 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -11,6 +11,9 @@
 (when (featurep! :feature evil)
   (package! evil-org))
 
+(when (featurep! :tools pdf)
+  (package! org-pdfview))
+
 (when (featurep! +attach)
   (package! org-download))
 

From b1f249afaba498db114419b8a84d851856a3f8a2 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <accounts@v0.io>
Date: Mon, 15 Oct 2018 00:14:27 -0400
Subject: [PATCH 2/2] lang/org: lazyload & refactor org-pdfview

---
 modules/lang/org/config.el | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 5b0504563..aad01f167 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -54,10 +54,15 @@
 
 (def-package! org-pdfview
   :when (featurep! :tools pdf)
-  :config
-  (delete '("\\.pdf\\'" . default) org-file-apps)
-  (add-to-list 'org-file-apps '("\\.pdf\\'" . (lambda (file link) (org-pdfview-open link)))) ;; org links to pdf files are opened in pdf-view-mode
-  (add-to-list 'org-file-apps '("\\.pdf::\\([[:digit:]]+\\)\\'" . (lambda (file link) (org-pdfview-open link))))) ;; support for links to specific pages
+  :commands (org-pdfview-open)
+  :init
+  (after! org
+    (delete '("\\.pdf\\'" . default) org-file-apps)
+    ;; org links to pdf files are opened in pdf-view-mode
+    (add-to-list 'org-file-apps '("\\.pdf\\'" . (lambda (_file link) (org-pdfview-open link)))) 
+    ;; support for links to specific pages
+    (add-to-list 'org-file-apps '("\\.pdf::\\([[:digit:]]+\\)\\'" . (lambda (_file link) (org-pdfview-open link)))))) 
+
 
 ;;
 ;; Bootstrap