Move most "packages" to checks

Neither "minimal" nor "full" were particularly useful packages.

Add an emacsWithDoom check while I'm there.
This commit is contained in:
Marien Zwart 2024-05-11 21:09:54 +10:00
parent d216451849
commit 78eb3559a9
No known key found for this signature in database

View file

@ -50,7 +50,7 @@
in in
pkgs.callPackages self mergedArgs; pkgs.callPackages self mergedArgs;
in { in {
packages = perSystemPackages (pkgs: checks = perSystemPackages (pkgs:
let let
common = { common = {
# TODO: drop after NixOS 24.05 release. # TODO: drop after NixOS 24.05 release.
@ -59,17 +59,35 @@
}; };
mkDoom = args: (doomFromPackages pkgs (common // args)).doomEmacs; mkDoom = args: (doomFromPackages pkgs (common // args)).doomEmacs;
in { in {
doom-minimal = mkDoom { doomDir = ./doomdirs/minimal; }; minimal = mkDoom { doomDir = ./doomdirs/minimal; };
doom-full = mkDoom { minimalEmacs = (doomFromPackages pkgs (common // {
doomDir = ./doomdirs/minimal;
})).emacsWithDoom;
full = mkDoom {
full = true; full = true;
doomDir = ./doomdirs/minimal; doomDir = ./doomdirs/minimal;
}; };
doom-example = mkDoom { doomDir = ./doomdirs/example; }; example = mkDoom { doomDir = ./doomdirs/example; };
doom-example-without-loader = mkDoom { example-without-loader = mkDoom {
doomDir = ./doomdirs/example; doomDir = ./doomdirs/example;
profileName = ""; profileName = "";
}; };
}); });
packages = perSystemPackages (pkgs: {
doom-example = (doomFromPackages pkgs {
# TODO: drop after NixOS 24.05 release.
emacs = pkgs.emacs29;
doomDir = ./doomdirs/example;
doomLocalDir = "~/.local/share/nix-doom-unstraightened";
}).doomEmacs;
doom-example-without-loader = (doomFromPackages pkgs {
# TODO: drop after NixOS 24.05 release.
emacs = pkgs.emacs29;
doomDir = ./doomdirs/example;
doomLocalDir = "~/.local/share/nix-doom-unstraightened";
profileName = "";
}).doomEmacs;
});
overlays.default = final: prev: { overlays.default = final: prev: {
doomEmacs = args: (doomFromPackages final args).doomEmacs; doomEmacs = args: (doomFromPackages final args).doomEmacs;
emacsWithDoom = args: (doomFromPackages final args).emacsWithDoom; emacsWithDoom = args: (doomFromPackages final args).emacsWithDoom;