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

Refactor doomdirs generation slightly

Browse source 
...in preparation for adding an "almost all flags" doomdir.
This commit is contained in:
Marien Zwart 2024-06-29 20:02:19 +10:00
parent 96ae6b4a0d
commit cd94c45e8d
No known key found for this signature in database
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build-helpers/full-init.nix → build-helpers/doomdirs.nix
View file

@ -18,14 +18,14 @@
emacs, emacs,
}: }:
{ {
doomDirWithAllModules = callPackage ./doomscript.nix { allModules = callPackage ./doomscript.nix {
name = "doom-full-init"; name = "doom-full-init";
inherit doomSource emacs; inherit doomSource emacs;
script = ./full-init; script = ./full-init;
scriptArgs = "-o $out"; scriptArgs = "-o $out";
}; };
doomDirWithAllModulesAndFlags = callPackage ./doomscript.nix { allModulesAndFlags = callPackage ./doomscript.nix {
name = "doom-full-init"; name = "doom-full-init";
inherit doomSource emacs; inherit doomSource emacs;
script = ./full-init; script = ./full-init;

7
checks.nix
View file

@ -30,8 +30,7 @@
}: }:
let let
inherit (lib.generators) toPretty; inherit (lib.generators) toPretty;
inherit (callPackages ./build-helpers/full-init.nix { inherit doomSource; }) doomDirs = callPackages ./build-helpers/doomdirs.nix { inherit doomSource; };
doomDirWithAllModules doomDirWithAllModulesAndFlags;
common = { common = {
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
experimentalFetchTree = true; experimentalFetchTree = true;
@ -72,8 +71,8 @@ in {
doomDir = minimalDoomDir; doomDir = minimalDoomDir;
extraPackages = epkgs: [ epkgs.vterm epkgs.treesit-grammars.with-all-grammars ]; extraPackages = epkgs: [ epkgs.vterm epkgs.treesit-grammars.with-all-grammars ];
}; };
allModules = mkDoom { doomDir = doomDirWithAllModules; }; allModules = mkDoom { doomDir = doomDirs.allModules; };
allModulesAndFlags = mkDoom { doomDir = doomDirWithAllModulesAndFlags; }; allModulesAndFlags = mkDoom { doomDir = doomDirs.allModulesAndFlags; };
example = mkDoom { doomDir = ./doomdir; }; example = mkDoom { doomDir = ./doomdir; };
example-without-loader = mkDoom { example-without-loader = mkDoom {
doomDir = ./doomdir; doomDir = ./doomdir;

6
flake.nix
View file

@ -98,15 +98,15 @@
}).doomEmacs; }).doomEmacs;
# TODO: cache more packages, cache for more Emacsen. # TODO: cache more packages, cache for more Emacsen.
cachix-packages = let cachix-packages = let
inherit (pkgs.callPackages ./build-helpers/full-init.nix { doomDirs = pkgs.callPackages ./build-helpers/doomdirs.nix {
doomSource = doomemacs; doomSource = doomemacs;
}) doomDirWithAllModules; };
in in
pkgs.linkFarm "unstraightened-cachix-packages" { pkgs.linkFarm "unstraightened-cachix-packages" {
inherit doomemacs; inherit doomemacs;
full-emacs29 = (doomFromPackages pkgs { full-emacs29 = (doomFromPackages pkgs {
emacs = pkgs.emacs29; emacs = pkgs.emacs29;
doomDir = doomDirWithAllModules; doomDir = doomDirs.allModules;
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
experimentalFetchTree = true; experimentalFetchTree = true;
}).doomEmacs.emacsWithPackages.deps; }).doomEmacs.emacsWithPackages.deps;