From 75aa147246af45652eec3827bf9b38fb63523ca2 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Mon, 10 Oct 2022 20:44:26 +0100 Subject: [PATCH] Tweak straight config --- .emacs.d/init.el | 1 - .emacs.d/lisp/init-packages.el | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 582a1f5..36528a6 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -21,7 +21,6 @@ (add-hook 'emacs-startup-hook (lambda () (message "%s packages loaded in %0.1f seconds" - ;;(length package-activated-list) (hash-table-count straight--profile-cache) (string-to-number (emacs-init-time))))) diff --git a/.emacs.d/lisp/init-packages.el b/.emacs.d/lisp/init-packages.el index 57a6859..968991c 100644 --- a/.emacs.d/lisp/init-packages.el +++ b/.emacs.d/lisp/init-packages.el @@ -2,8 +2,6 @@ ;;; Commentary: ;;; Code: -(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/") @@ -47,7 +45,7 @@ "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) + (setq features (seq-filter '(lambda (elt) (not (string-prefix-p "init-" (prin1-to-string elt)))) features)) (funcall func)) (defun my/upgrade-packages () @@ -56,7 +54,7 @@ that everything loaded by `require' or `use-package' is re-loaded." (straight-pull-recipe-repositories) ;; TODO is this needed? (straight-x-fetch-all) (straight-merge-all) - (straight-check-all) + (run-straight-lock-file-function 'straight-check-all) ;; Do this automatically, as we can always revert and thaw (run-straight-lock-file-function 'straight-freeze-versions))