chore: bump elpaca

3 files changed, 40 insertions, 41 deletions

diff --git a/mms-configuration.org b/mms-configuration.org
index 2ceeb28..b66d3ca 100644
--- a/mms-configuration.org
+++ b/mms-configuration.org
@@ -76,42 +76,44 @@ A lot of emacsers tend to use Straight, but Elpaca seems more modern with asynch
 This, of course, is a can of worms.
 
 #+BEGIN_SRC emacs-lisp
-  (defvar elpaca-installer-version 0.6)
-  (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
-  (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
-  (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
-  (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
-                                :ref nil
-                                :files (:defaults (:exclude "extensions"))
-                                :build (:not elpaca--activate-package)))
-  (let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
-         (build (expand-file-name "elpaca/" elpaca-builds-directory))
-         (order (cdr elpaca-order))
-         (default-directory repo))
-    (add-to-list 'load-path (if (file-exists-p build) build repo))
-    (unless (file-exists-p repo)
-      (make-directory repo t)
-      (when (< emacs-major-version 28) (require 'subr-x))
-      (condition-case-unless-debug err
-          (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
-                   ((zerop (call-process "git" nil buffer t "clone"
-                                         (plist-get order :repo) repo)))
-                   ((zerop (call-process "git" nil buffer t "checkout"
-                                         (or (plist-get order :ref) "--"))))
-                   (emacs (concat invocation-directory invocation-name))
-                   ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
-                                         "--eval" "(byte-recompile-directory \".\" 0 'force)")))
-                   ((require 'elpaca))
-                   ((elpaca-generate-autoloads "elpaca" repo)))
-              (kill-buffer buffer)
-            (error "%s" (with-current-buffer buffer (buffer-string))))
-        ((error) (warn "%s" err) (delete-directory repo 'recursive))))
-    (unless (require 'elpaca-autoloads nil t)
-      (require 'elpaca)
-      (elpaca-generate-autoloads "elpaca" repo)
-      (load "./elpaca-autoloads")))
-  (add-hook 'after-init-hook #'elpaca-process-queues)
-  (elpaca `(,@elpaca-order))
+(defvar elpaca-installer-version 0.7)
+(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
+(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
+(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
+(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
+                              :ref nil :depth 1
+                              :files (:defaults "elpaca-test.el" (:exclude "extensions"))
+                              :build (:not elpaca--activate-package)))
+(let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
+       (build (expand-file-name "elpaca/" elpaca-builds-directory))
+       (order (cdr elpaca-order))
+       (default-directory repo))
+  (add-to-list 'load-path (if (file-exists-p build) build repo))
+  (unless (file-exists-p repo)
+    (make-directory repo t)
+    (when (< emacs-major-version 28) (require 'subr-x))
+    (condition-case-unless-debug err
+        (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
+                 ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
+                                                 ,@(when-let ((depth (plist-get order :depth)))
+                                                     (list (format "--depth=%d" depth) "--no-single-branch"))
+                                                 ,(plist-get order :repo) ,repo))))
+                 ((zerop (call-process "git" nil buffer t "checkout"
+                                       (or (plist-get order :ref) "--"))))
+                 (emacs (concat invocation-directory invocation-name))
+                 ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
+                                       "--eval" "(byte-recompile-directory \".\" 0 'force)")))
+                 ((require 'elpaca))
+                 ((elpaca-generate-autoloads "elpaca" repo)))
+            (progn (message "%s" (buffer-string)) (kill-buffer buffer))
+          (error "%s" (with-current-buffer buffer (buffer-string))))
+      ((error) (warn "%s" err) (delete-directory repo 'recursive))))
+  (unless (require 'elpaca-autoloads nil t)
+    (require 'elpaca)
+    (elpaca-generate-autoloads "elpaca" repo)
+    (load "./elpaca-autoloads")))
+(add-hook 'after-init-hook #'elpaca-process-queues)
+(elpaca `(,@elpaca-order))
  #+end_src
 
 #+begin_src emacs-lisp
@@ -191,5 +193,5 @@ Dimish will hide them from the modeline, even if they are enabled.
 
 #+begin_src emacs-lisp
   (use-package diminish
-    :elpaca t)
+    :ensure t)
 #+end_src
diff --git a/mms-keyboard.org b/mms-keyboard.org
index 17205b4..946e2f9 100644
--- a/mms-keyboard.org
+++ b/mms-keyboard.org
@@ -20,7 +20,6 @@ This time I am starting with Evil so anything I add to this config will be confi
 
 #+BEGIN_SRC emacs-lisp
    (use-package evil
-     :elpaca t
      :ensure t
      :init
      (setq evil-want-keybinding nil
@@ -54,7 +53,6 @@ It's also good that those bindings are kinda good actually.
 
 #+BEGIN_SRC emacs-lisp
 (use-package evil-collection
-  :elpaca t
   :after evil
   :ensure t
   :config
@@ -71,7 +69,6 @@ All those bindings here should be to moved dedicated sections, but for now they
 #+BEGIN_SRC emacs-lisp
   (use-package general
     :ensure t
-    :elpaca t
     :config
     (setq general-use-package-emit-autoloads t)
     (general-evil-setup))
diff --git a/mms-misc.org b/mms-misc.org
index 3c0c8e2..ffff32c 100644
--- a/mms-misc.org
+++ b/mms-misc.org
@@ -174,7 +174,7 @@ Yeah, I'm trying it.
 
 #+begin_src emacs-lisp
   (use-package gnus
-    :elpaca nil
+    :ensure nil
     :config
     (setq gnus-select-method '(nntp "news.gwene.org")) ;; Read feeds/atom through gwene
     (setq gnus-summary-line-format "%U%R%z%d %I%(%[ %F %] %s %)\n"))