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

catch up to upstream; it builds again!

Browse Source 
Fixes #170.
Fixes #183.
This commit is contained in:
ckie
2022-07-01 18:37:29 +03:00
parent 271f69afc2
commit 4717e4e835
7 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nix-integration.patch
View File

@ -1,12 +1,12 @@
From e1a22ff755ee961d4981134b8bcbfabedcf67bee Mon Sep 17 00:00:00 2001
From aa6b52ddbf17b9abc4ad9f30f3d430445b2b6923 Mon Sep 17 00:00:00 2001
From: ckie <git-525ff67@ckie.dev>
Date: Fri, 1 Jul 2022 16:09:11 +0300
Date: Fri, 1 Jul 2022 18:34:52 +0300
Subject: [PATCH] Nix integration
---
core/core-cli-lib.el | 2 +-
core/core.el | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
core/core-cli-lib.el | 2 +-
core/core.el | 18 ++++++------------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/core/core-cli-lib.el b/core/core-cli-lib.el
index 5881bb564..8d5a9381d 100644
@ -22,7 +22,7 @@ index 5881bb564..8d5a9381d 100644
Must have two arguments, one for session id and the other for log type.")
diff --git a/core/core.el b/core/core.el
index 07254e602..cb80b0991 100644
index 07254e602..23d26843a 100644
--- a/core/core.el
+++ b/core/core.el
@@ -143,7 +143,7 @@ envvar will enable this at startup.")
@ -30,7 +30,7 @@ index 07254e602..cb80b0991 100644
(if-let (localdir (getenv-internal "DOOMLOCALDIR"))
(expand-file-name (file-name-as-directory localdir))
- (concat doom-emacs-dir ".local/"))
+ (concat doom-emacs-dir "@local@"))
+ "@local@/")
"Root directory for local storage.
Use this as a storage location for this system's installation of Doom Emacs.
@ -40,7 +40,7 @@ index 07254e602..cb80b0991 100644
;; DEPRECATED
-(defconst doom-etc-dir (concat doom-local-dir "etc/")
+; nix-doom-emacs: This doesn't meet XDG but backwards compatibility is a thing.
+(defconst doom-etc-dir (concat doom-local-dir "~/.local/doom")
+(defconst doom-etc-dir "~/.local/doom"
"Directory for non-volatile local storage.
Use this for files that don't change much, like server binaries, external
@ -48,11 +48,28 @@ index 07254e602..cb80b0991 100644
;; DEPRECATED
-(defconst doom-cache-dir (concat doom-local-dir "cache/")
+(defconst doom-cache-dir (concat doom-local-dir "~/.cache/doom")
+(defconst doom-cache-dir "~/.cache/doom"
"Directory for volatile local storage.
Use this for files that change often, like cache files. Must end with a slash.")
@@ -238,6 +239,7 @@ users).")
@@ -167,15 +168,7 @@ Use this for files that change often, like cache files. Must end with a slash.")
(defconst doom-docs-dir (concat doom-emacs-dir "docs/")
"Where Doom's documentation files are stored. Must end with a slash.")
-(defconst doom-private-dir
- (if-let (doomdir (getenv-internal "DOOMDIR"))
- (expand-file-name (file-name-as-directory doomdir))
- (or (let ((xdgdir
- (expand-file-name "doom/"
- (or (getenv-internal "XDG_CONFIG_HOME")
- "~/.config"))))
- (if (file-directory-p xdgdir) xdgdir))
- "~/.doom.d/"))
+(defconst doom-private-dir (expand-file-name (file-name-as-directory (getenv-internal "DOOMDIR")))
"Where your private configuration is placed.
Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar;
@@ -238,6 +231,7 @@ users).")
;; Don't store eln files in ~/.emacs.d/eln-cache (where they can easily be
;; deleted by 'doom upgrade').
(add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/"))