2 files changed, 10 insertions, 3 deletions

@@ -51,7 +51,7 @@
   (:hook #'+init-add-setup-to-imenu))
 
 (setup (:require +key)
-  (+key-setup))
+  (+ensure-after-init #'+key-global-mode))
 
 (setup (:require auth-source)
   (:option auth-sources (list (private/ "authinfo")
@@ -175,8 +175,7 @@
            custom-variable-default-form 'lisp
            +custom-variable-allowlist '(safe-local-variable-values
                                         warning-suppress-types))
-  (when (file-exists-p custom-file)
-    (+custom-load-ignoring-most-customizations t))
+  (+ensure-after-init #'+custom-load-ignoring-most-customizations)
   (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets)
   (:with-mode Custom-mode
     (:local-set imenu-generic-expression +cus-edit-imenu-generic-expression)))
@@ -75,5 +75,13 @@ ARGS."
     (run-at-time sunset-time (* 60 60 24) sunset-command)
     (run-at-time "12:00am" (* 60 60 24) sunset-command)))
 
+(defun +ensure-after-init (function)
+  "Ensure FUNCTION runs after init, or now if already initialized.
+If Emacs is already started, run FUNCTION.  Otherwise, add it to
+`after-init-hook'.  FUNCTION is called with no arguments."
+  (if after-init-time
+      (funcall function)
+    (add-hook 'after-init-hook function)))
+
 (provide 'acdw)
 ;;; acdw.el ends here