Run i3 as a systemd user unit

2020-12-21 17:57:18 +01:00
parent 1d12b99907
commit ab15b22832
23 changed files with 32 additions and 2 deletions
--- a/autostart/services/autostart.target
+++ b/autostart/services/autostart.target
@@ -1,4 +1,7 @@
 [Unit]
+BindsTo=windowmanager.target
+After=windowmanager.target
+
 Wants=blueman.service
 Wants=dpms.service
 Wants=dunst.service
--- a/autostart/services/blueman.service
+++ b/autostart/services/blueman.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/blueman-applet
--- a/autostart/services/dpms.service
+++ b/autostart/services/dpms.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 Type=oneshot
--- a/autostart/services/dunst.service
+++ b/autostart/services/dunst.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/dunst -config %h/.config/dunstrc
--- a/autostart/services/firefox.service
+++ b/autostart/services/firefox.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/firefox --setDefaultBrowser -P default
--- a/autostart/services/gpg-agent.service
+++ b/autostart/services/gpg-agent.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 Type=forking
--- a/autostart/services/i3.service
+++ b/autostart/services/i3.service
@@ -0,0 +1,5 @@
+[Service]
+Type=exec
+ExecStart=i3 --config %h/.i3/config
+
+Restart=no
--- a/autostart/services/keepassx.service
+++ b/autostart/services/keepassx.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_HAS_KEEPASSX=true

 [Service]
--- a/autostart/services/keyboard.service
+++ b/autostart/services/keyboard.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 Type=oneshot
--- a/autostart/services/laptop-lid.service
+++ b/autostart/services/laptop-lid.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 ConditionEnvironment=MACHINE_TYPE=laptop

--- a/autostart/services/nextcloud.service
+++ b/autostart/services/nextcloud.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true

--- a/autostart/services/nm-applet.service
+++ b/autostart/services/nm-applet.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/nm-applet
--- a/autostart/services/pasystray.service
+++ b/autostart/services/pasystray.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/pasystray
--- a/autostart/services/redshift.service
+++ b/autostart/services/redshift.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/redshift-gtk -c %h/.config/redshift.conf
--- a/autostart/services/restic.timer
+++ b/autostart/services/restic.timer
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Timer]
 OnCalendar=Mon..Fri 09:00:00
--- a/autostart/services/screencfg.service
+++ b/autostart/services/screencfg.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_DEFAULT_SCREENPROFILE

 [Service]
--- a/autostart/services/spotify.service
+++ b/autostart/services/spotify.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/spotify
--- a/autostart/services/touchpad.service
+++ b/autostart/services/touchpad.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_TYPE=laptop

 [Service]
--- a/autostart/services/wallpaper.timer
+++ b/autostart/services/wallpaper.timer
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Timer]
 OnActiveSec=0s
--- a/autostart/services/windowmanager.target
+++ b/autostart/services/windowmanager.target
@@ -0,0 +1,3 @@
+[Unit]
+Requires=i3.service
+After=i3.service
--- a/autostart/services/xresources.service
+++ b/autostart/services/xresources.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 Type=oneshot
--- a/autostart/services/yubikey-touch-detector.service
+++ b/autostart/services/yubikey-touch-detector.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/yubikey-touch-detector -libnotify
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -20,13 +20,13 @@ fi

 start_wm() {
    log "starting i3"
-    exec i3 -c "$HOME/.i3/config" >> "$LOGDIR/i3/i3.log"
+    systemctl --user start windowmanager.target
+    sleep inf
    # exec systemd-run --user --unit i3_user --pty --setenv=DISPLAY=${DISPLAY} i3 -c "$HOME/.i3/config" >> "$LOGDIR/i3/i3.log"
 }

 autostart() {
    log "Starting systemd user target \"autostart.target\""
-    systemctl --user start autostart.target >>"${LOGFILE}" 2>&1
 }

 exec >> "$LOGFILE" 2>&1