Move server+benchmark code into doom|finalize

core/core-packages.el

@@ -327,12 +327,7 @@ MODULES is an malformed plist of modules to load."
        (setq doom-modules ',doom-modules)
        ,@(nreverse init-forms)
        (unless noninteractive
-         ,@(nreverse config-forms)
-         (when (display-graphic-p)
-           (require 'server)
-           (unless (server-running-p)
-             (server-start)))
-         (add-hook 'doom-post-init-hook #'doom-packages--display-benchmark)))))
+         ,@(nreverse config-forms)))))
 
 (defmacro def-package! (name &rest plist)
   "A thin wrapper around `use-package'."

core/core.el

@@ -184,7 +184,12 @@ ability to invoke the debugger in debug mode."
 `gc-cons-percentage' and `file-name-handler-alist'."
     (unless (or (not after-init-time) noninteractive)
       (dolist (hook '(doom-init-hook doom-post-init-hook))
-        (run-hook-wrapped hook #'doom-try-run-hook hook)))
+        (run-hook-wrapped hook #'doom-try-run-hook hook))
+      (when (display-graphic-p)
+        (require 'server)
+        (unless (server-running-p)
+          (server-start)))
+      (doom-packages--display-benchmark))
 
     ;; If you forget to reset this, you'll get stuttering and random freezes!
     (setq gc-cons-threshold 16777216