Rename doomDirWithAllPackages -> ...Modules

checks.nix

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

default.nix

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

flake.nix

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