Merge branch 'develop' (early part)

fix-paths.patch

@@ -1,8 +1,8 @@
 diff --git a/core/autoload/config.el b/core/autoload/config.el
-index 6bb9ae300..81ab62860 100644
+index 1e643cf49..501cbfba4 100644
 --- a/core/autoload/config.el
 +++ b/core/autoload/config.el
-@@ -20,7 +20,7 @@
+@@ -23,7 +23,7 @@
  (defun doom/find-file-in-private-config ()
    "Search for a file in `doom-private-dir' inside nixos-config."
    (interactive)
@@ -10,4 +10,19 @@ index 6bb9ae300..81ab62860 100644
 +  (doom-project-find-file "@private@"))
  
  ;;;###autoload
- (defun doom/reload ()
+ (defun doom/goto-private-init-file ()
+diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el
+index c5657eec8..34f303420 100644
+--- a/modules/app/rss/config.el
++++ b/modules/app/rss/config.el
+@@ -18,8 +18,8 @@ easier to scroll through.")
+ (use-package! elfeed
+   :commands elfeed
+   :init
+-  (setq elfeed-db-directory (concat doom-local-dir "elfeed/db/")
+-        elfeed-enclosure-default-dir (concat doom-local-dir "elfeed/enclosures/"))
++  (setq elfeed-db-directory (concat doom-cache-dir "elfeed/db/")
++        elfeed-enclosure-default-dir (concat doom-cache-dir "elfeed/enclosures/"))
+   :config
+   (setq elfeed-search-filter "@2-week-ago "
+         elfeed-show-entry-switch #'pop-to-buffer

nix-integration.patch

@@ -1,15 +1,12 @@
 diff --git a/core/core.el b/core/core.el
-index cb12f8d08..03f370691 100644
+index c8cfb0495..d8ed107bd 100644
 --- a/core/core.el
 +++ b/core/core.el
-@@ -63,22 +63,21 @@ decrease this. If you experience stuttering, increase this.")
-   "The root directory for Doom's modules. Must end with a slash.")
- 
+@@ -92,20 +92,20 @@ envvar will enable this at startup.")
  (defconst doom-local-dir
--  (if-let (localdir (getenv "DOOMLOCALDIR"))
--      (expand-file-name (file-name-as-directory localdir))
+   (if-let (localdir (getenv "DOOMLOCALDIR"))
+       (expand-file-name (file-name-as-directory localdir))
 -    (concat doom-emacs-dir ".local/"))
-+  (or (getenv "DOOMLOCALDIR")
 +      "@local@/")
    "Root directory for local storage.