8 files changed, 40 insertions, 33 deletions
diff --git a/emacs/.config/emacs/early-init.el b/emacs/.config/emacs/early-init.el
index 8184bbb..ea2a859 100644
--- a/emacs/.config/emacs/early-init.el
+++ b/emacs/.config/emacs/early-init.el
@@ -1,6 +1,6 @@
 ;;; -*- lexical-binding: t; -*-
 
-(setq package-enable-at-startup nil)
+;; (setq package-enable-at-startup nil)
 
 ;; Optimization: file name handlers not needed during startup.
 (defvar kj/file-name-handler-alist--old file-name-handler-alist)
diff --git a/emacs/.config/emacs/emacs-custom.el b/emacs/.config/emacs/emacs-custom.el
index 6ef1843..69d949d 100644
--- a/emacs/.config/emacs/emacs-custom.el
+++ b/emacs/.config/emacs/emacs-custom.el
@@ -4,16 +4,19 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
-   '("0340489fa0ccbfa05661bc5c8c19ee0ff95ab1d727e4cc28089b282d30df8fc8"
-     "e3999eba4f25d912d7d61cbaaed1b551957e61da047279da89499d3bd1f1d007"
-     "8d412c0ed46b865312d6df5c1dfd1821d349dd3cba00049cf88c4ad34403597e"
-     "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1"
-     default))
+   '("0340489fa0ccbfa05661bc5c8c19ee0ff95ab1d727e4cc28089b282d30df8fc8" "e3999eba4f25d912d7d61cbaaed1b551957e61da047279da89499d3bd1f1d007" "8d412c0ed46b865312d6df5c1dfd1821d349dd3cba00049cf88c4ad34403597e" "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1" default))
+ '(package-selected-packages
+   '(org-pomodoro eshell-syntax-highlighting esh-help pcmpl-args exercism tidal haskell-mode diff-hl dts-mode clojure-mode unobtrusive-magit-theme ledger-mode nix-mode rustic tempel puni magit gcmh smudge helpful pdf-tools pcre2el repeat-help selected ace-mc expand-region idle-highlight-mode diredfl anzu direnv ob-async mixed-pitch deadgrep wgrep coterm doom-themes with-editor zenburn-theme yasnippet-snippets yaml-mode which-key undo-tree tabbar session rust-mode puppet-mode pod-mode notmuch muttrc-mode mutt-alias lsp-mode initsplit ido-completing-read+ htmlize graphviz-dot-mode goto-chg gitignore-mode gitconfig-mode gitattributes-mode git-modes folding flycheck ess eproject editorconfig diminish csv-mode color-theme-modern browse-kill-ring boxquote bm bar-cursor apache-mode projectile embark-consult))
  '(safe-local-variable-values
-   '((eval outline-hide-sublevels 2) (Package . CL-WHO)
-     (Package . HUNCHENTOOT) (Base . 10) (Package . CL-USER)
-     (Syntax . COMMON-LISP) (eval sly-connect "localhost" 9090)
-     (sly-port . 9090) (checkdoc-package-keywords-flag))))
+   '((eval outline-hide-sublevels 2)
+     (Package . CL-WHO)
+     (Package . HUNCHENTOOT)
+     (Base . 10)
+     (Package . CL-USER)
+     (Syntax . COMMON-LISP)
+     (eval sly-connect "localhost" 9090)
+     (sly-port . 9090)
+     (checkdoc-package-keywords-flag))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index 1632a40..e30b838 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -1,9 +1,13 @@
 ;;; -*- lexical-binding: t; -*-
 ;;;; Elpaca package setup
-;; NixOS emacs doesn't include a build time. Assume a recent version.
-(setq elpaca-core-date 20240101)
-(setq elpaca-directory "~/.cache/emacs/elpaca")
-(load-file (expand-file-name "elpaca-installer.el" user-emacs-directory))
+;; ;; NixOS emacs doesn't include a build time. Assume a recent version.
+;; (setq elpaca-core-date 20240101)
+;; (setq elpaca-directory "~/.cache/emacs/elpaca")
+;; (load-file (expand-file-name "elpaca-installer.el" user-emacs-directory))
+
+(with-eval-after-load 'package
+  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
+(setopt use-package-always-ensure t)
 
 (add-hook 'emacs-startup-hook
           (lambda ()
@@ -13,12 +17,12 @@
                               (time-subtract after-init-time before-init-time)))
                      gcs-done)))
 
