mailcap tweaks

2 files changed, 19 insertions, 17 deletions

diff --git a/custom/jao-custom-email.el b/custom/jao-custom-email.el
index 37c8acb..45fda21 100644
--- a/custom/jao-custom-email.el
+++ b/custom/jao-custom-email.el
@@ -215,23 +215,6 @@
 
 (jao-sendmail-local)
 
-;;; mailcap
-(use-package mailcap
-  :config
-  (add-to-list 'mailcap-mime-extensions '(".JPEG" . "image/jpeg"))
-  (add-to-list 'mailcap-mime-extensions '(".JPG" . "image/jpeg"))
-
-  (defun jao-icalendar-import-buffer ()
-    (let ((icalendar-import-format "%s%u%l%d"))
-      (icalendar-import-buffer diary-file t nil))
-    (kill-buffer)
-    (message "Event imported into diary"))
-
-  :custom
-  ((mailcap-user-mime-data
-    '((jao-icalendar-import-buffer "application/ics")
-      ("viewpdf.sh %s" "application/pdf")))))
-
 ;;; multipart html renderer
 (defun jao-w3m-html-renderer (handle)
   (let ((w3m-message-silent t)
diff --git a/init.el b/init.el
index 86ab5fb..312424c 100644
--- a/init.el
+++ b/init.el
@@ -236,6 +236,25 @@
 ;;;; disk monitoring
 (use-package jao-dirmon
   :commands jao-dirmon-report)
+;;;; mailcap
+(use-package mailcap
+  :config
+  (add-to-list 'mailcap-mime-extensions '(".JPEG" . "image/jpeg"))
+  (add-to-list 'mailcap-mime-extensions '(".JPG" . "image/jpeg"))
+
+  (defun jao-icalendar-import-buffer ()
+    (let ((icalendar-import-format "%s%u%l%d"))
+      (icalendar-import-buffer diary-file t nil))
+    (kill-buffer)
+    (message "Event imported into diary"))
+
+  :custom
+  ((mailcap-user-mime-data
+    '((jao-icalendar-import-buffer "application/ics")
+      (pdf-view-mode "application/pdf" (display-graphic-p))
+      ("zathura \"%s\"" "application/pdf")
+      (image-mode "image/*" (display-graphic-p))
+      ("feh \"%s\"" "image/*")))))
 ;;; Crypto
 ;;;; PGP, EPG, passwords
 (setq epg-pinentry-mode 'loopback)