tweak(bootstrap): pin once and satch for better stability

Author: abougouffa

core/me-bootstrap.el

@@ -43,16 +43,19 @@
  ;; Make the expanded code as minimal as possible, do not try to catch errors
  use-package-expand-minimally (not minemacs-debug-p))
 
+;; Add the `:pin-ref' extension to integrate `straight' with `use-package'. And
+;; add support for `minemacs-disabled-packages'.
+(require 'me-use-package-extra)
+
 ;; Extra utilities
+;; Be cautious about the installed revision of `once' and `satch' as they aren't stable yet
 (use-package once
-  :straight (:host github :repo "emacs-magus/once"))
+  :straight (:host github :repo "emacs-magus/once")
+  :pin-ref "a6f950c29c846a50018bc63695f24f611c1a58be")
 
 (use-package satch
-  :straight (:host github :repo "emacs-magus/satch.el"))
-
-;; Add the `:pin-ref' extension to integrate `straight' with `use-package'. And
-;; add support for `minemacs-disabled-packages'.
-(require 'me-use-package-extra)
+  :straight (:host github :repo "emacs-magus/satch.el")
+  :pin-ref "77993b711cccf16702fdc8d21d8f8ba10d7bd0fb")
 
 
 (provide 'me-bootstrap)

core/me-use-package-extra.el

@@ -69,27 +69,27 @@
   ;; from it. This advice also evaluates `use-package's conditional sections
   ;; (`:if', `:when' and `:unless') to prevent installing packages with
   ;; `straight'.
-  (advice-add
-   'use-package :around
-   (satch-defun +use-package--check-if-disabled:around-a (origfn package &rest args)
-     (if (or (+package-disabled-p package)
-             (and (memq :if args)
-                  (not (and (memq :if args) (eval (+varplist-get args :if t)))))
-             (and (memq :when args)
-                  (not (and (memq :when args) (eval (+varplist-get args :when t)))))
-             (and (memq :unless args)
-                  (not (and (memq :unless args) (not (eval (+varplist-get args :unless t)))))))
-         ;; Register the package but don't enable it, useful when creating the lockfile,
-         ;; this is the official straight.el way for conditionally installing packages
-         (when-let* ((recipe (+varplist-get args :straight t)))
-           (let* ((recipe (if (eq recipe t) (list package) recipe))
-                  (car-recipe (and (listp recipe) (car recipe)))
-                  (car-recipe-is-pkg (and (symbolp car-recipe) (not (keywordp car-recipe))))
-                  (recipe (if (and car-recipe car-recipe-is-pkg) recipe (append (list package) recipe))))
-             (straight-register-package recipe)))
-       ;; Otherwise, add it to the list of configured packages and apply the `use-package' form
-       (add-to-list 'minemacs-configured-packages package t)
-       (apply origfn package args))))
+  (defun +use-package--check-if-disabled:around-a (origfn package &rest args)
+    (if (or (+package-disabled-p package)
+            (and (memq :if args)
+                 (not (and (memq :if args) (eval (+varplist-get args :if t)))))
+            (and (memq :when args)
+                 (not (and (memq :when args) (eval (+varplist-get args :when t)))))
+            (and (memq :unless args)
+                 (not (and (memq :unless args) (not (eval (+varplist-get args :unless t)))))))
+        ;; Register the package but don't enable it, useful when creating the lockfile,
+        ;; this is the official straight.el way for conditionally installing packages
+        (when-let* ((recipe (+varplist-get args :straight t)))
+          (let* ((recipe (if (eq recipe t) (list package) recipe))
+                 (car-recipe (and (listp recipe) (car recipe)))
+                 (car-recipe-is-pkg (and (symbolp car-recipe) (not (keywordp car-recipe))))
+                 (recipe (if (and car-recipe car-recipe-is-pkg) recipe (append (list package) recipe))))
+            (straight-register-package recipe)))
+      ;; Otherwise, add it to the list of configured packages and apply the `use-package' form
+      (add-to-list 'minemacs-configured-packages package t)
+      (apply origfn package args)))
+
+  (advice-add 'use-package :around #'+use-package--check-if-disabled:around-a)
 
   ;; If you want to keep the `+use-package--check-if-disabled:around-a' advice after
   ;; loading MinEmacs' modules. You need to set in in your
@@ -99,11 +99,11 @@
   ;; The previous advice will be removed after loading MinEmacs packages to avoid
   ;; messing with the user configuration (for example, if the user manually
   ;; install a disabled package).
-  (add-hook
-   'minemacs-after-loading-modules-hook
-   (satch-defun +use-package--remove-check-if-disabled-advice-h ()
-     (unless +use-package-keep-checking-for-disabled-p
-       (advice-remove 'use-package '+use-package--check-if-disabled:around-a)))))
+  (defun +use-package--remove-check-if-disabled-advice-h ()
+    (unless +use-package-keep-checking-for-disabled-p
+      (advice-remove 'use-package '+use-package--check-if-disabled:around-a)))
+
+  (add-hook 'minemacs-after-loading-modules-hook #'+use-package--remove-check-if-disabled-advice-h))
 
 
 (provide 'me-use-package-extra)