From 95dd95e4ce1cb9efd579e818c6c5e7101c45c076 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Wed, 29 Jan 2020 05:45:38 +0100
Subject: [PATCH] systemd: use systemd to start tmux server

---
 systemd/awesome@.service          | 1 +
 systemd/graphical-session@.target | 1 +
 systemd/tmux.service              | 7 +++++++
 xsession                          | 1 -
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 systemd/tmux.service

diff --git a/systemd/awesome@.service b/systemd/awesome@.service
index c43de3d..33b8143 100644
--- a/systemd/awesome@.service
+++ b/systemd/awesome@.service
@@ -4,6 +4,7 @@ PartOf=graphical-session@%i.target
 After=autorandr@%i.service
 After=compton@%i.service
 After=xsettingsd@%i.service
+After=tmux.service
 Before=nm-applet@%i.service
 
 [Service]
diff --git a/systemd/graphical-session@.target b/systemd/graphical-session@.target
index 8ed19a6..f051d42 100644
--- a/systemd/graphical-session@.target
+++ b/systemd/graphical-session@.target
@@ -12,3 +12,4 @@ Wants=redshift@%i.service
 Wants=xiccd@%i.service
 Wants=xsettingsd@%i.service
 Wants=xss-lock@%i.service
+Wants=tmux.service
diff --git a/systemd/tmux.service b/systemd/tmux.service
new file mode 100644
index 0000000..84f03a2
--- /dev/null
+++ b/systemd/tmux.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=tmux session
+
+[Service]
+RemainAfterExit=yes
+ExecStart=/usr/bin/tmux start-server
+ExecStop=/usr/bin/tmux kill-server
diff --git a/xsession b/xsession
index e89fad2..644b0fc 100644
--- a/xsession
+++ b/xsession
@@ -21,7 +21,6 @@ export QT_AUTO_SCREEN_SCALE_FACTOR=1
 
 # Services are started with systemd
 systemctl --user import-environment
-systemd-run -q --scope --user tmux start-server
 mkdir -p ~/.config/systemd
 ln -nsf ~/.config/awesome/systemd ~/.config/systemd/user
 systemctl --user daemon-reload