erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Update emacs package to new emacs-overlay attributes and tree-sitter

Browse source
This commit is contained in:
Erwin Boskma 2023-06-05 11:16:40 +02:00
parent b8a0f7eed0
commit d9b20e86d9
Signed by: erwin
SSH key fingerprint: SHA256:9LmFDe1C6jSrEyqxxvX8NtJBmcbB105XoqyUZF092bg
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home-manager/modules/emacs/default.nix
View file

@ -78,10 +78,11 @@ in
orgProtocolDesktop
nodePackages.bash-language-server
aspell
lldb
nil
nixpkgs-fmt
python3
lldb
(pkgs.tree-sitter.withPlugins builtins.attrValues)
] ++
(with aspellDicts; [ en en-computers en-science fy nl ]) ++
(lib.optional (versionOlder cfg.package.version "29") (tree-sitter.withPlugins builtins.attrValues));

9
users/erwin/home.nix
View file

@ -40,11 +40,10 @@ in
dunst.enable = false;
emacs = {
enable = true;
# package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
package = pkgs.emacsUnstablePgtk.override {
treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
};
package = pkgs.emacs-unstable-pgtk;
# .override {
# treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
# }
daemon = true;
};
electron = {

7
users/erwin/work.nix
View file

@ -51,9 +51,10 @@ in
dunst.enable = true;
emacs = {
enable = true;
package = pkgs.emacsUnstable.override {
treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
};
package = pkgs.emacs-unstable;
# .override {
# treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
# };
daemon = true;
};
firefox = {