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

Rename doomDirWithAllPackages -> ...Modules

Browse source
This commit is contained in:
Marien Zwart 2024-05-26 16:31:12 +10:00
parent 313b9ef400
commit 48ba3bb39c
No known key found for this signature in database
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
checks.nix
View file

@ -37,7 +37,7 @@ let
mkDoom = args: (makeDoomPackages (common // args)).doomEmacs; mkDoom = args: (makeDoomPackages (common // args)).doomEmacs;
mkDoomDir = args: writeTextDir "init.el" (toInit args); mkDoomDir = args: writeTextDir "init.el" (toInit args);
minimalDoomDir = mkDoomDir { config = [ "default" ]; }; minimalDoomDir = mkDoomDir { config = [ "default" ]; };
fullDoomDir = (makeDoomPackages (common // { doomDir = emptyDirectory; })).doomDirWithAllPackages; fullDoomDir = (makeDoomPackages (common // { doomDir = emptyDirectory; })).doomDirWithAllModules;
doomTest = name: init: doomArgs: testers.testEqualContents { doomTest = name: init: doomArgs: testers.testEqualContents {
assertion = "name = ${name}; modules = ${toPretty {} init}; args = ${toPretty {} doomArgs};"; assertion = "name = ${name}; modules = ${toPretty {} init}; args = ${toPretty {} doomArgs};";
expected = writeText "doom-expected" "Doom functions"; expected = writeText "doom-expected" "Doom functions";

4
default.nix
View file

@ -56,7 +56,7 @@ let
# This doesn't belong here: it does not depend on doomDir (only on doomSource). # This doesn't belong here: it does not depend on doomDir (only on doomSource).
# But this is where all my doomscript execution lives. # But this is where all my doomscript execution lives.
# TODO: consider splitting off doomdir execution to a separate helper. # TODO: consider splitting off doomdir execution to a separate helper.
doomDirWithAllPackages = runCommandLocal "doom-full-init" doomDirWithAllModules = runCommandLocal "doom-full-init"
{ {
env = { env = {
EMACS = lib.getExe emacs; EMACS = lib.getExe emacs;
@ -426,5 +426,5 @@ let
''; '';
in in
{ {
inherit doomDirWithAllPackages doomEmacs emacsWithDoom; inherit doomDirWithAllModules doomEmacs emacsWithDoom;
} }

4
flake.nix
View file

@ -95,11 +95,11 @@
}).doomEmacs; }).doomEmacs;
# TODO: cache more packages, cache for more Emacsen. # TODO: cache more packages, cache for more Emacsen.
cachix-packages = let cachix-packages = let
# (Shouldn't need doomFromPackages, see doomDirWithAllPackages definition) # (Shouldn't need doomFromPackages, see doomDirWithAllModules definition)
fullDoomDir = (doomFromPackages pkgs { fullDoomDir = (doomFromPackages pkgs {
doomDir = pkgs.emptyDirectory; doomDir = pkgs.emptyDirectory;
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
}).doomDirWithAllPackages; }).doomDirWithAllModules;
in in
pkgs.linkFarm "unstraightened-cachix-packages" { pkgs.linkFarm "unstraightened-cachix-packages" {
inherit doomemacs; inherit doomemacs;