Purge org-contacts

... sort of

2 files changed, 36 insertions, 37 deletions

@@ -177,42 +177,41 @@
     (add-to-list '+browse-url-secondary-browser-regexps
                  (replace-regexp-in-string "\\." "\\\\." domain)))
   ;; Set up URL handlers.
-  (with-eval-after-load 'org-contacts
-    (require 'chd)
-    (+browse-url-set-handlers
-     (list
-      (cons (rx                           ; images
-             "." (or "jpeg" "jpg" "png" "bmp") eos)
-            (lambda (&rest args)
-              (apply
-               (cond ((executable-find "mpv") #'+browse-image-with-mpv)
-                     (t #'eww-browse-url))
-               args)))
-      (cons (rx (or ;; videos
-                 "youtube.com" "youtu.be" "invidious" "yewtu.be"
-                 (seq "." (or "mp4" "gif" "mov" "MOV" "webm") eos)
-                 ;; music
-                 "soundcloud.com" "bandcamp.com"
-                 (seq "." (or "ogg" "mp3" "opus" "m4a") eos)))
-            (lambda (&rest args)
-              (apply (if (executable-find "mpv")
-                         #'+browse-url-with-mpv
-                       browse-url-secondary-browser-function)
-                     args)))
-      (cons chd/url-regexps #'browse-url-chrome)
-      (cons (+browse-url-secondary-browser-regexps-combine) ; non-text websites
-            (lambda (&rest args)
-              (apply browse-url-secondary-browser-function args)))
-      (cons "xkcd\\.com"
-            (lambda (&rest args)
-              (apply (if (fboundp #'xkcd-get)
-                         (progn (require '+xkcd)
-                                #'+xkcd-get-from-url)
-                       +browse-url-browser-function)
-                     args)))
-      (cons "."                           ; everything else
-            (lambda (&rest args)
-              (apply +browse-url-browser-function args))))))
+  (require 'chd)
+  (+browse-url-set-handlers
+   (list
+    (cons (rx                           ; images
+           "." (or "jpeg" "jpg" "png" "bmp") eos)
+          (lambda (&rest args)
+            (apply
+             (cond ((executable-find "mpv") #'+browse-image-with-mpv)
+                   (t #'eww-browse-url))
+             args)))
+    (cons (rx (or ;; videos
+               "youtube.com" "youtu.be" "invidious" "yewtu.be"
+               (seq "." (or "mp4" "gif" "mov" "MOV" "webm") eos)
+               ;; music
+               "soundcloud.com" "bandcamp.com"
+               (seq "." (or "ogg" "mp3" "opus" "m4a") eos)))
+          (lambda (&rest args)
+            (apply (if (executable-find "mpv")
+                       #'+browse-url-with-mpv
+                     browse-url-secondary-browser-function)
+                   args)))
+    (cons chd/url-regexps #'browse-url-chrome)
+    (cons (+browse-url-secondary-browser-regexps-combine) ; non-text websites
+          (lambda (&rest args)
+            (apply browse-url-secondary-browser-function args)))
+    (cons "xkcd\\.com"
+          (lambda (&rest args)
+            (apply (if (fboundp #'xkcd-get)
+                       (progn (require '+xkcd)
+                              #'+xkcd-get-from-url)
+                     +browse-url-browser-function)
+                   args)))
+    (cons "."                           ; everything else
+          (lambda (&rest args)
+            (apply +browse-url-browser-function args)))))
   ;; Transform URLs before passing to `browse-url'
   (:option +browse-url-transformations `((,(rx (or "youtube.com"
                                                    "youtu.be"))
@@ -698,7 +697,7 @@
         :unnarrowed t))
   (+org-capture-sort))
 
-(setup org-contacts
+(setup org-contacts (:quit)
   (:load-after org)
   (:also-straight org-vcard)                 ; for importing Vcard files
   (:option org-contacts-matcher "contact")    ; Contacts are tagged "contact"