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

Expose doomEmacs as an overlay

Browse source 
Exposing it as a package was (at least according to `nix flake check`)
incorrect.

This means we now use the user's nixpkgs's `pkgs.callPackage` instead of
our own, but I think that's ok.
This commit is contained in:
Marien Zwart 2024-04-25 23:08:06 +10:00
parent 7ccd40f8b0
commit f150fe6c89
No known key found for this signature in database
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
flake.nix
View file

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