                   (-flatten
                    (--map (f--entries (doom-module-path (car it) (cdr it))
                                       (and (f-ext-p it "el")
-                                           (if comprehensive-p
-                                               (not (string= (f-base it) "packages"))
-                                             (string= (f-base it) "config")))
+                                           (or comprehensive-p
+                                               (string= (f-base it) "config")
+                                               (string-prefix-p "+" (f-base it))))
                                       t)
                           doom-enabled-modules))))
         (n 0)

        (message "Deleted old autoloads.el"))
      (dolist (file autoload-files)
        (update-file-autoloads file)
        (message "Detected: %s" (f-relative file doom-emacs-dir)))
      (with-current-buffer (get-file-buffer generated-autoload-file)
        (save-buffer)
        (eval-buffer))

a lot from this.

If COMPREHENSIVE-P is non-nil, then compile modules/*/*/*.el (except for
packages.el files) -- this will likely take a long time."
  (interactive)
  (doom-reload)
  (let ((targets (append
