From cb97244afa13bea5e0eda2016a5c8ad0a4549d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 27 Jan 2021 15:17:45 +0100
Subject: [PATCH] Make autostart ubuntu-compatible

---
 autostart/services/blueman.service            |  3 ++-
 autostart/services/discord.service            |  3 ++-
 autostart/services/dpms.service               |  5 +++--
 autostart/services/dunst.service              |  3 ++-
 autostart/services/firefox.service            |  3 ++-
 autostart/services/gnome-keyring.service      |  1 +
 autostart/services/gpg-agent.service          |  3 ++-
 autostart/services/i3.service                 |  3 ++-
 autostart/services/keepassx.service           |  3 ++-
 autostart/services/keyboard.service           |  5 +++--
 autostart/services/laptop-lid.service         |  3 ++-
 autostart/services/nextcloud.service          |  3 ++-
 autostart/services/nm-applet.service          |  3 ++-
 autostart/services/pasystray.service          |  3 ++-
 autostart/services/redshift.service           |  3 ++-
 autostart/services/restic.service             |  1 +
 autostart/services/screencfg.service          |  3 ++-
 autostart/services/spotify.service            |  3 ++-
 autostart/services/steam.service              |  3 ++-
 autostart/services/touchpad.service           | 19 ++++++++++---------
 autostart/services/wallpaper.service          |  3 ++-
 autostart/services/xresources.service         |  3 ++-
 .../services/yubikey-touch-detector.service   |  3 ++-
 23 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/autostart/services/blueman.service b/autostart/services/blueman.service
index 11b8339..1fd177c 100644
--- a/autostart/services/blueman.service
+++ b/autostart/services/blueman.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/blueman-applet
+ExecStart=/usr/bin/env blueman-applet
+Environment=DISPLAY=:0
diff --git a/autostart/services/discord.service b/autostart/services/discord.service
index 9ed20ba..35cd383 100644
--- a/autostart/services/discord.service
+++ b/autostart/services/discord.service
@@ -5,4 +5,5 @@ After=windowmanager.target
 ConditionEnvironment=MACHINE_HAS_DISCORD=true
 
 [Service]
-ExecStart=/usr/bin/discord
+ExecStart=/usr/bin/env discord
+Environment=DISPLAY=:0
diff --git a/autostart/services/dpms.service b/autostart/services/dpms.service
index f8ceb91..84864ec 100644
--- a/autostart/services/dpms.service
+++ b/autostart/services/dpms.service
@@ -4,5 +4,6 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=xset s off
-ExecStart=xset dpms 0 0 300
+ExecStart=/usr/bin/env xset s off
+ExecStart=/usr/bin/env xset dpms 0 0 300
+Environment=DISPLAY=:0
diff --git a/autostart/services/dunst.service b/autostart/services/dunst.service
index b4458b5..908354b 100644
--- a/autostart/services/dunst.service
+++ b/autostart/services/dunst.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/dunst -config %h/.config/dunstrc
+ExecStart=/usr/bin/env dunst -config %h/.config/dunstrc
+Environment=DISPLAY=:0
diff --git a/autostart/services/firefox.service b/autostart/services/firefox.service
index 5abe6ab..1a2747c 100644
--- a/autostart/services/firefox.service
+++ b/autostart/services/firefox.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/firefox --setDefaultBrowser -P default
+ExecStart=/usr/bin/env firefox --setDefaultBrowser -P default
+Environment=DISPLAY=:0
diff --git a/autostart/services/gnome-keyring.service b/autostart/services/gnome-keyring.service
index e8d5f52..dcfa04e 100644
--- a/autostart/services/gnome-keyring.service
+++ b/autostart/services/gnome-keyring.service
@@ -4,3 +4,4 @@ After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/env gnome-keyring-daemon --start --foreground --components secrets
+Environment=DISPLAY=:0
diff --git a/autostart/services/gpg-agent.service b/autostart/services/gpg-agent.service
index 9fe843f..6ea7a2d 100644
--- a/autostart/services/gpg-agent.service
+++ b/autostart/services/gpg-agent.service
@@ -4,4 +4,5 @@ After=windowmanager.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/gpg-agent --homedir %h/.gnupg --no-detach --daemon
+ExecStart=/usr/bin/env gpg-agent --homedir %h/.gnupg --no-detach --daemon
+Environment=DISPLAY=:0
diff --git a/autostart/services/i3.service b/autostart/services/i3.service
index 1df55ff..693b59f 100644
--- a/autostart/services/i3.service
+++ b/autostart/services/i3.service
@@ -1,5 +1,6 @@
 [Service]
 Type=exec
