Fix package install with straight directlyHEADmain

1 files changed, 11 insertions, 13 deletions

diff --git a/substrate.el b/substrate.el
index 092359c..df38099 100644
--- a/substrate.el
+++ b/substrate.el
@@ -6,7 +6,6 @@
 ;;;   (,,,___,,,) ▐   ▐▝▘▌ ▙▟ ▐     ▝▌      ▝▌▐  ▌▐  ▌  ▝▌ ▐  ▐ ▝▖ ▙▟  ▐  ▐    ;;;
 ;;;       ) (	  ▐▄▄▖▐  ▌▐  ▌ ▚▄▘▝▄▟▘    ▝▄▟▘▝▄▄▘▐▄▄▘▝▄▟▘ ▐  ▐  ▘▐  ▌ ▐  ▐▄▄▖ ;;;
 ;;;      (___)                                                                 ;;;
-;;;                                                                            ;;;
 ;;; init.el ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;; Guardrail
@@ -169,19 +168,17 @@ If the new path's directories does not exist, create them."
 
   ;; which-key: shows a popup of available keybindings when typing a long key
   ;; sequence (e.g. C-x ...)
-
-  (use-package which-key
-    :if substrate-enable-which-key
-    :config
+  (when substrate-enable-which-key
+    (straight-use-package 'which-key)
+    (require 'which-key)
     (which-key-mode))
 
-  (use-package evil
-    :if substrate-enable-evil
-    :init
+  ;; Evil mode for Vi-like editing
+  (when substrate-enable-evil
+    (straight-use-package 'evil)
+    (require 'evil)
     (setq evil-respect-visual-line-mode t)
     (setq evil-undo-system 'undo-redo)
-
-    :config
     (evil-mode)
 
     ;; If you use Magit, start editing in insert state
@@ -283,9 +280,10 @@ If the new path's directories does not exist, create them."
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-  (use-package evangelion-theme
-    :if substrate-configure-theme
-    :config (substrate-set-theme 'evangelion))
+  ;; Install and configure theme using straight.el directly
+  (when substrate-configure-theme
+    (straight-use-package 'challenger-deep-theme)
+    (substrate-set-theme 'challenger-deep))
 
 
 ;;; Relegate automatic custom variables to their own file.