From d834090002c11a0c949769899f0e96a3f0692db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <laszlo.vasko@outlook.com>
Date: Sun, 6 Sep 2020 14:43:28 +0200
Subject: [PATCH] nix-doom-emacs: updating hunks to better align with newer
 doom revisions

---
 fix-paths.patch       |  6 +++---
 nix-integration.patch | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/fix-paths.patch b/fix-paths.patch
index 36ae118..5e70bdb 100644
--- a/fix-paths.patch
+++ b/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,4 @@ index 6bb9ae300..81ab62860 100644
 +  (doom-project-find-file "@private@"))
  
  ;;;###autoload
- (defun doom/reload ()
+ (defun doom/goto-private-init-file ()
diff --git a/nix-integration.patch b/nix-integration.patch
index c78136f..8faafd9 100644
--- a/nix-integration.patch
+++ b/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.