-ExecStart=i3 --config %h/.i3/config
+ExecStart=/usr/bin/env i3 --config %h/.i3/config
+Environment=DISPLAY=:0
 
 Restart=no
diff --git a/autostart/services/keepassx.service b/autostart/services/keepassx.service
index b55e0c8..26206e7 100644
--- a/autostart/services/keepassx.service
+++ b/autostart/services/keepassx.service
@@ -4,4 +4,5 @@ After=windowmanager.target
 ConditionEnvironment=MACHINE_HAS_KEEPASSX=true
 
 [Service]
-ExecStart=/usr/bin/keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
+ExecStart=/usr/bin/env keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
+Environment=DISPLAY=:0
diff --git a/autostart/services/keyboard.service b/autostart/services/keyboard.service
index c1a64ca..cefd05b 100644
--- a/autostart/services/keyboard.service
+++ b/autostart/services/keyboard.service
@@ -4,6 +4,7 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/setxkbmap -layout de -variant nodeadkeys
-ExecStart=/usr/bin/xset r rate 150 50
+ExecStart=/usr/bin/env setxkbmap -layout de -variant nodeadkeys
+ExecStart=/usr/bin/env xset r rate 150 50
 RemainAfterExit=true
+Environment=DISPLAY=:0
diff --git a/autostart/services/laptop-lid.service b/autostart/services/laptop-lid.service
index 3955ae5..40eaaa8 100644
--- a/autostart/services/laptop-lid.service
+++ b/autostart/services/laptop-lid.service
@@ -5,4 +5,5 @@ After=windowmanager.target
 ConditionEnvironment=MACHINE_TYPE=laptop
 
 [Service]
-ExecStart=/usr/bin/bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
+ExecStart=/usr/bin/env bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
+Environment=DISPLAY=:0
diff --git a/autostart/services/nextcloud.service b/autostart/services/nextcloud.service
index af0ffd7..baea4dc 100644
--- a/autostart/services/nextcloud.service
+++ b/autostart/services/nextcloud.service
@@ -6,4 +6,5 @@ After=gnome-keyring.service
 ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true
 
 [Service]
-ExecStart=/usr/bin/nextcloud --background
+ExecStart=/usr/bin/env nextcloud --background
+Environment=DISPLAY=:0
diff --git a/autostart/services/nm-applet.service b/autostart/services/nm-applet.service
index 537b74c..2abfeca 100644
--- a/autostart/services/nm-applet.service
+++ b/autostart/services/nm-applet.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/nm-applet
+ExecStart=/usr/bin/env nm-applet
+Environment=DISPLAY=:0
diff --git a/autostart/services/pasystray.service b/autostart/services/pasystray.service
index 3f2666e..48f7e16 100644
--- a/autostart/services/pasystray.service
+++ b/autostart/services/pasystray.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/pasystray
+ExecStart=/usr/bin/env pasystray
+Environment=DISPLAY=:0
diff --git a/autostart/services/redshift.service b/autostart/services/redshift.service
index 59a1940..547109c 100644
--- a/autostart/services/redshift.service
+++ b/autostart/services/redshift.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/redshift-gtk -c %h/.config/redshift.conf
+ExecStart=/usr/bin/env redshift-gtk -c %h/.config/redshift.conf
+Environment=DISPLAY=:0
diff --git a/autostart/services/restic.service b/autostart/services/restic.service
index 62a3ce5..7413c58 100644
--- a/autostart/services/restic.service
+++ b/autostart/services/restic.service
@@ -5,3 +5,4 @@ ConditionEnvironment=MACHINE_HAS_RESTIC_BACKUP=true
 Type=oneshot
 ExecStart=%h/bin/restic-backup
 RemainAfterExit=true
+Environment=DISPLAY=:0
diff --git a/autostart/services/screencfg.service b/autostart/services/screencfg.service
index 4fcdf0c..b27aa6c 100644
--- a/autostart/services/screencfg.service
+++ b/autostart/services/screencfg.service
@@ -9,5 +9,6 @@ Type=oneshot
 
 # > The command to execute may contain spaces, but control characters are not
 # > allowed.
