From 08b9524906ce2b869871d4d417173872fdc8aad4 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Thu, 17 Mar 2022 14:57:41 -0400
Subject: [PATCH] Switch to straight.el, and try everforest theme

---
 emacs.d/init.el | 67 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 2f02c47..463df1a 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,3 +1,6 @@
+;; Disable package.el early so it won't start loading packages before init is loaded
+(setq package-enable-at-startup nil)
+
 ;; No thanks
 (setq inhibit-startup-message t)  ; Disable startup message
 (scroll-bar-mode -1)              ; Disable visible scrollbar
@@ -63,40 +66,60 @@
 (dolist (mode '(org-mode-hook))
   (add-hook mode (lambda () (display-line-numbers-mode 0))))
 
+
+;; Install and load straight.el
+(defvar bootstrap-version)
+(let ((bootstrap-file
+       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+      (bootstrap-version 5))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
+
+
+;;;;;;;;;;;;;; Not needed when using straight.el ;;;;;;;;;;;;;;
 ;; Initialize package sources
-(require 'package)
+;(require 'package)
 
-(setq package-archives '(("melpa" . "https://melpa.org/packages/")
-                         ("org" . "https://orgmode.org/elpa/")
-                         ("elpa" . "https://elpa.gnu.org/packages/")))
+;(setq package-archives '(("melpa" . "https://melpa.org/packages/")
+;                         ("org" . "https://orgmode.org/elpa/")
+;                         ("elpa" . "https://elpa.gnu.org/packages/")))
 
-(package-initialize)
-(unless package-archive-contents
- (package-refresh-contents))
+;(package-initialize)
+;(unless package-archive-contents
+; (package-refresh-contents))
 
 ;; Initialize use-package on non-Linux platforms
-(unless (package-installed-p 'use-package)
-   (package-install 'use-package))
+;(unless (package-installed-p 'use-package)
+;   (package-install 'use-package))
 
-(require 'use-package)
-(setq use-package-always-ensure t)
+;(require 'use-package)
+;(setq use-package-always-ensure t)
+;;;;;;;;;;;;;;
 
-;;; Packages
+;; Install use-package
+(straight-use-package 'use-package)
+
+;; Make use-package use straight.el
+(use-package straight
+             :custom (straight-use-package-by-default t))
 
 ;; Theme
 (setq custom-safe-themes t)
 
-;(use-package darktooth-theme
+;(use-package zenburn-theme
 ;  :config
-;  (load-theme `darktooth t))
+;  (load-theme `zenburn t))
 
-(use-package zenburn-theme
+(use-package everforest-hard-dark-theme
+  :straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-hard-dark-theme")
   :config
-  (load-theme `zenburn t))
-
-;; (use-package ample-theme
-;;   :config
-;;   (load-theme `ample-flat t))
+  (load-theme 'everforest-hard-dark))
 
 ;; (use-package base16-theme
 ;;   :ensure t
@@ -114,9 +137,6 @@
 
 ;; Modeline
 
-;; (use-package simple-modeline
-;;   :hook (after-init . simple-modeline-mode))
-
 (use-package minions
   :hook (doom-modeline-mode . minions-mode)
         (simple-modeline-mode . minions-mode))
@@ -317,6 +337,7 @@
               ("C-c C-n" . numpydoc-generate))
   :config
   (setq numpydoc-insert-examples-block nil))
+
 ;; Rust
 
 ;(use-package rust-mode)