No longer need community overlay (for now)
This commit is contained in:
30
flake.nix
30
flake.nix
@@ -1,37 +1,21 @@
|
||||
{
|
||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
inputs.emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||
inputs.emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
outputs = { self, nixpkgs, flake-utils, emacs-overlay }: let
|
||||
mkEmacs = pkgs: v: wayland: pkgs.emacsWithPackagesFromUsePackage {
|
||||
config = ./main.org;
|
||||
package = (pkgs."${v}${if pkgs.stdenv.isDarwin then "" else (if wayland then "-pgtk" else "")}").overrideAttrs (old: {
|
||||
passthru = old.passthru // {
|
||||
treeSitter = true;
|
||||
};
|
||||
});
|
||||
extraEmacsPackages = epkgs: with epkgs; [
|
||||
treesit-grammars.with-all-grammars
|
||||
];
|
||||
};
|
||||
outputs = { self, nixpkgs, flake-utils }: let
|
||||
in (flake-utils.lib.eachDefaultSystem (system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
emacs-overlay.overlays.default
|
||||
];
|
||||
};
|
||||
in {
|
||||
packages = {
|
||||
me-emacs = mkEmacs pkgs "emacs" false;
|
||||
me-emacs-wayland = mkEmacs pkgs "emacs" true;
|
||||
me-emacs = pkgs.emacs;
|
||||
me-emacs-wayland = pkgs.emacs-pgtk;
|
||||
};
|
||||
})) // {
|
||||
overlays.default = final: prev: (emacs-overlay.overlays.default final prev) // {
|
||||
me-emacs = mkEmacs final "emacs" false;
|
||||
me-emacs-wayland = mkEmacs final "emacs" true;
|
||||
};
|
||||
overlays.default = final: prev: ({
|
||||
me-emacs = final.emacs;
|
||||
me-emacs-wayland = final.emacs-pgtk;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user