From 7601c515d78a8a41ec6d690545de7b143975114d Mon Sep 17 00:00:00 2001
From: David <david.crompton@mail.utoronto.ca>
Date: Thu, 28 Aug 2025 11:16:18 -0400
Subject: [PATCH] Fix loads and defers

---
 main.org | 65 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/main.org b/main.org
index c8a34da..fced0c5 100644
--- a/main.org
+++ b/main.org
@@ -153,7 +153,9 @@ Visual Theme of Emacs config: defined in the =themes= directory.
 
 * Version Control
 #+begin_src elisp :tangle yes :exports code
-(leaf magit :ensure t :require t)
+(leaf magit
+  :leaf-defer nil
+  :ensure t :require t)
 #+end_src
 
 * Nix Related
@@ -164,15 +166,16 @@ In order to support direnv (loading =nix-shell= / =nix develop=)
 #+begin_src elisp :tangle yes :exports code
 (leaf direnv
   :ensure t
-  :config
-  (direnv-mode))
+  :global-minor-mode direnv-mode)
 #+end_src
 
 ** Nix-mode
 
 =.nix= file mode
 #+begin_src elisp :tangle yes :exports code
-(leaf nix-mode :ensure t)
+(leaf nix-mode
+  :ensure t
+  :mode "\\.nix\\'")
 #+end_src
 
 * IDE Like Things
@@ -180,8 +183,9 @@ In order to support direnv (loading =nix-shell= / =nix develop=)
 ** Which Key Again?
 
 #+begin_src elisp :tangle yes :exports code
-(leaf which-key :ensure t
-  :config (which-key-mode))
+(leaf which-key
+  :ensure t
+  :global-minor-mode which-key-mode)
 #+end_src
 
 ** Company Completion!
@@ -193,7 +197,7 @@ We like autocomplete, it... is nice, okay?
   :bind
   (("C-<tab>" . company-complete))
   :hook after-init-hook
-  :config (global-company-mode))
+  :global-minor-mode global-company-mode)
 #+end_src
 
 ** Language Server Protocol
@@ -206,9 +210,9 @@ We love language features that make languages nice
   :init
   (setq lsp-keymap-prefix "C-c l")
   :commands lsp lsp-deferred
-  :hook
+  :hook (
   ;; which key support v v v
-  ((lsp-mode-hook . lsp-enable-which-key-integration)
+  (lsp-mode-hook . lsp-enable-which-key-integration)
 #+end_src
 
 *** IDE Languages
@@ -247,7 +251,7 @@ We love language features that make languages nice
 **** Rust
 
 #+begin_src elisp :tangle yes :exports code
-(rust-mode-hook . lsp-deferred))
+(rust-mode-hook . lsp-deferred)
 #+end_src
 
 #+begin_src elisp :tangle yes :exports code
@@ -258,6 +262,10 @@ We love language features that make languages nice
 
 We do want some nice to haves of course
 
+#+begin_src elisp :tangle yes :exports code
+:init
+#+end_src
+
 - A pretty UI:
 #+begin_src elisp :tangle yes :exports code
 (leaf lsp-ui :ensure t
@@ -281,6 +289,12 @@ We do want some nice to haves of course
   (projectile-mode +1))
 #+end_src
 
+END LSP CONFIG
+
+#+begin_src elisp :tangle yes :exports code
+)
+#+end_src
+
 * WEB
 
 We all know the web is the future, obviously, of course.
@@ -294,21 +308,29 @@ We all know the web is the future, obviously, of course.
   "\\.jsx?\\'"
   "\\.tsx?\\'")
 (leaf php-mode
+  :mode "\\.php\\'"
   :ensure t)
 (leaf rainbow-mode
+  :leaf-defer nil
   :ensure t)
 #+end_src
 
 * D2
 
 #+begin_src elisp :tangle yes :exports code
-(leaf d2-mode :ensure t)
+(leaf d2-mode
+  :ensure t
+  :mode "\\.d2\\'"
+  )
 #+end_src
 
 * YAML
 
 #+begin_src elisp :tangle yes :exports code
-(leaf yaml-mode :ensure t)
+(leaf yaml-mode
+  :ensure t
+  :mode "\\.yaml\\'"
+  )
 #+end_src
 
 * Python Things
@@ -319,7 +341,9 @@ Using python-mode is to have more up to date features (and
 highlighting) compared to builtin python-mode.
 
 #+begin_src elisp :tangle yes :exports code
-(leaf python-mode :ensure t
+(leaf python-mode
+  :ensure t
+  :mode "\\.py\\'"
   :config
   (setq python-shell-interpreter "ipython"
 	python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True"))
@@ -352,15 +376,19 @@ Who even needs C++, not me, no way, no how.
 * Haskell
 
 #+begin_src elisp :tangle yes :exports code
-(leaf haskell-mode :ensure t)
-(leaf lsp-haskell :ensure t)
-(leaf company-ghci :ensure t)
+(leaf haskell-mode
+  :ensure t
+  :mode "\\.hs\\'"
+  :init
+  (leaf lsp-haskell :ensure t)
+  (leaf company-ghci :ensure t))
 #+end_src
 
 * Rust
 
 #+begin_src elisp :tangle yes :exports code
 (leaf rust-mode :ensure t
+  :mode "\\.rs\\'"
   :init
   (leaf slint-mode :ensure t))
 #+end_src
@@ -371,7 +399,7 @@ Minecraft =mcfunction= support, because, it can be annoying to type
 this stuff otherwise.
 #+begin_src elisp :tangle yes :exports code
 (leaf mcf-mode
-  :el-get rasensuihei/mcf)
+  :straight (mcf-mode :type git :host github :repo "rasensuihei/mcf"))
 #+end_src
 
 * Lisps
@@ -417,6 +445,7 @@ conflict with the builtin version of Org)
   :config
   (setq document-dir (expand-file-name (if (eq system-type 'darwin) "~/Nextcloud" "~/Documents")))
   (setq org-directory (concat document-dir "/org"))
+  (when (not (file-exists-p org-directory)) (mkdir org-directory))
   (set-fill-column 100)
   (setq org-src-fontify-natively t
 	org-confirm-babel-evaluate nil
@@ -714,7 +743,7 @@ taking package.
 
 #+begin_src elisp :tangle yes :exports code
 (leaf bqn-mode
-  :el-get "museoa/bqn-mode"
+  :ensure (bqn-mode :type git :host github :repo "museoa/bqn-mode")
   :defer-config
   (set-face-attribute 'bqn-default nil :family 'unspecified))
 #+end_src