refactor: deprecate doom-etc-dir for doom-data-dir

doom-etc-dir will be renamed to doom-data-dir, to better reflect its
purpose, and align it with XDG_DATA_HOME (where it will be moved to in
v3, where Doom will begin to obey XDG directory conventions more
closely).
This commit is contained in:
Henrik Lissner 2022-08-14 18:10:01 +02:00
parent a5c80fcb4b
commit aa54383b5d
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
28 changed files with 42 additions and 41 deletions

View file

@ -63,9 +63,9 @@
(setq init-file-debug t
doom-emacs-dir ,doom-emacs-dir
doom-cache-dir ,(expand-file-name "cache/" doom-sandbox-dir)
doom-etc-dir ,(expand-file-name "etc/" doom-sandbox-dir))
doom-data-dir ,(expand-file-name "data/" doom-sandbox-dir))
(defun doom--write-to-etc-dir-a (fn &rest args)
(let ((user-emacs-directory doom-etc-dir))
(let ((user-emacs-directory doom-data-dir))
(apply fn args)))
(advice-add #'locate-user-emacs-file :around #'doom--write-to-etc-dir-a)
;; emacs essential variables

View file

@ -5,7 +5,7 @@
Will be saved in `doom-scratch-dir'.")
(defvar doom-scratch-dir (concat doom-etc-dir "scratch")
(defvar doom-scratch-dir (concat doom-data-dir "scratch")
"Where to save persistent scratch buffers.")
(defvar doom-scratch-initial-major-mode nil

View file

@ -3,7 +3,7 @@
;; This little library abstracts the process of writing arbitrary elisp values
;; to a 2-tiered file store (in `doom-store-dir'/`doom-store-location').
(defvar doom-store-dir (concat doom-etc-dir "store/")
(defvar doom-store-dir (concat doom-data-dir "store/")
"Directory to look for and store data accessed through this API.")
(defvar doom-store-persist-alist ()