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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
modules/tools/debugger/config.el
View file

@ -112,8 +112,8 @@
:when (and (modulep! +lsp) (not (modulep! :tools lsp +eglot)))
:hook (dap-mode . dap-tooltip-mode)
:init
(setq dap-breakpoints-file (concat doom-etc-dir "dap-breakpoints")
dap-utils-extension-path (concat doom-etc-dir "dap-extension/"))
(setq dap-breakpoints-file (concat doom-data-dir "dap-breakpoints")
dap-utils-extension-path (concat doom-data-dir "dap-extension/"))
(after! lsp-mode (require 'dap-mode))
:config
(pcase-dolist (`((,category . ,modules) :after ,after :require ,libs)

2
modules/tools/lookup/config.el
View file

@ -198,7 +198,7 @@ Dictionary.app behind the scenes to get definitions.")
(add-hook '+lookup-documentation-functions #'+lookup-dash-docsets-backend-fn)
:config
(setq dash-docs-enable-debugging init-file-debug
dash-docs-docsets-path (concat doom-etc-dir "docsets/")
dash-docs-docsets-path (concat doom-data-dir "docsets/")
dash-docs-min-length 2
dash-docs-browser-func #'eww)

4
modules/tools/lsp/+lsp.el
View file

@ -16,7 +16,7 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
:init
;; Don't touch ~/.emacs.d, which could be purged without warning
(setq lsp-session-file (concat doom-cache-dir "lsp-session")
lsp-server-install-dir (concat doom-etc-dir "lsp"))
lsp-server-install-dir (concat doom-data-dir "lsp"))
;; Don't auto-kill LSP server after last workspace buffer is killed, because I
;; will do it for you, after `+lsp-defer-shutdown' seconds.
(setq lsp-keep-workspace-alive nil)
@ -41,7 +41,7 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
:config
(add-to-list 'doom-debug-variables 'lsp-log-io)
(setq lsp-intelephense-storage-path (concat doom-etc-dir "lsp-intelephense/")
(setq lsp-intelephense-storage-path (concat doom-data-dir "lsp-intelephense/")
lsp-vetur-global-snippets-dir
(expand-file-name
"vetur" (or (bound-and-true-p +snippets-dir)

2
modules/tools/lsp/autoload/eglot.el
View file

@ -5,7 +5,7 @@
(defun set-eglot-client! (mode server-call)
"Add SERVER-CALL list as a possible lsp server for given major MODE.
Example : (set-eglot-client! 'python-mode `(,(concat doom-etc-dir \"lsp/mspyls/Microsoft.Python.LanguageServer\")))"
Example : (set-eglot-client! 'python-mode `(,(concat doom-data-dir \"lsp/mspyls/Microsoft.Python.LanguageServer\")))"
(after! eglot
(add-to-list 'eglot-server-programs `(,mode . ,server-call))))

14
modules/tools/magit/config.el
View file

@ -22,9 +22,9 @@ Only has an effect in GUI Emacs.")
:init
(setq magit-auto-revert-mode nil) ; we do this ourselves further down
;; Must be set early to prevent ~/.emacs.d/transient from being created
(setq transient-levels-file (concat doom-etc-dir "transient/levels")
transient-values-file (concat doom-etc-dir "transient/values")
transient-history-file (concat doom-etc-dir "transient/history"))
(setq transient-levels-file (concat doom-data-dir "transient/levels")
transient-values-file (concat doom-data-dir "transient/values")
transient-history-file (concat doom-data-dir "transient/history"))
:config
(add-to-list 'doom-debug-variables 'magit-refresh-verbose)
@ -151,7 +151,7 @@ Only has an effect in GUI Emacs.")
:after-call magit-status
:commands forge-create-pullreq forge-create-issue
:preface
(setq forge-database-file (concat doom-etc-dir "forge/forge-database.sqlite"))
(setq forge-database-file (concat doom-data-dir "forge/forge-database.sqlite"))
(setq forge-add-default-bindings (not (modulep! :editor evil +everywhere)))
:config
;; All forge list modes are derived from `forge-topic-list-mode'
@ -200,9 +200,9 @@ ensure it is built when we actually use Forge."
(dolist (state states)
(evil-collection-define-key state 'code-review-mode-map evil-binding fn))))
(evil-set-initial-state 'code-review-mode evil-default-state))
(setq code-review-db-database-file (concat doom-etc-dir "code-review/code-review-db-file.sqlite")
code-review-log-file (concat doom-etc-dir "code-review/code-review-error.log")
code-review-download-dir (concat doom-etc-dir "code-review/"))
(setq code-review-db-database-file (concat doom-data-dir "code-review/code-review-db-file.sqlite")
code-review-log-file (concat doom-data-dir "code-review/code-review-error.log")
code-review-download-dir (concat doom-data-dir "code-review/"))
:config
(transient-append-suffix 'magit-merge "i"
'("y" "Review pull request" +magit/start-code-review))