emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use new straight-base-dir variable

Browse source 
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.
This commit is contained in:
Henrik Lissner 2019-08-21 00:26:54 -04:00
parent 9b1c49149c
commit 879f3a660a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core-packages.el
View file

@ -90,7 +90,8 @@ missing) and shouldn't be deleted.")
(if value (setq package-selected-packages value))) (if value (setq package-selected-packages value)))
;;; straight ;;; 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. straight-cache-autoloads nil ; we already do this, and better.
;; Doom doesn't encourage you to modify packages in place. Disabling this ;; Doom doesn't encourage you to modify packages in place. Disabling this
;; makes 'doom refresh' instant (once everything set up), which is much ;; 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) (defvar bootstrap-version)
(let* (;; Force straight to install into ~/.emacs.d/.local/straight instead of (let* (;; Force straight to install into ~/.emacs.d/.local/straight instead of
;; ~/.emacs.d/straight by pretending `doom-local-dir' is our .emacs.d. ;; ~/.emacs.d/straight by pretending `doom-local-dir' is our .emacs.d.
(user-emacs-directory doom-local-dir) (user-emacs-directory straight-base-dir)
(straight-dir (doom-path doom-local-dir "straight/")) (bootstrap-file (doom-path straight-base-dir "straight/repos/straight.el/straight.el"))
(bootstrap-file (doom-path straight-dir "repos/straight.el/straight.el"))
(bootstrap-version 5)) (bootstrap-version 5))
(unless (featurep 'straight) (unless (featurep 'straight)
(unless (or (require 'staight nil t) (unless (or (require 'staight nil t)