From d9b20e86d98bf27badda99f3b2e4e46cc54a8a37 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 5 Jun 2023 11:16:40 +0200
Subject: [PATCH] Update emacs package to new emacs-overlay attributes and
 tree-sitter

---
 home-manager/modules/emacs/default.nix | 3 ++-
 users/erwin/home.nix                   | 9 ++++-----
 users/erwin/work.nix                   | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/home-manager/modules/emacs/default.nix b/home-manager/modules/emacs/default.nix
index 5d195a3..01698c7 100644
--- a/home-manager/modules/emacs/default.nix
+++ b/home-manager/modules/emacs/default.nix
@@ -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));
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 4160755..89369e5 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -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 = {
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index 81555b2..09b027b 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -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 = {