Update for elpaca :ensure changes

5 files changed, 8 insertions, 9 deletions

diff --git a/.emacs.d/lisp/init-completion.el b/.emacs.d/lisp/init-completion.el
index 2e9c81a..cac9c0a 100644
--- a/.emacs.d/lisp/init-completion.el
+++ b/.emacs.d/lisp/init-completion.el
@@ -133,7 +133,7 @@ no words in between, beginning with the first word."
 
 ;; code completion - corfu
 (use-package corfu
-  :elpaca (corfu :files (:defaults "extensions/*"))
+  :ensure (corfu :files (:defaults "extensions/*"))
   :custom
   (corfu-cycle t)
   :bind (:map corfu-map
diff --git a/.emacs.d/lisp/init-editor.el b/.emacs.d/lisp/init-editor.el
index b079df6..d95dfe6 100644
--- a/.emacs.d/lisp/init-editor.el
+++ b/.emacs.d/lisp/init-editor.el
@@ -215,7 +215,7 @@
   :bind ("C-c c t t" . titlecase-dwim))
 
 (use-package caser
-  :elpaca (caser :host github :repo "emacsmirror/caser")
+  :ensure (caser :host github :repo "emacsmirror/caser")
   :bind
   ("C-c c c" . caser-camelcase-dwim)
   ("C-c c s" . caser-snakecase-dwim)
diff --git a/.emacs.d/lisp/init-minibuffer.el b/.emacs.d/lisp/init-minibuffer.el
index 13dbf96..9fbcf0c 100644
--- a/.emacs.d/lisp/init-minibuffer.el
+++ b/.emacs.d/lisp/init-minibuffer.el
@@ -6,7 +6,7 @@
 ;;; Code:
 
 (use-package vertico
-  :elpaca (vertico :files (:defaults "extensions/*"))
+  :ensure (vertico :files (:defaults "extensions/*"))
   :hook (elpaca-after-init . vertico-mode)
   :custom (vertico-cycle t)
   :config
diff --git a/.emacs.d/lisp/init-packages.el b/.emacs.d/lisp/init-packages.el
index 5af7d25..38c6c77 100644
--- a/.emacs.d/lisp/init-packages.el
+++ b/.emacs.d/lisp/init-packages.el
@@ -43,10 +43,9 @@
 
 ;; Install use-package support
 (elpaca elpaca-use-package
-  ;; Enable :elpaca use-package keyword.
+  ;; Enable use-package :ensure support for Elpaca.
   (elpaca-use-package-mode)
-  ;; Assume :elpaca t unless otherwise specified.
-  (setq elpaca-use-package-by-default t
+  (setq use-package-always-ensure t
         use-package-always-defer t
         package-native-compile t
         elpaca-queue-limit 10)
@@ -108,7 +107,7 @@
 `NAME' and `ARGS' are as with `use-package'"
   (declare (indent defun))
   `(use-package ,name
-     :elpaca nil
+     :ensure nil
      ,@args))
 
 ;; useful for corfu and vertico extensions
@@ -117,7 +116,7 @@
 `PKG' is the name of the package, `NAME' and `ARGS' are as with `use-package'"
   (declare (indent defun))
   `(use-package ,name
-     :elpaca nil
+     :ensure nil
      :after ,pkg
      :demand t
      ,@args))
diff --git a/.emacs.d/lisp/init-ui.el b/.emacs.d/lisp/init-ui.el
index 0677c30..0c12934 100644
--- a/.emacs.d/lisp/init-ui.el
+++ b/.emacs.d/lisp/init-ui.el
@@ -200,7 +200,7 @@
     (setq-local sp-local-pairs (seq-filter '(lambda (x) (not (string= "'" (cadr x)))) sp-local-pairs))))
 
 (use-package highlight-sexp
-  :elpaca (highlight-sexp :host github :repo "daimrod/highlight-sexp")
+  :ensure (highlight-sexp :host github :repo "daimrod/highlight-sexp")
   :diminish
   ;; TODO grey8 ?
   :custom (hl-sexp-background-color "grey10")