feat!(core): replace straight with the builtin package

Author: abougouffa

core/me-backports.el

@@ -0,0 +1,90 @@
+;;; me-backports.el --- Port the `use-package's `:vc' feature for Emacs 29 -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022-2024  Abdelhak Bougouffa
+
+;; Author: Abdelhak Bougouffa  (rot13 "nobhtbhssn@srqbencebwrpg.bet")
+
+;;; Commentary:
+
+;;; Code:
+
+(when (> emacs-major-version 29)
+  (error "This module should only be used from Emacs 29"))
+
+(require 'use-package)
+(require 'package-vc)
+
+(add-to-list 'use-package-keywords :vc)
+
+(defvar use-package-vc-prefer-newest nil)
+
+(defun use-package-vc-install (arg &optional local-path)
+  (pcase-let* ((`(,name ,opts ,rev) arg)
+               (spec (if opts (cons name opts) name)))
+    (unless (package-installed-p name)
+      (if local-path
+          (package-vc-install-from-checkout local-path (symbol-name name))
+        (package-vc-install spec rev)))))
+
+(defun use-package-handler/:vc (name _keyword arg rest state)
+  (let ((body (use-package-process-keywords name rest state))
+        (local-path (car (plist-get state :load-path))))
+    ;; See `use-package-handler/:ensure' for an explanation.
+    (if (bound-and-true-p byte-compile-current-file)
+        (funcall #'use-package-vc-install arg local-path)        ; compile time
+      (push `(use-package-vc-install ',arg ,local-path) body))   ; runtime
+    body))
+
+(defconst use-package-vc-valid-keywords '(:url :branch :lisp-dir :main-file :vc-backend :rev :shell-command :make :ignored-files))
+
+(defun use-package-normalize--vc-arg (arg)
+  (cl-flet* ((ensure-string (s)
+               (if (and s (stringp s)) s (symbol-name s)))
+             (ensure-symbol (s)
+               (if (and s (stringp s)) (intern s) s))
+             (normalize (k v)
+               (pcase k
+                 (:rev (pcase v
+                         ('nil (if use-package-vc-prefer-newest nil :last-release))
+                         (:last-release :last-release)
+                         (:newest nil)
+                         (_ (ensure-string v))))
+                 (:vc-backend (ensure-symbol v))
+                 (:ignored-files (if (listp v) v (list v)))
+                 (_ (ensure-string v)))))
+    (pcase-let* ((`(,name . ,opts) arg))
+      (if (stringp opts)                ; (NAME . VERSION-STRING) ?
+          (list name opts)
+        (let ((opts (use-package-split-when
+                     (lambda (el)
+                       (seq-contains-p use-package-vc-valid-keywords el))
+                     opts)))
+          ;; Error handling
+          (cl-loop for (k . _) in opts
+                   if (not (member k use-package-vc-valid-keywords))
+                   do (use-package-error
+                       (format "Keyword :vc received unknown argument: %s. Supported keywords are: %s"
+                               k use-package-vc-valid-keywords)))
+          ;; Actual normalization
+          (list name
+                (cl-loop for (k . v) in opts
+                         if (not (eq k :rev))
+                         nconc (list k (normalize k (if (length= v 1) (car v) v))))
+                (normalize :rev (car (alist-get :rev opts)))))))))
+
+(defun use-package-normalize/:vc (name _keyword args)
+  (let ((arg (car args)))
+    (pcase arg
+      ((or 'nil 't) (list name))                 ; guess name
+      ((pred symbolp) (list arg))                ; use this name
+      ((pred stringp) (list name arg))           ; version string + guess name
+      (`(,(pred keywordp) . ,(pred listp))       ; list + guess name
+       (use-package-normalize--vc-arg (cons name arg)))
+      (`(,(pred symbolp) . ,(or (pred listp)     ; list/version string + name
+                             (pred stringp)))
+       (use-package-normalize--vc-arg arg))
+      (_ (use-package-error "Unrecognized argument to :vc")))))
+
+
+(provide 'me-backports)
+;;; me-backports.el ends here

core/me-bootstrap.el

@@ -1,4 +1,4 @@
-;; me-bootstrap.el --- Bootstrap packages (straight & use-package) -*- lexical-binding: t; -*-
+;; me-bootstrap.el --- Initialize package management -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2022-2024  Abdelhak Bougouffa
 
@@ -8,45 +8,13 @@
 
 ;;; Code:
 
-(setq
- ;; Base directory
- straight-base-dir minemacs-local-dir
- ;; Add Emacs version and the Git hash to the build directory to avoid problems
- straight-build-dir (format "build-%s%s" emacs-version (if emacs-repository-version (format "-%s" (substring emacs-repository-version 0 8)) ""))
- ;; Use the "develop" branch on straight.el's repo.
- straight-repository-branch "develop"
- ;; Do not slow startup by checking for package modifs, check only on demand
- straight-check-for-modifications '(check-on-save find-when-checking))
-
-;; Bootstrapping straight.el
-;; See: https://github.com/radian-software/straight.el#bootstrapping-straightel
-(defvar bootstrap-version)
-(let ((bootstrap-file (concat straight-base-dir "straight/repos/straight.el/bootstrap.el"))
-      (install-url "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el")
-      (bootstrap-version 7))
-  (unless (file-exists-p bootstrap-file)
-    (with-current-buffer (url-retrieve-synchronously install-url 'silent 'inhibit-cookies)
-      (goto-char (point-max))
-      (eval-print-last-sexp)))
-  (load bootstrap-file nil 'nomessage))
-
-;; HACK+PERF: Reduce installation time and disk usage using "--filter=tree:0",
-;; this cuts the size of the "repos" directory by more than half (from 807M to
-;; 362M) while keeping it possible to download older commits on-demand (unlike
-;; "--depth=N"). The parameter is injected in `straight--process-run' which is
-;; called from `straight-vc-git--clone-internal'
-(advice-add
- 'straight--process-run :around
- (lambda (fn &rest a)
-   (apply fn (if (equal (list (car a) (cadr a)) '("git" "clone")) `(,(car a) ,(cadr a) "--filter=tree:0" ,@(cddr a)) a))))
-
-;; Configure `use-package'
-(unless (require 'use-package nil t)
-  (straight-use-package 'use-package))
-
-(cl-callf append straight-built-in-pseudo-packages
-  '(treesit ; Some packages like `ts-movement' depends on it
-    docker-tramp)) ; Needed by some packages like `ros', but provided by `tramp'
+(require 'me-lib)
+(require 'package)
+(require 'use-package)
+
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
+(add-to-list 'package--builtins '(treesit . [nil nil "Tree-Sitter integration"])) ; Some packages like `ts-movement' depends on it
+(add-to-list 'package--builtins '(docker-tramp . [nil nil "Tree-Sitter integration"])) ; Needed by some packages like `ros', but provided by `tramp'
 
 (setq
  ;; Set `use-package' to verbose when MinEmacs is started in verbose mode
@@ -57,21 +25,38 @@
  ;; 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
+;;; `use-package' extensions
+;; Add `:vc' support for `use-package' in Emacs 29
+(unless (> emacs-major-version 29) (require 'me-backports))
+
+;; Prefer the newest commit over the latest release
+(setq use-package-vc-prefer-newest t)
+
+;; Add `:trigger-commands', allow loading the package before executing a
+;; specific external command/function.
+(add-to-list 'use-package-keywords :trigger-commands)
+
+;; `:trigger-commands' implementation
+(defun use-package-normalize/:trigger-commands (name keyword args)
+  (setq args (use-package-normalize-recursive-symlist name keyword args))
+  (if (consp args) args (list args)))
+
+(defun use-package-handler/:trigger-commands (name _keyword arg rest state)
+  (use-package-concat
+   (unless (plist-get state :demand)
+     `((satch-add-advice ',(delete-dups arg) :before (lambda (&rest _args) (require ',name)) nil :transient t)))
+   (use-package-process-keywords name rest state)))
+
+
+;;; 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")
-  :pin-ref "a6f950c29c846a50018bc63695f24f611c1a58be")
+  :vc (:url "https://github.com/emacs-magus/once" :rev "a6f950c29c846a50018bc63695f24f611c1a58be"))
 
 (use-package satch
-  :straight (:host github :repo "emacs-magus/satch.el")
-  :pin-ref "77993b711cccf16702fdc8d21d8f8ba10d7bd0fb")
+  :vc (:url "https://github.com/emacs-magus/satch.el" :rev "77993b711cccf16702fdc8d21d8f8ba10d7bd0fb"))
 
 
 (provide 'me-bootstrap)
-
 ;;; me-bootstrap.el ends here

core/me-builtin.el

@@ -221,8 +221,7 @@ or file path may exist now."
   (+setq-hook! python-mode comment-inline-offset 2))
 
 (use-package compat
-  :straight (:source gnu-elpa-mirror)
-  :demand)
+  :ensure t)
 
 (use-package crm
   :config
@@ -234,15 +233,15 @@ or file path may exist now."
      (cons (format "[CRM%s] %s" (replace-regexp-in-string "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" "" crm-separator) (car args)) (cdr args)))))
 
 (use-package transient
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :autoload transient-define-prefix transient-define-infix transient-define-suffix
   :bind (:map
          transient-map ; Map ESC and q to quit transient
          ("q" . transient-quit-one)
          ("<escape>" . transient-quit-one)))
 
 (use-package which-key
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :hook (minemacs-lazy . which-key-mode)
   :custom
   (which-key-idle-delay 1.0)
@@ -258,7 +257,7 @@ or file path may exist now."
   (which-key-setup-minibuffer))
 
 (use-package tramp
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :init
   (if (+emacs-options-p 'os/win)
       (when (executable-find "plink")
@@ -328,7 +327,7 @@ or file path may exist now."
   (doc-view-mupdf-use-svg (+emacs-options-p 'rsvg)))
 
 (use-package project
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :commands (project-remember-projects-under)
   :hook (kill-emacs . +project-forget-zombie-projects)
   :custom
@@ -401,14 +400,14 @@ or file path may exist now."
     (setcdr (assq 'explicit-name tab) 'def)))
 
 (use-package editorconfig
-  :straight t
-  :hook (minemacs-first-file . editorconfig-mode)
-  :config
-  ;; Exclude compressed files
-  (push "\\.\\(zip\\|epub\\|\\(doc\\|xls\\|ppt\\)x\\)\\'" editorconfig-exclude-regexps))
+  :ensure t
+  :hook (minemacs-first-file . editorconfig-mode))
+;; :config
+;; ;; Exclude compressed files
+;; (push "\\.\\(zip\\|epub\\|\\(doc\\|xls\\|ppt\\)x\\)\\'" editorconfig-exclude-regexps))
 
 (use-package flymake
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :hook ((prog-mode conf-mode) . flymake-mode)
   :custom
   (flymake-fringe-indicator-position 'right-fringe)
@@ -586,7 +585,7 @@ or file path may exist now."
         hs-special-modes-alist '((t)))))
 
 (use-package xref
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :custom
   ;; Use completion in the minibuffer instead of definitions buffer
   (xref-show-definitions-function #'xref-show-definitions-completing-read)
@@ -603,7 +602,7 @@ or file path may exist now."
   (+setq-hook! xref--xref-buffer-mode truncate-lines t))
 
 (use-package eglot
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :custom
   (eglot-autoshutdown t) ; shutdown after closing the last managed buffer
   (eglot-sync-connect 0) ; async, do not block
@@ -654,7 +653,7 @@ or file path may exist now."
   (imenu-max-item-length 120)) ; Show longer definitions (def. 60)
 
 (use-package eldoc
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :custom
   (eldoc-documentation-strategy #'eldoc-documentation-compose))
 
@@ -694,7 +693,7 @@ or file path may exist now."
   (gdb-display-io-nopopup nil)) ; in case we enabled the IO buffer, we don't want it to popup when hidden
 
 (use-package org
-  :straight (:source gnu-elpa-mirror)
+  :ensure t
   :preface
   ;; Set to nil so we can detect user changes (in config.el)
   (setq org-directory nil)

core/me-lib.el

@@ -223,7 +223,7 @@ If `minemacs-verbose-p' is non-nil, do not print any message to
         (+error! "Cannot load theme %S, trying to load the default theme %S" minemacs-theme default-theme)
         (unless (ignore-errors (load-theme default-theme t))
           (+error! "Cannot load default theme %S, falling back to the builtin tsdh-light theme" default-theme)
-          (load-theme 'tsdh-light t)))))
+          (load-theme 'modus-operandi t)))))
   ;; Run hooks
   (run-hooks 'minemacs-after-load-theme-hook))