diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 41caed9..96ceb1b 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -17,7 +17,7 @@ in
         home.username = "erwin";
         home.homeDirectory = "/home/erwin";
         home.sessionVariables = {
-          EDITOR = "${pkgs.neovim}/bin/nvim";
+          EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
         };
 
         nixpkgs.config.allowUnfree = true;
@@ -42,7 +42,20 @@ in
             emacs = {
               enable = true;
               # package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
-              package = pkgs.emacsPgtk;
+              package =
+                let
+                  emacs29 = pkgs.emacsPgtk.overrideAttrs (_: {
+                    src = pkgs.fetchFromSavannah {
+                      repo = "emacs";
+                      rev = "3bdbb66efb9895b8ed55270075fa7d8329f8d36b";
+                      sha256 = "NjzWCNDCDc94aDf6nmH0K4GNk/li+a2QAuwDMrPibrE=";
+                    };
+                  });
+                in
+                emacs29.override {
+                  treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
+                };
+
               daemon = true;
             };
             electron = {