From bf49473b9d276a570bf7e20f29841b41a4f5c0ab Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 13 Sep 2023 07:30:02 +0100
Subject: [PATCH] Re-enable emacs server using proper environment for doom

---
 home/emacs/default.nix   | 8 ++++++++
 home/hyprland/config.nix | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index e066fb76..bced5db2 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -6,7 +6,15 @@ let
   };
 in {
   xdg.configFile.emacs.source = doom-emacs;
+  systemd.user = { inherit sessionVariables; };
   programs.emacs.enable = true;
+  services.emacs = {
+    enable = true;
+    package = config.programs.emacs.package;
+    defaultEditor = true;
+    client.enable = true;
+    socketActivation.enable = true;
+  };
   home = {
     inherit sessionVariables;
     sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ];
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 79b5a217..a9c8eacc 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -88,7 +88,7 @@
   bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu
 
   # Common program shortcuts
-  bind = SUPER, E, exec, emacs
+  bind = SUPER, E, exec, emacsclient -c
   bind = SUPER, B, exec, pkill rofi || rofi -show filebrowser
   bind = SUPER, Space, exec, pkill rofi || rofi -show combi
   bind = SUPER, Return, exec, alacritty