From 046be58964b0e8e7bb9cc78e2feb2ddfe9119c3b Mon Sep 17 00:00:00 2001
From: rearman <rearman@r717.net>
Date: Fri, 21 Jun 2024 09:56:47 -0400
Subject: [PATCH] Optimize for init speed, proper deferring

---
 early-init.el     |  9 ++++++++-
 init.el           | 11 +++--------
 re/re-org.el      |  3 ---
 re/re-packages.el | 38 ++++++++++++++++++--------------------
 4 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/early-init.el b/early-init.el
index ec168c0..bc7b041 100644
--- a/early-init.el
+++ b/early-init.el
@@ -11,7 +11,14 @@
 					 gc-cons-percentage 0.1
 					 garbage-collection-messages t)))
 
-(setq default-directory "~/")
+;; Startup options
+(setq inhibit-startup-screen t
+      inhibit-startup-buffer-menu t
+      server-client-instructions nil
+      frame-resize-pixelwise t
+      default-directory "~/"
+      initial-scratch-message (message ";;; Emacs loaded in %s.\n\n"
+				       (emacs-init-time)))
 
 (provide 'early-init)
 ;;; hic terminatur early-init.el
diff --git a/init.el b/init.el
index 4063e17..fbc9ed0 100644
--- a/init.el
+++ b/init.el
@@ -4,14 +4,6 @@
 
 ;; Code:
 
-;; Startup options
-(setq inhibit-startup-screen t
-      inhibit-startup-buffer-menu t
-      server-client-instructions nil
-      frame-resize-pixelwise t
-      initial-scratch-message (message ";;; Emacs loaded in %s.\n\n"
-				       (emacs-init-time)))
-
 ;; Load External Libraries
 (add-to-list 'load-path (concat user-emacs-directory "re/"))
 (add-to-list 'load-path (concat user-emacs-directory "acme-mouse/"))
@@ -147,6 +139,9 @@
 (setq abbrev-file-name (expand-file-name "abbrev_defs" user-emacs-directory)
       save-abbrevs 'silently)
 
+(add-hook 'org-mode-hook (lambda ()
+			   #'abbrev-mode))
+
 ;; Customize System
 (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
 (when (not (file-exists-p custom-file))
diff --git a/re/re-org.el b/re/re-org.el
index 37de941..e17d457 100644
--- a/re/re-org.el
+++ b/re/re-org.el
@@ -2,9 +2,6 @@
 ;; Haec pars Emacs non est.
 ;; Code:
 
-(add-hook 'org-mode-hook (lambda ()
-			   #'abbrev-mode))
-
 (setq org-startup-folded t
       org-startup-indented t)
 
diff --git a/re/re-packages.el b/re/re-packages.el
index 9e6bbf0..f656661 100644
--- a/re/re-packages.el
+++ b/re/re-packages.el
@@ -55,7 +55,6 @@
 
 (use-package openwith
   :ensure t
-  :defer t
   :config
   (openwith-mode t)
   (setq openwith-associations (list ; Set these up for linux - windows falls back to system default
@@ -79,25 +78,24 @@
   :ensure t
   :defer t)
 
-(let ((slime-help "~/quicklisp/slime-helper.el"))
-  (when (file-exists-p slime-help)
-    (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")
-      (setq slime-lisp-implementations
-	    '((sbcl ("sbcl" "--core" "sbcl.core-for-slime")
-		    :directory "~/lisp"))))
-    (add-hook 'slime-mode-hook
-	      (lambda ()
-		(unless (slime-connected-p)
-		  (save-excursion (slime)))))))
+(use-package slime
+  :ensure t
+  :defer t
+  :init
+  (load (expand-file-name "~/quicklisp/slime-helper.el"))
+  :config
+  (setq inferior-lisp-program "sbcl")
+  (when (file-exists-p "~/lisp/sbcl.core-for-slime")
+    (setq slime-lisp-implementations
+	  '((sbcl ("sbcl" "--core" "sbcl.core-for-slime")
+		  :directory "~/lisp"))))
+  :custom
+  (slime-net-coding-system 'utf-8-unix))
+
+(add-hook 'slime-mode-hook
+	  (lambda ()
+	    (unless (slime-connected-p)
+	      (save-excursion (slime)))))
 
 (provide 're-packages)
 ;;; Hic terminatur re-packages.el
-- 
2.39.5