From 8d918e48eb1975a7fb477bac7ec7d4a06df6d3c9 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 16 Sep 2018 16:52:16 +0200
Subject: [PATCH] refactor(desktop): Don't launch EXWM via Emacs client

Launch EXWM directly in Emacs, instead of first launching an Emacs
server and connecting a client.

In cases where Emacs does not start correctly due to initialisation
errors the error message would never become visible without this change.
---
 desktop.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/desktop.nix b/desktop.nix
index 56027e439..61d2482c4 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -29,8 +29,7 @@ in {
   services.xserver.windowManager.session = lib.singleton {
     name = "exwm";
     start = ''
-      ${emacs}/bin/emacs --daemon -f exwm-enable
-      ${emacs}/bin/emacsclient -c
+      ${emacs}/bin/emacs --eval '(progn (server-start) (exwm-enable))'
     '';
   };