1 files changed, 20 insertions, 19 deletions

@@ -115,7 +115,6 @@
     (add-to-list '+custom-variable-allowlist var))
   ;; Load customizations now, and after init (to capture other possible
   ;; variables I want to load) XXX: this is dumb
-  (+custom-load-ignoring-most-customizations)
   (+with-ensure-after-init
     (+custom-load-ignoring-most-customizations))
   (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets)
@@ -507,21 +506,21 @@
   (:require +finger)                        ; fixes `finger' to use var below
   (:option finger-X.500-host-regexps '(".") ; only send username
            )
-  (require 'transient)
-  (transient-define-prefix net-utils ()
-    "Networking utilities"
-    ["Actions"
-     ("p" "Ping" ping)
-     ("i" "Ifconfig" ifconfig)
-     ("w" "Iwconfig" iwconfig)
-     ("n" "Netstat" netstat)
-     ("a" "Arp" arp)
-     ("r" "Route" route)
-     ("h" "Nslookup host" nslookup-host)
-     ("d" "Dig" dig)
-     ("s" "Smb Client" smbclient)
-     ("t" "Traceroute" traceroute)])
-  (:+key "C-z M-n" #'net-utils))
+  (with-eval-after-load 'transient
+   (transient-define-prefix net-utils ()
+     "Networking utilities"
+     ["Actions"
+      ("p" "Ping" ping)
+      ("i" "Ifconfig" ifconfig)
+      ("w" "Iwconfig" iwconfig)
+      ("n" "Netstat" netstat)
+      ("a" "Arp" arp)
+      ("r" "Route" route)
+      ("h" "Nslookup host" nslookup-host)
+      ("d" "Dig" dig)
+      ("s" "Smb Client" smbclient)
+      ("t" "Traceroute" traceroute)])
+   (:+key "C-z M-n" #'net-utils)))
 
 (setup notmuch
   (:load-from "~/usr/share/emacs/site-lisp/")
@@ -1051,9 +1050,11 @@
 
 (setup (:straight bbdb)
   (:straight bbdb-vcard)
-  (:require bbdb-autoloads
-            bbdb)
-  (bbdb-initialize 'gnus 'message))
+  (add-hook '+custom-after-load-hook
+            (defun +bbdb-load ()
+              (:require bbdb-autoloads
+                        bbdb)
+              (bbdb-initialize 'gnus 'message))))
 
 (setup (:straight (bongo :type git
                          :flavor melpa