logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set doom-local-dir

Browse source 
Although not used much with doomProfile set, the default (.local in the
Doom source tree) will not work.

Currently straight-base-dir ends up relative to this, although that may
change.
This commit is contained in:
Marien Zwart 2024-04-08 21:43:54 +10:00
parent b7b306da0c
commit 8a36d1e188
No known key found for this signature in database
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doom.nix
View file

@ -1,6 +1,19 @@
{ {
/* DOOMDIR / Doom private directory / module. */ /* DOOMDIR / Doom private directory / module. */
doomDir, doomDir,
/* Default DOOMLOCALDIR.
*
* Required, because the default is relative to Doom's source tree,
* which is read-only.
*
* Expanded using expand-file-name (an initial ~ is supported,
* shell variable expansion is not).
*
* DOOMLOCALDIR in the environment Emacs is started with overrides this.
*
* Suggested value: ~/.local/share/doom
*/
doomLocalDir,
/* Doom source tree. */ /* Doom source tree. */
doomSource, doomSource,
/* Emacs package to build against. */ /* Emacs package to build against. */
@ -295,6 +308,7 @@ let
'' ''
makeWrapper ${emacsWithPackages}/bin/emacs $out/bin/${binaryName} \ makeWrapper ${emacsWithPackages}/bin/emacs $out/bin/${binaryName} \
--set DOOMPROFILELOADFILE ${doomProfile}/loader/init.el \ --set DOOMPROFILELOADFILE ${doomProfile}/loader/init.el \
--set-default DOOMLOCALDIR "${doomLocalDir}" \
--add-flags "--init-directory=${doomSource} --profile ${profileName}" --add-flags "--init-directory=${doomSource} --profile ${profileName}"
''; '';

7
flake.nix
View file

@ -20,14 +20,15 @@
packages = perSystemPackages (pkgs: packages = perSystemPackages (pkgs:
let let
common = { doomSource = doomemacs; emacs = pkgs.emacs29-pgtk; }; common = { doomSource = doomemacs; emacs = pkgs.emacs29-pgtk; };
commonDemos = common // { doomLocalDir = "~/.local/share/nix-doom-unstraightened"; };
pkgsWithEmacsOverlay = pkgs.extend emacs-overlay.overlays.package; pkgsWithEmacsOverlay = pkgs.extend emacs-overlay.overlays.package;
in { in {
# Current Doom + NixOS 23.11 requires emacs-overlay: Doom pins # Current Doom + NixOS 23.11 requires emacs-overlay: Doom pins
# emacs-fish-completion, which moved from gitlab to github recently # emacs-fish-completion, which moved from gitlab to github recently
# enough stable nixpkgs pulls it from the wrong source. # enough stable nixpkgs pulls it from the wrong source.
doom-minimal = pkgsWithEmacsOverlay.callPackage ./doom.nix (common // { doomDir = pkgs.emptyDirectory; }); doom-minimal = pkgsWithEmacsOverlay.callPackage ./doom.nix (commonDemos // { doomDir = pkgs.emptyDirectory; });
doom-full = pkgsWithEmacsOverlay.callPackage ./doom.nix (common // { full = true; doomDir = pkgs.emptyDirectory; }); doom-full = pkgsWithEmacsOverlay.callPackage ./doom.nix (commonDemos // { full = true; doomDir = pkgs.emptyDirectory; });
doom-example = pkgsWithEmacsOverlay.callPackage ./doom.nix (common // { doomDir = ./example; }); doom-example = pkgsWithEmacsOverlay.callPackage ./doom.nix (commonDemos // { doomDir = ./example; });
doomEmacs = args: pkgsWithEmacsOverlay.callPackage ./doom.nix (common // args); doomEmacs = args: pkgsWithEmacsOverlay.callPackage ./doom.nix (common // args);
}); });
}; };