-(elpaca elpaca-use-package
-  ;; Enable :elpaca use-package keyword.
-  (elpaca-use-package-mode)
-  ;; Assume :elpaca t unless otherwise specified.
-  (setq elpaca-use-package-by-default t))
-(elpaca-wait)
+;; (elpaca elpaca-use-package
+;;   ;; Enable :ensure use-package keyword.
+;;   (elpaca-use-package-mode)
+;;   ;; Assume :ensure t unless otherwise specified.
+;;   (setq elpaca-use-package-by-default t))
+;; (elpaca-wait)
 
 ;;;; GC and performance
 (use-package gcmh
@@ -482,7 +486,6 @@
 ;; (use-package transient)
 (use-package magit
   :after transient
-  :ensure (:wait t)
   :bind (:map magit-repolist-mode-map
               ("c" . magit-clone)
               ("i" . magit-init)
diff --git a/emacs/.config/emacs/lisp/kj-bindings.el b/emacs/.config/emacs/lisp/kj-bindings.el
index e01b659..ff89033 100644
--- a/emacs/.config/emacs/lisp/kj-bindings.el
+++ b/emacs/.config/emacs/lisp/kj-bindings.el
@@ -1,6 +1,6 @@
 ;;; -*- lexical-binding: t; -*-
 
-(use-package emacs :elpaca nil
+(use-package emacs :ensure nil
   :bind
   (("C-w" . kj/kill-word-or-region)
    ("C-c s" . kj/shell-here)
diff --git a/emacs/.config/emacs/lisp/kj-development.el b/emacs/.config/emacs/lisp/kj-development.el
index d404718..e8a2d72 100644
--- a/emacs/.config/emacs/lisp/kj-development.el
+++ b/emacs/.config/emacs/lisp/kj-development.el
@@ -1,9 +1,10 @@
 ;;; -*- lexical-binding: t; -*-
 (setq tab-stop-list (number-sequence 4 200 4))
 
-(use-package eglot :elpaca nil
+(use-package eglot :ensure t
   :config
-  (setq eglot-events-buffer-size 0))
+  ;;;(setq eglot-events-buffer-size 0)
+  )
 
 (use-package puni
   :defer t
@@ -108,7 +109,7 @@
 (use-package yaml-mode
   :mode "\\.\(yml|yaml\)\\'")
 
-(use-package ansi-color :elpaca nil
+(use-package ansi-color :ensure nil
   :hook (compilation-filter . ansi-color-compilation-filter))
 
 (use-package diff-hl
@@ -131,7 +132,7 @@
 ;;   :custom
 ;;   (inferior-lisp-program "sbcl"))
 
-(use-package emacs :elpaca nil
+(use-package emacs :ensure nil
   :defer 1
   :after consult
   :init
diff --git a/emacs/.config/emacs/lisp/kj-eshell.el b/emacs/.config/emacs/lisp/kj-eshell.el
index 5617658..6de46cf 100644
--- a/emacs/.config/emacs/lisp/kj-eshell.el
+++ b/emacs/.config/emacs/lisp/kj-eshell.el
@@ -1,5 +1,5 @@
 ;;; -*- lexical-binding: t; -*-
-(use-package eshell :elpaca nil
+(use-package eshell :ensure nil
   :bind
   (:map eshell-mode-map
         ("M-r" . consult-history))
diff --git a/emacs/.config/emacs/lisp/kj-history.el b/emacs/.config/emacs/lisp/kj-history.el
index 9805aa1..790e35c 100644
--- a/emacs/.config/emacs/lisp/kj-history.el
+++ b/emacs/.config/emacs/lisp/kj-history.el
@@ -11,7 +11,7 @@
       ;; Command
       (group (1+ (not "\n")))))
 
-(use-package emacs :elpaca nil
+(use-package emacs :ensure nil
   :after consult
   :config
   (defun kj/get-shell-history ()
diff --git a/emacs/.config/emacs/lisp/kj-init.el b/emacs/.config/emacs/lisp/kj-init.el
index bd394b9..a5b4f2a 100644
--- a/emacs/.config/emacs/lisp/kj-init.el
+++ b/emacs/.config/emacs/lisp/kj-init.el
@@ -64,7 +64,7 @@
 ;;   (set-face-attribute 'variable-pitch nil :font "Noto Serif"))
 
 ;;; Compilation settings
-(use-package compile :elpaca nil
+(use-package compile :ensure nil
   :config
   (setq compilation-ask-about-save nil)
   (setq compilation-scroll-output 'first-error)
@@ -91,7 +91,7 @@
   :bind (:map projectile-mode-map
               ("C-x p" . projectile-command-map)))
 
-(use-package emacs :elpaca nil
+(use-package emacs :ensure nil
   :config
   (setq ediff-diff-options "-w" ; turn off whitespace checking
 	ediff-split-window-function #'split-window-horizontally
@@ -212,7 +212,7 @@
 ;;   (define-key meow-insert-state-keymap "\C-[" #'meow-insert-exit)
 ;;   )
 
-(use-package emacs :elpaca nil
+(use-package emacs :ensure nil
   :hook (dired-mode . dired-omit-mode)
   :init
   (setq dired-dwim-target t  ; suggest a target for moving/copying intelligently
@@ -381,7 +381,7 @@
       char-fold-symmetric t
       isearch-lax-whitespace t
       search-default-mode 'char-fold-to-regexp)
-(use-package char-fold :elpaca nil
+(use-package char-fold :ensure nil
   :config
   (setopt char-fold-include
           (cons '(?- "_" "-") char-fold-include)))
@@ -473,7 +473,7 @@
     (load-file google-config-file)))
 
 ;; Special symbols
-(use-package emacs :elpaca nil
+(use-package emacs :ensure nil
   :defer 1
   :config
   (defvar kj/iso-transl-char-map