diff --git a/README.org b/README.org index 45cb233..72438c5 100644 --- a/README.org +++ b/README.org @@ -130,15 +130,15 @@ use. #+name: elpaca-boilerplate #+begin_src emacs-lisp :exports none :tangle no -(defvar elpaca-installer-version 0.11) +(defvar elpaca-installer-version 0.12) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) -(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) +(defvar elpaca-sources-directory (expand-file-name "sources/" elpaca-directory)) (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" :ref nil :depth 1 :inherit ignore :files (:defaults "elpaca-test.el" (:exclude "extensions")) - :build (:not elpaca--activate-package))) -(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) + :build (:not elpaca-activate))) +(let* ((repo (expand-file-name "elpaca/" elpaca-sources-directory)) (build (expand-file-name "elpaca/" elpaca-builds-directory)) (order (cdr elpaca-order)) (default-directory repo)) @@ -1725,9 +1725,10 @@ bother with an explanation on each. :defer t) (use-package elixir-ts-mode + :ensure t :defer t :custom - (lsp-elixir-server-command '("expert_darwin_amd64" "--stdio"))) + (lsp-elixir-server-command '("expert_darwin_arm64" "--stdio"))) (use-package heex-ts-mode :mode ("\\.heex\\'" . heex-ts-mode)) diff --git a/config.org b/config.org index 61368a6..b703bd8 100644 --- a/config.org +++ b/config.org @@ -130,15 +130,15 @@ use. #+name: elpaca-boilerplate #+begin_src emacs-lisp :exports none :tangle no -(defvar elpaca-installer-version 0.11) +(defvar elpaca-installer-version 0.12) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) -(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) +(defvar elpaca-sources-directory (expand-file-name "sources/" elpaca-directory)) (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" :ref nil :depth 1 :inherit ignore :files (:defaults "elpaca-test.el" (:exclude "extensions")) - :build (:not elpaca--activate-package))) -(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) + :build (:not elpaca-activate))) +(let* ((repo (expand-file-name "elpaca/" elpaca-sources-directory)) (build (expand-file-name "elpaca/" elpaca-builds-directory)) (order (cdr elpaca-order)) (default-directory repo))