diff options
Diffstat (limited to '.emacs.d/lisp/init-packages.el')
| -rw-r--r-- | .emacs.d/lisp/init-packages.el | 87 |
1 files changed, 50 insertions, 37 deletions
diff --git a/.emacs.d/lisp/init-packages.el b/.emacs.d/lisp/init-packages.el index 8455f2d..57a6859 100644 --- a/.emacs.d/lisp/init-packages.el +++ b/.emacs.d/lisp/init-packages.el @@ -2,55 +2,68 @@ ;;; Commentary: ;;; Code: -;; TODO - straight.el? - -(require 'package) -(require 'url) +(defvar initial-features features) (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("melpa-stable" . "https://stable.melpa.org/packages/") ("nongnu" . "https://elpa.nongnu.org/nongnu/") ("elpa" . "https://elpa.gnu.org/packages/"))) -(setq package-pinned-packages '((cider . "melpa-stable"))) -(package-initialize) -(unless package-archive-contents - (package-refresh-contents)) +(setq straight-use-package-by-default t + straight-vc-git-default-clone-depth 1 + straight-check-for-modifications '(find-when-checking check-on-save) + use-package-always-defer t + package-native-compile t) -(setq package-native-compile t) +(defvar bootstrap-version) + (let ((bootstrap-file + (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) + (bootstrap-version 6)) + (unless (file-exists-p bootstrap-file) + (with-current-buffer + (url-retrieve-synchronously + "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" + 'silent 'inhibit-cookies) + (goto-char (point-max)) + (eval-print-last-sexp))) + (load bootstrap-file nil 'nomessage)) -(unless (package-installed-p 'use-package) - (package-install 'use-package)) -(require 'use-package) +(straight-use-package 'use-package) -(setq use-package-always-ensure t - use-package-always-defer t) +;; https://github.com/radian-software/radian/blob/e3aad124c8e0cc870ed09da8b3a4905d01e49769/emacs/radian.el#L352 +(defmacro use-feature (name &rest args) + "Like `use-package', but with `straight-use-package-by-default' disabled. +`NAME' and `ARGS' are as with `use-package'" + (declare (indent defun)) + `(use-package ,name + :straight nil + ,@args)) +(use-feature straight-x + :commands (straight-x-fetch-all)) (use-package diminish) -(use-package epl - :if noninteractive - :demand t - :config - ;; TODO make a copy of the built-in check for system packages work instead - (defvar my/system-packages '(vterm)) - ;; emacs -Q --batch -L "~/.emacs.d/lisp/" -l "init-packages.el" -f "my/upgrade-packages" - (defun my/upgrade-packages () - (interactive) - (epl-refresh) - (when-let ((upgrades (seq-filter (lambda (u) - (not (member - (epl-package-name (epl-upgrade-available u)) - my/system-packages))) - (epl-find-upgrades)))) - ;; TODO why doesn't this work? - ;; (epl-upgrade (mapcar 'epl-upgrade-available upgrades) - (dolist (upgrade upgrades) - (epl-package-install (epl-upgrade-available upgrade) 'force) - (epl-package-delete (epl-upgrade-installed upgrade)))) - (message "Package upgrade finished.") - ;; TODO does this help async native-comp to finish when called from the command line? - (sit-for 30))) +(defun run-straight-lock-file-function (func) + "Safely run straight lockfile-related function `FUNC'. +This will set `features' back the value it had before loading straight, to ensure +that everything loaded by `require' or `use-package' is re-loaded." + (setq features initial-features) + (funcall func)) + +(defun my/upgrade-packages () + "Upgrade all packages installed with straight." + (interactive) + (straight-pull-recipe-repositories) ;; TODO is this needed? + (straight-x-fetch-all) + (straight-merge-all) + (straight-check-all) + ;; Do this automatically, as we can always revert and thaw + (run-straight-lock-file-function 'straight-freeze-versions)) + +(defun my/thaw-packages () + "Restore all packages to the versions in the straight lockfile." + (interactive) + (run-straight-lock-file-function 'straight-thaw-versions)) (provide 'init-packages) ;;; init-packages.el ends here |