emacs/.emacs.d/config/init-buffers.el

@@ -21,8 +21,4 @@ Repeated invocations toggle between the two most recently open buffers."
   "bm" #'kill-other-buffers
   "br" #'rename-buffer)
 
-;; A library that provides a hook called on switching buffers
-(use-package switch-buffer-functions
-  :demand t)
-
 (provide 'init-buffers)

emacs/.emacs.d/config/init-built-ins.el

@@ -32,7 +32,6 @@
   (normal shell-mode-map "q" #'bury-buffer))
 
 (use-package ediff
-  :defer t
   :straight (:type built-in)
   :config
   (setq ediff-window-setup-function #'ediff-setup-windows-plain))

emacs/.emacs.d/config/init-completion.el

@@ -84,7 +84,9 @@
   (flycheck-command-map "!" #'consult-flycheck))
 
 (use-package embark-consult
-  :defer 1)
+  :init
+  (with-eval-after-load 'embark
+    (require 'embark-consult)))
 
 ;; Make grep-like embark collect buffers editable
 (use-package wgrep

emacs/.emacs.d/config/init-evil.el

@@ -3,8 +3,7 @@
 ;; Set up Vim keybindings with evil-mode
 (use-package evil
   :init
-  (setq evil-want-keybinding nil
-        evil-respect-visual-line-mode t)
+  (setq evil-want-keybinding nil)
   :config
   (evil-mode 1)
   :custom

emacs/.emacs.d/config/init-js.el

@@ -1,9 +0,0 @@
-;; -*- lexical-binding: t; -*-
-
-;; node version manager
-(use-package nvm
-  :commands (nvm-use
-             nvm-use-for
-             nvm-use-for-buffer))
-
-(provide 'init-js)

emacs/.emacs.d/config/init-prodigy.el

@@ -6,8 +6,6 @@
   :general
   ('normal prodigy-mode-map "SPC" leader-map)
   ('normal prodigy-view-mode-map "SPC" leader-map)
-  :custom
-  (prodigy-completion-system 'default)
   :config
   (evil-collection-prodigy-setup)
   ;; Add ability to associate a file with service logs instead of a buffer

emacs/.emacs.d/config/init-python.el

@@ -39,24 +39,8 @@
   (pyvenv-tracking-mode))
 
 ;; pyenv to track Python version
-(use-package pyenv
-  :straight (:host github :repo "aiguofer/pyenv.el")
-  :if (executable-find "pyenv")
-  :defer 3
-  :init
-  (setq pyenv-executable (executable-find "pyenv"))
-  :config
-  ;; Patch version alias stuff I don't use to stop spamming messages
-  (defun pyenv--version-alias-file ()
-    "Get peynv version alias file path."
-    (when pyenv-use-alias
-      (pyenv--call-process "version-alias-file")))
-  (global-pyenv-mode)
-  (defun pyenv-switch-buffer-hook (prev curr)
-    (pyenv-use-corresponding))
-  (add-hook 'switch-buffer-functions #'pyenv-switch-buffer-hook)
-  :custom
-  (pyenv-show-active-python-in-modeline nil))
+(use-package pyenv-mode
+  :defer t)
 
 ;; LSP using Microsoft's pyright language server
 (use-package lsp-pyright

emacs/.emacs.d/init.el

@@ -78,7 +78,6 @@
 (require 'init-help)
 (require 'init-python)
 (require 'init-clojure)
-(require 'init-js)
 (require 'init-yaml)
 (require 'init-terraform)
 (require 'init-run-command)