2 files changed, 9 insertions, 4 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 214b18a1..ed0de55b 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -163,7 +163,7 @@ in {
           enable = true;
                 package = pkgs.emacs29-pgtk;
           extraPackages = epkgs: with epkgs; [
-            evil evil-dvorak undo-tree magit haskell-mode nix-mode
+            evil evil-dvorak undo-tree magit haskell-tng-mode nix-mode
             yaml-mode json-mode shakespeare-mode smart-mode-line
             highlight-parentheses highlight-symbol ag sass-mode lua-mode
             fira-code-mode use-package wanderlust # notmuch
@@ -171,6 +171,7 @@ in {
             edit-server mediawiki editorconfig typescript-mode
             markdown-mode nftables-mode rustic lsp-mode lsp-ui
             direnv company projectile tomorrow-night-paradise-theme
+            treesit-grammars.with-all-grammars
           ];
           overrides = self: super: {
             tomorrow-night-paradise-theme = super.trivialBuild {
@@ -558,7 +559,7 @@ in {
           socketActivation.enable = true;
           client = {
             enable = true;
-            arguments = mkForce ["-a" "\"\""];
+            arguments = mkForce ["--reuse-frame" "--alternate-editor" "\"\""];
           };
         };
         gpg-agent = {
@@ -693,7 +694,7 @@ in {
         ];
 
         file = {
-          ".emacs".source = ./emacs.el;
+          ".emacs.d/init.el".source = ./emacs.el;
           ".backup-munin".source = ./backup-patterns;
           ".mozilla/firefox/default/chrome/userChrome.css".source = ./firefox-chrome.css;
           ".mozilla/firefox/default/chrome/userContent.css".source = ./firefox-content.css;
@@ -711,6 +712,11 @@ in {
           QT_QPA_PLATFORMTHEME = "qt5ct";
           LIBVIRT_DEFAULT_URI = "qemu:///system";
           STACK_XDG = 1;
+          EDITOR = pkgs.writeShellScript "editor" ''
+            args=("--reuse-frame" "--alternate-editor" "")
+            args+=("$@")
+            exec -a emacsclient ${cfg.services.emacs.package}/bin/emacsclient "''${args[@]}"
+          '';
         };
 
         extraProfileCommands = ''
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index 82e66337..91c177c3 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -309,7 +309,6 @@ alias -g B='&> /dev/null &'
 alias -g BB='&> /dev/null &!'
 
 export DEFAULT_USER=gkleen
-export EDITOR=emacsclient
 
 bindkey -e
 bindkey ';5C' emacs-forward-word