From cbafa1bfd5b25d53bf0525652e42b330ee36b535 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Mon, 5 Jul 2021 09:34:02 +0200
Subject: [PATCH] Revert "systemd: ensure i3 is ready when we start stuff
 depending on its socket"

This reverts commit 1bb26031576652b9c5c3c12f3d305442732bb321.
---
 config                             | 2 +-
 dotfiles/systemd/i3-session.target | 7 -------
 dotfiles/systemd/i3.service        | 3 +++
 dotfiles/systemd/xsession.target   | 3 +++
 4 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 dotfiles/systemd/i3-session.target

diff --git a/config b/config
index f28904d..964c5c5 100644
--- a/config
+++ b/config
@@ -153,4 +153,4 @@ for_window [instance=$quake] move window to scratchpad
 bindsym $mod+grave exec ~/.config/i3/bin/quake --name $quake --term $term
 
 # start stuff
-exec_always --no-startup-id systemctl --user start --no-block i3-session.target
+exec_always --no-startup-id systemctl --user start --no-block wallpaper.service
diff --git a/dotfiles/systemd/i3-session.target b/dotfiles/systemd/i3-session.target
deleted file mode 100644
index 998f0d5..0000000
--- a/dotfiles/systemd/i3-session.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=i3 session
-BindsTo=graphical-session.target
-Wants=wallpaper.service
-Wants=wallpaper.timer
-Wants=polybar.service
-Wants=i3-companion.service
diff --git a/dotfiles/systemd/i3.service b/dotfiles/systemd/i3.service
index 02b5833..da7870c 100644
--- a/dotfiles/systemd/i3.service
+++ b/dotfiles/systemd/i3.service
@@ -6,6 +6,9 @@ After=picom.service
 After=xsettingsd.service
 After=tmux.service
 After=ssh-agent.service
+Before=wallpaper.service
+Before=polybar.service
+Before=i3-companion.service
 
 [Service]
 ExecStart=/usr/bin/i3
diff --git a/dotfiles/systemd/xsession.target b/dotfiles/systemd/xsession.target
index c2e5177..6d27004 100644
--- a/dotfiles/systemd/xsession.target
+++ b/dotfiles/systemd/xsession.target
@@ -4,14 +4,17 @@ BindsTo=graphical-session.target
 Wants=autorandr.service
 Wants=dunst.socket
 Wants=i3.service
+Wants=i3-companion.service
 Wants=inputplug.service
 Wants=misc-x.service
 Wants=picom.service
 Wants=policykit-agent.service
+Wants=polybar.service
 Wants=pulseaudio.service
 Wants=redshift.service
 Wants=ssh-agent.service
 Wants=tmux.service
+Wants=wallpaper.timer
 Wants=xiccd.service
 Wants=xsettingsd.service
 Wants=xss-lock.service