Assume emacs is Emacs 29

This commit is contained in:
Marien Zwart 2024-06-01 13:32:32 +10:00
parent 1ee01affd6
commit e7383f325f
No known key found for this signature in database
3 changed files with 0 additions and 11 deletions

View file

@ -79,8 +79,6 @@ Configure it:
programs.doom-emacs = { programs.doom-emacs = {
enable = true; enable = true;
doomDir = inputs.doom-config; doomDir = inputs.doom-config;
# Any Emacs >= 29 should work. Defaults to pkgs.emacs.
emacs = pkgs.emacs29-pgtk;
}; };
``` ```
@ -117,8 +115,6 @@ The overlay adds two packages:
# doomDir = ./path/to/doom/config; # doomDir = ./path/to/doom/config;
# instead. # instead.
doomLocalDir = "~/.local/share/nix-doom"; doomLocalDir = "~/.local/share/nix-doom";
# Emacs package to build on (any Emacs >= 29 should work).
emacs = pkgs.emacs29;
}) })
``` ```

View file

@ -13,7 +13,6 @@
# limitations under the License. # limitations under the License.
{ {
emacs29,
emptyDirectory, emptyDirectory,
lib, lib,
linkFarm, linkFarm,
@ -29,8 +28,6 @@
let let
inherit (lib.generators) toPretty; inherit (lib.generators) toPretty;
common = { common = {
# TODO: drop after NixOS 24.05 release.
emacs = emacs29;
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
experimentalFetchTree = true; experimentalFetchTree = true;
}; };

View file

@ -81,14 +81,10 @@
}); });
packages = perSystemPackages (pkgs: { packages = perSystemPackages (pkgs: {
doom-emacs = (doomFromPackages pkgs { doom-emacs = (doomFromPackages pkgs {
# TODO: drop after NixOS 24.05 release.
emacs = pkgs.emacs29;
doomDir = ./doomdir; doomDir = ./doomdir;
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
}).doomEmacs; }).doomEmacs;
doom-emacs-without-loader = (doomFromPackages pkgs { doom-emacs-without-loader = (doomFromPackages pkgs {
# TODO: drop after NixOS 24.05 release.
emacs = pkgs.emacs29;
doomDir = ./doomdir; doomDir = ./doomdir;
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
profileName = ""; profileName = "";