Cleanup use-package declarations for faster init

diff --git a/config.org b/config.org
index 9b3ea3f26cd26110759712280aaf64a9684f6a3c..e9d1216bc3a372057eacf5a244fbd2fef56b3683 100644 (file)
--- a/config.org
+++ b/config.org
@@ -48,7 +48,6 @@ Accounting
 #+BEGIN_SRC emacs-lisp
 (use-package ledger-mode
   :ensure t
-  :defer t
   :bind
   ((:map ledger-mode-map ("C-c s" . ledger-sort-buffer))))
 #+END_SRC
@@ -110,8 +109,10 @@ This comes with base corfu, but is configured separately.
 *** expand-region
 Seldom used, but nothing else does it.
 #+BEGIN_SRC emacs-lisp
-(use-package expand-region :ensure t)
-(keymap-global-set "C-=" 'er/expand-region)
+(use-package expand-region
+  :ensure t
+  :bind
+  (("C-=" . 'er/expand-region)))
 #+END_SRC
 
 *** magit
@@ -119,7 +120,6 @@ I use magit occasionally.  I put this sparse configuration here mostly for a spe
 #+BEGIN_SRC emacs-lisp
 (use-package magit
   :ensure t
-  :defer t
   :config
   (message "Magit Loaded")
   :bind
@@ -131,20 +131,20 @@ I need to open binary files with their own editor.  Disgusting.
 #+BEGIN_SRC emacs-lisp
 (use-package openwith
   :ensure t
+  :defer t
   :config
-  (openwith-mode t))
-
-(setq openwith-associations (list
-                             (list (openwith-make-extension-regexp
-                                    '("xls" "xlsx" "doc" "docx"
-                                      "ppt" "odt" "ods" "odg" "odp"))
-                                   "LibreOffice"
-                                   '(file))
-                             (list (openwith-make-extension-regexp
-                                    '("adpro"))
-                                   "ProductivitySuite"
-                                   '(file))))
-
+  (openwith-mode t)
+  :custom
+  (openwith-associations (list
+                          (list (openwith-make-extension-regexp
+                                 '("xls" "xlsx" "doc" "docx"
+                                   "ppt" "odt" "ods" "odg" "odp"))
+                                "LibreOffice"
+                                '(file))
+                          (list (openwith-make-extension-regexp
+                                 '("adpro"))
+                                "ProductivitySuite"
+                                '(file)))))
 #+END_SRC
 
 *** acme-mouse
@@ -167,11 +167,13 @@ Lisp me...sometimes.
 #+BEGIN_SRC emacs-lisp
 (let ((slime-help "~/quicklisp/slime-helper.el"))
   (when (file-exists-p slime-help)
-    (load (expand-file-name slime-help))
-    (setq inferior-lisp-program "sbcl")
     (use-package slime
       :ensure t
       :defer t
+      :init
+      (load (expand-file-name slime-help))
+      :config
+      (setq inferior-lisp-program "sbcl")
       :custom
       (slime-net-coding-system 'utf-8-unix))
     (when (file-exists-p "~/lisp/sbcl.core-for-slime")

diff --git a/init.el b/init.el
index 2af87ae7daf77379b1dc2abb9da9cb7f8da9db09..7e399500ff408ae07e3f29221bffeb8f912e4a24 100644 (file)
--- a/init.el
+++ b/init.el
@@ -4,7 +4,6 @@
 
 ;; Code:
 
-(require 'org)
-
 (org-babel-load-file (concat user-emacs-directory "config.org"))
+
 ;;; hic terminatur init.el