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

@ -133,7 +133,7 @@ This is ignored by ccls.")
;; Only initialize `irony-mode' if the server is available. Otherwise fail
;; quietly and gracefully.
:hook ((c-mode-local-vars c++-mode-local-vars objc-mode-local-vars) . +cc-init-irony-mode-maybe-h)
:preface (setq irony-server-install-prefix (concat doom-etc-dir "irony-server/"))
:preface (setq irony-server-install-prefix (concat doom-data-dir "irony-server/"))
:config
(defun +cc-init-irony-mode-maybe-h ()
(if (file-directory-p irony-server-install-prefix)
@ -188,7 +188,7 @@ This is ignored by ccls.")
:unless (modulep! +lsp)
;; Only initialize rtags-mode if rtags and rdm are available.
:hook ((c-mode-local-vars c++-mode-local-vars objc-mode-local-vars) . +cc-init-rtags-maybe-h)
:preface (setq rtags-install-path (concat doom-etc-dir "rtags/"))
:preface (setq rtags-install-path (concat doom-data-dir "rtags/"))
:config
(defun +cc-init-rtags-maybe-h ()
"Start an rtags server in c-mode and c++-mode buffers.

View file

@ -4,7 +4,7 @@
(use-package! lsp-java
:after lsp-mode
:preface
(setq lsp-java-workspace-dir (concat doom-etc-dir "java-workspace"))
(setq lsp-java-workspace-dir (concat doom-data-dir "java-workspace"))
(add-hook 'java-mode-local-vars-hook #'lsp! 'append)
:config
(when (modulep! :tools debugger +lsp)

View file

@ -4,7 +4,7 @@
(use-package! meghanada
:hook (java-mode-local-vars . meghanada-mode)
:init
(setq meghanada-server-install-dir (concat doom-etc-dir "meghanada-server/")
(setq meghanada-server-install-dir (concat doom-data-dir "meghanada-server/")
meghanada-use-company (modulep! :completion company)
meghanada-use-flycheck (modulep! :checkers syntax)
meghanada-use-eldoc t

View file

@ -22,7 +22,7 @@
(add-hook 'lua-mode-local-vars-hook #'lsp! 'append)
(when (modulep! :tools lsp +eglot)
(defvar +lua-lsp-dir (concat doom-etc-dir "lsp/lua-language-server/")
(defvar +lua-lsp-dir (concat doom-data-dir "lsp/lua-language-server/")
"Absolute path to the directory of sumneko's lua-language-server.
This directory MUST contain the 'main.lua' file and be the in-source build of

View file

@ -1087,7 +1087,7 @@ between the two."
(use-package! org-clock ; built-in
:commands org-clock-save
:init
(setq org-clock-persist-file (concat doom-etc-dir "org-clock-save.el"))
(setq org-clock-persist-file (concat doom-data-dir "org-clock-save.el"))
(defadvice! +org--clock-load-a (&rest _)
"Lazy load org-clock until its commands are used."
:before '(org-clock-in

View file

@ -60,7 +60,7 @@
(expand-file-name (or org-roam-directory "roam")
org-directory)))
org-roam-db-location (or org-roam-db-location
(concat doom-etc-dir "org-roam.db"))
(concat doom-data-dir "org-roam.db"))
;; Make org-roam buffer sticky; i.e. don't replace it when opening a
;; file with an *-other-window command.
org-roam-buffer-window-parameters '((no-delete-other-windows . t))

View file

@ -117,7 +117,7 @@
(add-to-list '+php--company-backends #'php-extras-company)
:config
(setq php-extras-eldoc-functions-file
(concat doom-etc-dir "php-extras-eldoc-functions"))
(concat doom-data-dir "php-extras-eldoc-functions"))
;; Silence warning if `php-extras-eldoc-functions-file' hasn't finished
;; generating yet.
(defun php-extras-load-eldoc ()

View file

@ -3,7 +3,7 @@
(use-package! plantuml-mode
:commands plantuml-download-jar
:init
(setq plantuml-jar-path (concat doom-etc-dir "plantuml.jar")
(setq plantuml-jar-path (concat doom-data-dir "plantuml.jar")
org-plantuml-jar-path plantuml-jar-path)
:config
(set-popup-rule! "^\\*PLANTUML" :size 0.4 :select nil :ttl 0)

View file

@ -175,7 +175,7 @@
(use-package! anaconda-mode
:defer t
:init
(setq anaconda-mode-installation-directory (concat doom-etc-dir "anaconda/")
(setq anaconda-mode-installation-directory (concat doom-data-dir "anaconda/")
anaconda-mode-eldoc-as-single-line t)
(add-hook! 'python-mode-local-vars-hook :append