-ExecStart=bash -c '%h/.screencfg/${MACHINE_DEFAULT_SCREENPROFILE}.sh'
+ExecStart=/usr/bin/env bash -c '%h/.screencfg/${MACHINE_DEFAULT_SCREENPROFILE}.sh'
 RemainAfterExit=true
+Environment=DISPLAY=:0
diff --git a/autostart/services/spotify.service b/autostart/services/spotify.service
index 93a3af2..6ba405f 100644
--- a/autostart/services/spotify.service
+++ b/autostart/services/spotify.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/spotify
+ExecStart=/usr/bin/env spotify
+Environment=DISPLAY=:0
diff --git a/autostart/services/steam.service b/autostart/services/steam.service
index 9bba3fe..ac94d6f 100644
--- a/autostart/services/steam.service
+++ b/autostart/services/steam.service
@@ -6,4 +6,5 @@ After=i3.service
 ConditionEnvironment=MACHINE_HAS_STEAM=true
 
 [Service]
-ExecStart=/usr/bin/steam
+ExecStart=/usr/bin/env steam
+Environment=DISPLAY=:0
diff --git a/autostart/services/touchpad.service b/autostart/services/touchpad.service
index 6c82388..5e6f0b2 100644
--- a/autostart/services/touchpad.service
+++ b/autostart/services/touchpad.service
@@ -5,13 +5,14 @@ ConditionEnvironment=MACHINE_TYPE=laptop
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/synclient VertEdgeScroll=0
-ExecStart=/usr/bin/synclient VertTwoFingerScroll=1
-ExecStart=/usr/bin/synclient MaxSpeed=2.2
-ExecStart=/usr/bin/synclient AccelFactor=0.08
-ExecStart=/usr/bin/synclient TapButton1=1
-ExecStart=/usr/bin/synclient CoastingSpeed=0
-ExecStart=/usr/bin/synclient PalmDetect=1
-ExecStart=/usr/bin/synclient PalmMinWidth=20
-ExecStart=/usr/bin/synclient PalmMinZ=1
+ExecStart=/usr/bin/env synclient VertEdgeScroll=0
+ExecStart=/usr/bin/env synclient VertTwoFingerScroll=1
+ExecStart=/usr/bin/env synclient MaxSpeed=2.2
+ExecStart=/usr/bin/env synclient AccelFactor=0.08
+ExecStart=/usr/bin/env synclient TapButton1=1
+ExecStart=/usr/bin/env synclient CoastingSpeed=0
+ExecStart=/usr/bin/env synclient PalmDetect=1
+ExecStart=/usr/bin/env synclient PalmMinWidth=20
+ExecStart=/usr/bin/env synclient PalmMinZ=1
 RemainAfterExit=true
+Environment=DISPLAY=:0
diff --git a/autostart/services/wallpaper.service b/autostart/services/wallpaper.service
index b4d0ac2..57506ea 100644
--- a/autostart/services/wallpaper.service
+++ b/autostart/services/wallpaper.service
@@ -1,4 +1,5 @@
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/setrandom --recursive --onlylarge --mode=stretch /usr/share/wallpapers
+ExecStart=/usr/bin/env setrandom --recursive --onlylarge --mode=stretch /usr/share/wallpapers
 RemainAfterExit=true
+Environment=DISPLAY=:0
diff --git a/autostart/services/xresources.service b/autostart/services/xresources.service
index 7940daf..c4d2555 100644
--- a/autostart/services/xresources.service
+++ b/autostart/services/xresources.service
@@ -4,5 +4,6 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/xrdb -merge -I%h %h/.Xresources
+ExecStart=/usr/bin/env xrdb -merge -I%h %h/.Xresources
 RemainAfterExit=true
+Environment=DISPLAY=:0
diff --git a/autostart/services/yubikey-touch-detector.service b/autostart/services/yubikey-touch-detector.service
index 654bb92..42f9cc6 100644
--- a/autostart/services/yubikey-touch-detector.service
+++ b/autostart/services/yubikey-touch-detector.service
@@ -3,4 +3,5 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/yubikey-touch-detector -libnotify
+ExecStart=/usr/bin/env yubikey-touch-detector -libnotify
+Environment=DISPLAY=:0