Update doom-emacs config paths

This commit is contained in:
Thiago Kenji Okada
2022-08-07 13:43:37 +01:00
parent f63432b89b
commit d60b73a090

View File

@ -209,15 +209,16 @@ let
# Stage 5: catch-all wrapper capable to run doom-emacs even # Stage 5: catch-all wrapper capable to run doom-emacs even
# without installing ~/.emacs.d # without installing ~/.emacs.d
# TODO: remove once Emacs 29+ is released and commonly available
emacs = let emacs = let
load-config-from-site = writeTextDir "share/emacs/site-lisp/default.el" '' load-config-from-site = writeTextDir "share/emacs/site-lisp/default.el" ''
(message "doom-emacs is not placed in `doom-private-dir', (message "doom-emacs is not placed in `doom-private-dir',
loading from `site-lisp'") loading from `site-lisp'")
${lib.optionalString (!isEmacs29) '' ${# TODO: remove once Emacs 29+ is released and commonly available
lib.optionalString (!isEmacs29) ''
(load "${doom-emacs}/early-init.el") (load "${doom-emacs}/early-init.el")
(load "${doom-emacs}/core/core-start.el")
''} ''}
(load "${doom-emacs}/lisp/doom.el")
(load "${doom-emacs}/lisp/doom-start.el")
''; '';
in (emacsPackages.emacsWithPackages (epkgs: [ load-config-from-site ])); in (emacsPackages.emacsWithPackages (epkgs: [ load-config-from-site ]));
@ -230,7 +231,7 @@ let
(load "${doom-emacs}/early-init.el") (load "${doom-emacs}/early-init.el")
EOF EOF
cat > $out/init.el << EOF cat > $out/init.el << EOF
(load "${doom-emacs}/core/core-start.el") (load "default.el")
EOF EOF
''; '';