@@ -37,17 +37,13 @@
 (setq use-package-enable-imenu-support t)
 (require 'use-package)
 (setq use-package-always-demand (daemonp)
-      use-package-compute-statistics t)
+      use-package-compute-statistics nil)
 
 (defmacro quietly (&rest body)
   `(let ((inhibit-message t))
      ,@body))
 (defun quiet (original-function &rest args)
   (quietly (apply original-function args)))
-
-(use-package benchmark-init
-  :config (progn
-            (add-hook 'after-init-hook #'benchmark-init/deactivate 99)))
 
 ;;; Customize
 
@@ -366,6 +362,7 @@ :config (progn
             (vertico-prescient-mode +1)))
 
 (use-package marginalia
+  :after vertico
   :general (:keymaps 'minibuffer-local-map
                      "M-A" #'marginalia-cycle)
   :init (marginalia-mode +1))
@@ -400,7 +397,7 @@ (use-package embark-consult
   :ghook ('consult-preview-at-point-mode-hook #'embark-collect-mode))
 
 (use-package smerge-mode
-  :after magit
+  :defer 2
   :config
   (defhydra unpackaged/smerge-hydra
     (:color pink :hint nil :post (smerge-auto-leave))
@@ -457,7 +454,6 @@ split-height-threshold 20
       split-width-threshold 160)
 
 (use-package winner
-  :after evil
   :defer 8
   :config (progn
             (setq winner-boring-buffers '("*Completions*" "*Help*" "*Apropos*" "*Buffer List*" "*info*" "*Compile-Log*"))
@@ -757,6 +753,7 @@ (with-eval-after-load 'compile
               (remove-hook 'compilation-mode-hook #'tramp-compile-disable-ssh-controlmaster-options))))
 
 (use-package ssh-deploy
+  :defer 20
   :config (progn
             (ssh-deploy-line-mode +1)
             (ssh-deploy-add-find-file-hook)
@@ -926,11 +923,14 @@ :config (progn
             (setq fish-enable-auto-indent t)))
 
 ;;;; nix
-(with-eval-after-load 'nix-mode
-  (setq nix-mode-use-smie t
-        nix-indent-function #'smie-indent-line))
+(use-package nix-mode
+  :defer t
+  :config (progn
+            (setq nix-mode-use-smie nil
+                  nix-indent-function #'smie-indent-line)))
 
 (use-package nix-ts-mode
+  :defer 2
   :mode (("\\.nix\\'" . nix-ts-mode)))
 
 (use-package nix-update
@@ -975,7 +975,7 @@
 ;;;; org
 
 (use-package org
-  :defer 10
+  :defer t
   :config (progn
             (setq org-ellipsis "…"
                   org-modules nil