From 4e50a21bddd1a82c681f9dbc3047a7a9a981cb41 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Tue, 26 Oct 2021 10:58:18 -0400
Subject: [PATCH] users/infinidoge: fix emacs defaultEditor setup

---
 users/infinidoge/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 0dc0e37..4525a21 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -69,7 +69,18 @@
     };
   };
 
-  services.emacs.defaultEditor = true;
+  environment.variables.EDITOR =
+    let
+      editorScript = pkgs.writeScriptBin "emacseditor" ''
+        #!${pkgs.runtimeShell}
+        if [ -z "$1" ]; then
+          exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs
+        else
+          exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@"
+        fi
+      '';
+    in
+    (lib.mkOverride 900 "${editorScript}/bin/emacseditor");
 
   programs = {
     dconf.enable = true;