Remove :after and autoload use-package

core/core-auto-insert.el

@@ -1,7 +1,7 @@
 ;;; core-auto-insert.el --- file templates
 
 (use-package autoinsert
-  :after yasnippet
+  :defer t
   :init
   (setq auto-insert-query nil)    ; Don't prompt before insertion
   (setq auto-insert-alist '())

core/core-yasnippet.el

@@ -33,6 +33,7 @@
       map))
   :config
   (after! helm (add-to-list 'yas-dont-activate 'helm-alive-p))
+  (require 'autoinsert)
 
   (yas-reload-all)
 

core/core.el

@@ -73,11 +73,9 @@
 (require 'core-defuns)
 (require 'diminish)
 
+(autoload 'use-package "use-package" "" nil 'macro)
 (eval-when-compile
-  (require 'dash)
-  (require 'use-package)
-  (require 'defuns-use-package)
-  (setq use-package-verbose narf-debug-mode)
+  (setq use-package-verbose nil)
 
   ;; Make any folders needed
   (dolist (file '("" "undo" "backup"))

core/lib/defuns-use-package.el

@@ -1,27 +0,0 @@
-;;; defuns-use-package.el
-
-;; Meant to be loaded explicitly by core.el
-
-(defun use-package--add-keyword (keyword after)
- (setq use-package-keywords
-  (-insert-at (-find-index (lambda (key) (eq key after)) use-package-keywords)
-   keyword use-package-keywords)))
-
-(use-package--add-keyword :after :load-path)
-
-(defalias 'use-package-normalize/:after 'use-package-normalize-symlist)
-
-(defun use-package-handler/:after (name-symbol keyword arg rest state)
-  (let ((body (use-package-process-keywords name-symbol rest state)))
-    (if (null arg)
-        body
-      (use-package-concat
-       (use-package-process-keywords name-symbol
-         (use-package-sort-keywords (use-package-plist-maybe-put rest :defer t)) state)
-       (apply #'nconc
-              (mapcar (lambda (feature)
-                        `((after! ,feature (require ',name-symbol))))
-                      (delete-dups arg)))))))
-
-(provide 'defuns-use-package)
-;;; defuns-use-package.el ends here