From d499aeb150eece6d2e52bd695eea81d9c62e1043 Mon Sep 17 00:00:00 2001
From: Ashton Wiersdorf <mail@wiersdorf.dev>
Date: Tue, 18 Apr 2023 11:29:31 -0600
Subject: Recommit to only GNU ELPA

---
 init.el            | 13 ++++++++++---
 mixins/vim-like.el | 35 -----------------------------------
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/init.el b/init.el
index b342e03..af90d81 100644
--- a/init.el
+++ b/init.el
@@ -28,9 +28,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Package initialization
-(with-eval-after-load 'package
-  (add-to-list 'package-archives '("nongnu" . "https://elpa.nongnu.org/nongnu/"))
-  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
+;;
+;; We'll stick to only GNU ELPA (Emacs Lisp Package Archive) for the base
+;; install, but there are some other ELPAs you could look at if you want more
+;; packages. MELPA in particular is very popular. See instructions at:
+;;
+;;    https://melpa.org/#/getting-started
+;;
+;; (with-eval-after-load 'package
+;;   (add-to-list 'package-archives '("nongnu" . "https://elpa.nongnu.org/nongnu/"))
+;;   (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
 
 ;; If you want to turn off the welcome screen, uncomment this
 ;(setq inhibit-splash-screen t)
diff --git a/mixins/vim-like.el b/mixins/vim-like.el
index 02468a3..e3d6025 100644
--- a/mixins/vim-like.el
+++ b/mixins/vim-like.el
@@ -7,7 +7,6 @@
 ;;; Contents:
 ;;;
 ;;;  - Core Packages
-;;;  - Evil Enhancements
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
@@ -27,37 +26,3 @@
 
   ;; Configuring initial major mode for some modes
   (evil-set-initial-state 'vterm-mode 'emacs))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;;   Evil Enhancements
-;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Evil-collection: handy evil bindings for lots of different modes
-(use-package evil-collection
-  :ensure t
-  :after evil
-  :config
-  ;; Other good ones to enable: magit, mu4e, eglot, etc.
-  (evil-collection-init '(dired info))
-
-  ;; You can add evil-mode keybindings here; for example, when we're in
-  ;; special-mode, it usually means we're in some kind of uneditable buffer like
-  ;; a message popup etc. `q' will quit inside these windows instead of starting
-  ;; a macro recording.
-  (evil-collection-define-key 'normal 'special-mode-map
-    (kbd "q") 'quit-window))
-
-;; Evil-owl: preview what's in your vim registers
-(use-package evil-owl
-  :ensure t
-  :config
-  (setq evil-owl-idle-delay 0.3)
-  (setq evil-owl-max-string-length 500)
-  (add-to-list 'display-buffer-alist
-               '("*evil-owl*"
-                 (display-buffer-in-side-window)
-                 (side . bottom)
-                 (window-height . 30)))
-  (evil-owl-mode))
-- 
cgit v1.2.3