Simplify

1 files changed, 12 insertions, 12 deletions

diff --git a/substrate.el b/substrate.el
index 9c93890..092359c 100644
--- a/substrate.el
+++ b/substrate.el
@@ -101,11 +101,6 @@
 
   ;; Package initialization
   ;;
-  ;; Set up package and enable melpa
-  (require 'package)
-  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
-  (package-initialize)
-
   ;; Boostrap straight.el
   (defvar bootstrap-version)
   (let ((bootstrap-file
@@ -122,6 +117,7 @@
 	(goto-char (point-max))
 	(eval-print-last-sexp)))
     (load bootstrap-file nil 'nomessage))
+  (straight-use-package 'use-package)
   (setq straight-use-package-by-default t)
 
   (setopt initial-major-mode 'fundamental-mode)	; default mode for the *scratch* buffer
@@ -174,14 +170,18 @@ 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 ...)
 
-  (when substrate-enable-which-key
-    (straight-use-package 'which-key)
+  (use-package which-key
+    :if substrate-enable-which-key
+    :config
     (which-key-mode))
 
-  (when substrate-enable-evil
+  (use-package evil
+    :if substrate-enable-evil
+    :init
     (setq evil-respect-visual-line-mode t)
     (setq evil-undo-system 'undo-redo)
-    (straight-use-package 'evil)
+
+    :config
     (evil-mode)
 
     ;; If you use Magit, start editing in insert state
@@ -283,9 +283,9 @@ If the new path's directories does not exist, create them."
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-  (when substrate-configure-theme
-    (straight-use-package 'challenger-deep-theme)
-    (substrate-set-theme 'challenger-deep))
+  (use-package evangelion-theme
+    :if substrate-configure-theme
+    :config (substrate-set-theme 'evangelion))
 
 
 ;;; Relegate automatic custom variables to their own file.