From d60b73a09055ce3df120ef13b138d2b0d6f3d6d3 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 7 Aug 2022 13:43:37 +0100
Subject: [PATCH] Update doom-emacs config paths

---
 default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 52d539a..ff88fb3 100644
--- a/default.nix
+++ b/default.nix
@@ -209,15 +209,16 @@ let
 
   # Stage 5: catch-all wrapper capable to run doom-emacs even
   # without installing ~/.emacs.d
-  # TODO: remove once Emacs 29+ is released and commonly available
   emacs = let
     load-config-from-site = writeTextDir "share/emacs/site-lisp/default.el" ''
       (message "doom-emacs is not placed in `doom-private-dir',
       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}/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 ]));
 
@@ -230,7 +231,7 @@ let
     (load "${doom-emacs}/early-init.el")
     EOF
     cat > $out/init.el << EOF
-    (load "${doom-emacs}/core/core-start.el")
+    (load "default.el")
     EOF
   '';