summaryrefslogtreecommitdiff
path: root/mms-configuration.org
diff options
context:
space:
mode:
authormms <michal@sapka.me>2024-05-06 17:07:26 +0200
committermms <michal@sapka.me>2024-05-06 17:10:57 +0200
commitacb3382cbfc89786ff19519f17cf1c09fff8ec11 (patch)
tree80e75a2d03ccafc3ecea25baeff445d73ad70a5c /mms-configuration.org
parentea2d15abbb6222fd74504d7f35540f502e5aaa00 (diff)
chore: bump elpaca
Diffstat (limited to 'mms-configuration.org')
-rw-r--r--mms-configuration.org76
1 files changed, 39 insertions, 37 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