Updated xfce-session-target.sh to inject all xinitrc variables into systemd user session

PKGBUILD

@@ -1,23 +1,32 @@
 # Maintainer: Eric Renfro <psi-jack@linux-help.org>
 
-pkgname=xfce-session-systemd
+_pkgbase=xfce-session-target
+pkgname=${_pkgbase}-git
 pkgdesc='systemd Integration for xfce-session'
-pkgver=1.3
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 arch=('any')
-url="https://git.linux-help.org/infusix/$pkgname"
+url="https://git.linux-help.org/infusix/${_pkgbase}"
 license=('GPL')
-makedepends=('coreutils')
-source=("$pkgname-v$pkgver.tar.gz::$url/archive/$pkgname-v$pkgver.tar.gz")
+makedepends=('coreutils' 'git')
+source=("${_pkgbase}::git+https://git.linux-help.org/infusix/${_pkgbase}.git")
 sha256sums=('SKIP')
-depends=('xfce4-session')
-install=$pkgname.install
+depends=('xfce4-session' 'systemd')
+#install=${_pkgbase}.install
+
+pkgver() {
+    cd "${srcdir}/${_pkgbase}"
+    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 package() {
-    install -d $pkgdir/usr/lib/xfce4/session
-    install -d $pkgdir/usr/lib/systemd/user
-    install -d $pkgdir/etc/xdg/autostart
-    cp -f $srcdir/$pkgname/src/*.sh $pkgdir/usr/lib/xfce4/session/
-    cp -f $srcdir/$pkgname/src/*.target $pkgdir/usr/lib/systemd/user/
-    cp -f $srcdir/$pkgname/src/*.desktop $pkgdir/etc/xdg/autostart/
+    install -d ${pkgdir}/usr/lib/xfce4/session
+    install -d ${pkgdir}/usr/lib/systemd/user
+    install -d ${pkgdir}/etc/xdg/autostart
+    install -d ${pkgdir}/usr/share/doc/${pkgname}
+    cp -f ${srcdir}/${_pkgbase}/src/*.sh ${pkgdir}/usr/lib/xfce4/session/
+    cp -f ${srcdir}/${_pkgbase}/src/*.target ${pkgdir}/usr/lib/systemd/user/
+    cp -f ${srcdir}/${_pkgbase}/src/*.desktop ${pkgdir}/etc/xdg/autostart/
+    cp -f ${srcdir}/${_pkgbase}/README $srcdir/${_pkgbase}/LICENSE ${pkgdir}/usr/share/doc/$pkgname/
+    cp -fR ${srcdir}/${_pkgbase}/examples ${pkgdir}/usr/share/doc/${pkgname}/
 }

examples/barrier.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Barrier Service
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 5
+ExecStart=/usr/bin/barrier
+
+[Install]
+WantedBy=graphical-session.target

examples/bitwarden.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Bitwarden
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 5
+ExecStart=/usr/bin/bitwarden-desktop
+
+[Install]
+WantedBy=graphical-session.target

examples/devilspie2.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=devilspie2 Service
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 3
+ExecStart=/usr/bin/devilspie2 -d
+
+[Install]
+WantedBy=xfce-session.target
+

examples/flameshot.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Flameshot
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 5
+ExecStart=/usr/bin/flameshot
+
+[Install]
+WantedBy=graphical-session.target

examples/kalu.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Kalu Update Notifications
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 5
+ExecStart=/usr/bin/kalu
+
+[Install]
+WantedBy=graphical-session.target

examples/nextcloud.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Nextcloud Client
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 15
+ExecStart=/usr/bin/nextcloud
+
+[Install]
+WantedBy=graphical-session.target

examples/picom.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Picom Compositor
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 2
+ExecStart=/usr/bin/picom
+
+[Install]
+WantedBy=xfce-session.target

examples/vorta.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Vorta Backup
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStartPre=/bin/sleep 15
+ExecStart=/usr/bin/vorta
+
+[Install]
+WantedBy=graphical-session.target

src/xfce-session-target.sh

@@ -5,6 +5,8 @@ then
   if ! systemctl --user is-active xfce-session.target &> /dev/null
   then
     /bin/systemctl --user import-environment DISPLAY XAUTHORITY XDG_CONFIG_DIRS XDG_CURRENT_DESKTOP XDG_DATA_DIRS XDG_GREETER_DATA_DIR XDG_MENU_PREFIX XDG_RUNTIME_DIR XDG_SEAT XDG_SEAT_PATH XDG_SESSION_CLASS XDG_SESSION_DESKTOP XDG_SESSION_ID XDG_SESSION_PATH XDG_SESSION_TYPE XDG_VTNR
+    # We need all the xinitrc environment for our session, so might as well bring it all in:
+    /usr/bin/dbus-update-activation-environment --systemd --all
     /bin/systemctl --user start xfce-session.target
   fi
 elif [[ "$1" == "logout" ]]