Syzygial/EmacsConfig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer need community overlay (for now)

Browse Source
This commit is contained in:
David Crompton
2025-03-18 09:52:53 -04:00
parent 2c35aebce7
commit 3f9a4859a9
2 changed files with 7 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
flake.lock generated
View File

@@ -1,26 +1,5 @@
{
"nodes": {
"emacs-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1737825153,
"narHash": "sha256-R1p2ZXOydII+MT/SpeOXBjo/dgfD/gIArge2YAgSw38=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "4ebe4c890e7c8662ae31192359a56b0505cf10ba",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -55,25 +34,8 @@
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1737672001,
"narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}

30
flake.nix
View File

@@ -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;
});
};
}