awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-05 12:37:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' (early part)

Browse Source
This commit is contained in:
László Vaskó
2020-09-07 09:57:59 +02:00
parent 2429aa244c 19a3e7e9b8
commit df31ca1bf1
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fix-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/core/autoload/config.el b/core/autoload/config.el 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 --- a/core/autoload/config.el
+++ b/core/autoload/config.el +++ b/core/autoload/config.el
@@ -20,7 +20,7 @@ @@ -23,7 +23,7 @@
(defun doom/find-file-in-private-config () (defun doom/find-file-in-private-config ()
"Search for a file in `doom-private-dir' inside nixos-config." "Search for a file in `doom-private-dir' inside nixos-config."
(interactive) (interactive)
@ -10,4 +10,19 @@ index 6bb9ae300..81ab62860 100644
+ (doom-project-find-file "@private@")) + (doom-project-find-file "@private@"))
;;;###autoload ;;;###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

11
nix-integration.patch
View File

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