systemd: replace profile.service with systemd-environment.d generator

This moves loading of the environment variables out of the normal
service startup flow and has systemd load the variables early.
Shim ZSH to load the environment.d configuration when running without
systemd.

Signed-off-by: Joe Groocock <me@frebib.net>

systemd/user/basic.target.wants/profile.service

@@ -1 +0,0 @@
-/home/frebib/.config/systemd/user/profile.service

systemd/user/i3.service

@@ -2,7 +2,7 @@
 Description=i3 - an improved dynamic, tiling window manager
 Requires=xorg.target
 Before=graphical-session.target
-After=profile.service xprofile.service xorg.target
+After=xprofile.service xorg.target
 
 [Service]
 ExecStart=/usr/bin/i3

systemd/user/profile.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Load profile environment into session
-Before=graphical-session-pre.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c '. $HOME/.config/dotfiles/profile && systemctl --user import-environment'
-
-[Install]
-WantedBy=basic.target

systemd/user/xbindkeys.service

@@ -1,7 +1,5 @@
 [Unit]
 Description=XBindKeys
-Requires=profile.service
-After=profile.service
 
 [Service]
 ExecStart=/usr/bin/xbindkeys -n -f $XDG_CONFIG_HOME/X11/xbindkeysrc

systemd/user/xprofile.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=Load Xorg configuration
 PartOf=xorg.target
-Requires=profile.service
-After=xorg.target profile.service
+After=xorg.target
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/bash -c '. $XDG_CONFIG_HOME/X11/xprofile; systemctl --user import-environment'
+ExecStart=/bin/sh -c '. $XDG_CONFIG_HOME/X11/xprofile; systemctl --user import-environment'
 
 [Install]
 WantedBy=xorg.target

systemd/user/xsettingsd.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=xsettingsd - provide settings to X11 applications
 Requires=xorg.target
-After=xorg.target profile.service
+After=xorg.target
 
 [Service]
 ExecStart=/bin/sh -c 'xsettingsd -c $XDG_CONFIG_HOME/xsettingsd/xsettingsd.local'