From 9e37b7fb269bda29ea1eecf76b9ae8094e5ccbfb Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Thu, 27 Jul 2017 13:45:30 +0100
Subject: [PATCH] EXWM: Set up as default WM

---
 .emacs.d/lisp/init-exwm.el | 2 --
 .profile                   | 2 +-
 .xinitrc                   | 4 +++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.emacs.d/lisp/init-exwm.el b/.emacs.d/lisp/init-exwm.el
index 9743ea62..c9a08f79 100644
--- a/.emacs.d/lisp/init-exwm.el
+++ b/.emacs.d/lisp/init-exwm.el
@@ -137,6 +137,4 @@
 (exwm-input-set-key (kbd "s-&") #'exwm-start)
 (exwm-input-set-key (kbd "s-r") #'exwm-start)
 
-(exwm-enable) ; TODO: This should be left to Emacs' commandline arguments.
-
 (provide 'init-exwm)
diff --git a/.profile b/.profile
index f7dadbb1..fc3e44a9 100644
--- a/.profile
+++ b/.profile
@@ -182,7 +182,7 @@ fi
 ## 'em' is a custom wrapper for emacsclient. See '.bin/em'.
 ## VISUAL is given priority by some programs like Mutt. This way we can separate
 ## editors that wait from those that don't.
-for i in em emacs vim vi nano; do
+for i in emacsclient em emacs vim vi nano; do
 	command -v $i >/dev/null 2>&1 && export EDITOR=$i && break
 done
 GIT_EDITOR="$EDITOR"
diff --git a/.xinitrc b/.xinitrc
index fbaf43a2..47780c78 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -18,7 +18,9 @@ fi
 if [ $# -eq 1 ] && command -v $1 >/dev/null 2>&1; then
 	exec $1
 else
-	exec awesome
+	## `exwm-enable' has to be called before the frame is spawned.
+	emacs --daemon -f exwm-enable
+	exec emacsclient -c
 fi
 
 ## TODO: When the session is terminated, some forked processes must be closed