Refactor initialization; allow package! to universally disable packages

No need for def-package-hook! for disable packages anymore, you can do
it from package! in packages.el files.

core/core-lib.el

@@ -1,10 +1,5 @@
 ;;; core-lib.el -*- lexical-binding: t; -*-
 
-(let ((load-path doom-site-load-path))
-  (require 'subr-x)
-  (require 'cl-lib)
-  (require 'map))
-
 (eval-and-compile
   (unless EMACS26+
     (with-no-warnings

core/core-packages.el

@@ -143,6 +143,10 @@ FORCE-P is non-nil, do it anyway.
 3. Loads your autoloads file in `doom-autoload-file',
 4. Builds and caches `load-path' and `Info-directory-list' in `doom-packages-file'"
   ;; Called early during initialization; only use native (and cl-lib) functions!
+  (let ((load-path doom-site-load-path))
+    (require 'subr-x)
+    (require 'cl-lib)
+    (require 'map))
   (when (or force-p (not doom-init-p))
     (unless (load doom-autoload-file t t t)
       (unless noninteractive
@@ -173,11 +177,13 @@ FORCE-P is non-nil, do it anyway.
                 (message "✓ Installed %s" package)
               (error "✕ Couldn't install %s" package)))
           (message "Installing core packages...done")))
+      (cl-pushnew doom-core-dir load-path :test #'string=)
       (unless noninteractive
         (with-temp-buffer
-          (cl-pushnew doom-core-dir load-path :test #'string=)
+          (doom-initialize-packages 'internal)
           (prin1 `(setq load-path ',load-path
-                        Info-directory-list ',Info-directory-list)
+                        Info-directory-list ',Info-directory-list
+                        doom-disabled-packages ',doom-disabled-packages)
                  (current-buffer))
           (write-file doom-packages-file))))
     (setq doom-init-p t)))
@@ -202,7 +208,7 @@ populated.
 
 This reads modules' packages.el files, runs `package-initialize', and
 initializes quelpa, if they haven't already. If FORCE-P is non-nil, do it
-anyway.
+anyway. If FORCE-P is 'internal, only (re)populate `doom-packages'.
 
 Use this before any of package.el, quelpa or Doom's package management's API to
 ensure all the necessary package metadata is initialized and available for
@@ -225,10 +231,6 @@ them."
       ;; the current session, but if you change an packages.el file in a module,
       ;; there's no non-trivial way to detect that, so we give you a way to
       ;; reload only doom-packages.
-      (when (eq force-p 'internal)
-        (setq force-p nil
-              doom-packages nil))
-
       ;; `doom-packages'
       (when (or force-p (not doom-packages))
         (setq doom-packages nil)
@@ -243,14 +245,14 @@ them."
                  do (_load path)))
 
       ;; `package-alist'
-      (when (or force-p (not (bound-and-true-p package-alist)))
+      (when (or (eq force-p t) (not (bound-and-true-p package-alist)))
         (setq load-path doom-site-load-path)
         (require 'package)
         (setq package-activated-list nil)
         (package-initialize))
 
       ;; `quelpa-cache'
-      (when (or force-p (not (bound-and-true-p quelpa-cache)))
+      (when (or (eq force-p t) (not (bound-and-true-p quelpa-cache)))
         (require 'quelpa)
         (setq quelpa-initialized-p nil)
         (or (quelpa-setup-p)
@@ -410,8 +412,8 @@ WARNING: If :pre-init or :pre-config hooks return nil, the original
 to have them return non-nil (or exploit that to overwrite Doom's config)."
   (declare (indent defun))
   (cond ((eq when :disable)
-         (push package doom-disabled-packages)
+         (message "Using :disable with `def-package-hook!' is deprecated. Use :disable in `package!' instead.")
-         nil)
+         (ignore (push package doom-disabled-packages)))
         ((memq when '(:pre-init :post-init :pre-config :post-config))
          `(progn
             (setq use-package-inject-hooks t)
@@ -510,35 +512,41 @@ This macro is declarative and does not load nor install packages. It is used to
 populate `doom-packages' with metadata about the packages Doom needs to keep
 track of.
 
-Only use this macro in a module's packages.el file.
+Only use this macro in a module's init.el or packages.el file.
 
 Accepts the following properties:
 
- :recipe RECIPE        Takes a MELPA-style recipe (see `quelpa-recipe' in
+ :recipe RECIPE     Takes a MELPA-style recipe (see `quelpa-recipe' in
-                       `quelpa' for an example); for packages to be installed
+                    `quelpa' for an example); for packages to be installed
-                       from external sources.
+                    from external sources.
- :pin ARCHIVE-NAME     Instructs ELPA to only look for this package in
+ :pin ARCHIVE-NAME  Instructs ELPA to only look for this package in
-                       ARCHIVE-NAME. e.g. \"org\". Ignored if RECIPE is present.
+                    ARCHIVE-NAME. e.g. \"org\". Ignored if RECIPE is present.
- :ignore FORM          Do not install this package if FORM is non-nil.
+ :disable BOOL      Do not install this package AND disable its `def-package!' blocks.
- :freeze FORM          Do not update this package if FORM is non-nil."
+ :freeze FORM       Do not update this package if FORM is non-nil."
   (declare (indent defun))
-  (unless (memq name doom-disabled-packages)
+  (cond ((memq name doom-disabled-packages) nil)
-    (let* ((old-plist (assq name doom-packages))
+        ((let ((disable (plist-get plist :disable)))
-           (pkg-recipe (or (plist-get plist :recipe)
+           (and disable (eval disable)))
-                           (and old-plist (plist-get old-plist :recipe))))
+         (push name doom-disabled-packages)
-           (pkg-pin    (or (plist-get plist :pin)
+         (setq doom-packages (map-delete doom-packages name))
-                           (and old-plist (plist-get old-plist :pin)))))
+         nil)
-      (when pkg-recipe
+        ((let* ((old-plist (assq name doom-packages))
-        (when (= 0 (% (length pkg-recipe) 2))
+                (pkg-recipe (or (plist-get plist :recipe)
-          (plist-put plist :recipe (cons name pkg-recipe)))
+                                (and old-plist (plist-get old-plist :recipe))))
-        (when pkg-pin
+                (pkg-pin    (or (plist-get plist :pin)
-          (plist-put plist :pin nil)))
+                                (and old-plist (plist-get old-plist :pin)))))
-      (dolist (prop '(:ignore :freeze))
+           (when pkg-recipe
-        (when-let* ((val (plist-get plist prop)))
+             (when (= 0 (% (length pkg-recipe) 2))
-          (plist-put plist prop (eval val))))
+               (plist-put plist :recipe (cons name pkg-recipe)))
-      `(progn
+             (when pkg-pin
-         ,(if (and pkg-pin t) `(map-put package-pinned-packages ',name ,pkg-pin))
+               (plist-put plist :pin nil)))
-         (map-put doom-packages ',name ',plist)))))
+           (let ((val (plist-get plist :freeze)))
+             (when val
+               (plist-put plist :freeze (eval val))))
+           `(progn
+              ,(when (and pkg-pin t)
+                 `(map-put package-pinned-packages ',name ,pkg-pin))
+              (map-put doom-packages ',name ',plist))))))
 
 (defmacro depends-on! (module submodule &optional flags)
   "Declares that this module depends on another.

core/core.el

@@ -164,6 +164,7 @@ ability to invoke the debugger in debug mode."
 display the loading benchmark."
     (dolist (hook '(doom-init-hook doom-post-init-hook))
       (run-hook-wrapped hook #'doom-try-run-hook hook))
+    (run-hooks 'doom-finalize-hook)
     (unless noninteractive
       (when (display-graphic-p)
         (require 'server)
@@ -180,8 +181,8 @@ this, you'll get stuttering and random freezes), and resets
           file-name-handler-alist doom--file-name-handler-alist)
     t)
 
-  (add-hook! '(emacs-startup-hook doom-reload-hook) #'doom|finalize)
+  (add-hook 'emacs-startup-hook #'doom|after-init)
-  (add-hook 'emacs-startup-hook #'doom|after-init))
+  (add-hook! '(doom-finalize-hook doom-reload-hook) #'doom|finalize))
 
 
 ;;