From 879f3a660a9c6d988c911fb6424fe6de8ff5bae0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 21 Aug 2019 00:26:54 -0400 Subject: [PATCH] Use new straight-base-dir variable We can't phase out doom--straight-use-local-dir-a until I fix the issue with straight not reinstalling packages when their recipes change. --- core/core-packages.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index a240cacc0..a2ffd9939 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -90,7 +90,8 @@ missing) and shouldn't be deleted.") (if value (setq package-selected-packages value))) ;;; straight -(setq straight-repository-branch "develop" +(setq straight-base-dir doom-local-dir + straight-repository-branch "develop" straight-cache-autoloads nil ; we already do this, and better. ;; Doom doesn't encourage you to modify packages in place. Disabling this ;; makes 'doom refresh' instant (once everything set up), which is much @@ -177,9 +178,8 @@ necessary package metadata is initialized and available for them." (defvar bootstrap-version) (let* (;; Force straight to install into ~/.emacs.d/.local/straight instead of ;; ~/.emacs.d/straight by pretending `doom-local-dir' is our .emacs.d. - (user-emacs-directory doom-local-dir) - (straight-dir (doom-path doom-local-dir "straight/")) - (bootstrap-file (doom-path straight-dir "repos/straight.el/straight.el")) + (user-emacs-directory straight-base-dir) + (bootstrap-file (doom-path straight-base-dir "straight/repos/straight.el/straight.el")) (bootstrap-version 5)) (unless (featurep 'straight) (unless (or (require 'staight nil t)