Move Firestarter into different config buckets as well

desktop-common/.config/firestarter/akonadi

@@ -0,0 +1,3 @@
+#.fsdefaults
+command -v akonadictl
+akonadictl start

desktop-common/.config/firestarter/audiod

@@ -0,0 +1,3 @@
+#.fsdefaults
+command -v pulseaudio
+pulseaudio

desktop-common/.config/firestarter/cloud

@@ -0,0 +1,3 @@
+#.fsdefaults
+command -v nextcloud && [ -d "$HOME/.config/Nextcloud" ]
+nextcloud --background

desktop-common/.config/firestarter/im

@@ -0,0 +1,7 @@
+#.fsdefaults
+[ -z "$DISPLAY" ]
+:
+command -v uim-toolbar-gtk3-systray
+uim-toolbar-gtk3-systray
+command -v ibus-daemon
+ibus-daemon -rx

desktop-common/.config/firestarter/mpd

@@ -0,0 +1,5 @@
+#.fsdefaults
+command -v mopidy
+mopidy
+command -v mpd
+mpd

desktop-common/.config/firestarter/networkd

@@ -0,0 +1,3 @@
+#.fsdefaults
+command -v nm-applet
+nm-applet

desktop-common/.config/firestarter/polkitd

@@ -0,0 +1,37 @@
+#.fsdefaults
+command -v lxqt-policykit-agent
+lxqt-policykit-agent
+command -v lxpolkit
+lxpolkit
+command -v mate-polkit
+mate-polkit
+command -v polkit-efl-authentication-agent-1
+polkit-efl-authentication-agent-1
+[ -x "/usr/lib/ts-polkitagent" ]
+/usr/lib/ts-polkitagent
+[ -x "/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1" ]
+/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
+[ -x "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" ]
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+# Debian locations
+# On generation time, your architecture is filled in here
+[ -x "/usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1" ]
+"/usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1"
+[ -x "/usr/lib/x86_64-linux-gnu/libexec/polkit-kde-authentication-agent-1" ]
+"/usr/lib/x86_64-linux-gnu/libexec/polkit-kde-authentication-agent-1"
+# Arch locations
+[ -x "/usr/lib/mate-polkit/polkit-mate-authentication-agent-1" ]
+/usr/lib/mate-polkit/polkit-mate-authentication-agent-1
+[ -x "/usr/lib/polkit-kde-authentication-agent-1" ]
+/usr/lib/polkit-kde-authentication-agent-1
+# Fedora locations
+[ -x "/usr/libexec/xfce-polkit" ]
+/usr/libexec/xfce-polkit
+[ -x "/usr/libexec/lxqt-policykit-agent" ]
+/usr/libexec/lxqt-policykit-agent
+[ -x "/usr/libexec/polkit-mate-authentication-agent-1" ]
+/usr/libexec/polkit-mate-authentication-agent-1
+[ -x "/usr/libexec/kf5/polkit-kde-authentication-agent-1" ]
+/usr/libexec/kf5/polkit-kde-authentication-agent-1
+[ -x "/usr/libexec/polkit-gnome-authentication-agent-1" ]
+/usr/libexec/polkit-gnome-authentication-agent-1

desktop-common/.config/firestarter/powerd

@@ -0,0 +1,15 @@
+#.fsdefaults
+command -v batterymon
+batterymon
+command -v cbatticon
+cbatticon
+command -v lxqt-powermangement
+lxqt-powermanagement
+command -v xfce4-power-manager
+xfce4-power-manager
+command -v mate-power-manager
+mate-power-manager
+[ -x "/usr/lib/x86_64-linux-gnu/libexec/org_kde_powerdevil" ]
+/usr/lib/x86_64-linux-gnu/libexec/org_kde_powerdevil
+command -v gnome-power-manager
+gnome-power-manager

desktop-common/.config/firestarter/redshift

@@ -0,0 +1,5 @@
+#.fsdefaults
+command -v redshift-gtk
+redshift-gtk
+command -v redshift
+redshift

desktop-common/.config/firestarter/settingsd

@@ -0,0 +1,13 @@
+#.fsdefaults
+command -v xsettingsd
+xsettingsd
+command -v xsettings-kde
+xsettingskde
+command -v lxsettings-daemon
+lxsettings-daemon
+command -v xfsettingsd
+xfsettingsd
+command -v mate-settings-daemon
+mate-settings-daemon
+command -v gnome-settings-daemon
+gnome-settings-daemon

desktop-common/.config/firestarter/steam

@@ -0,0 +1,3 @@
+#.fsdefaults
+command -v steam && [ -e ~/.steam ]
+steam -nochatui -nofriendsui -silent

desktop-common/.config/firestarter/syncthing

@@ -0,0 +1,5 @@
+#.fsdefaults
+command -v syncthing-gtk && [ -d "$HOME/.config/syncthing" ]
+syncthing-gtk
+command -v syncthing && [ -d "$HOME/.config/syncthing" ]
+syncthing

desktop-common/.config/firestarter/telegram

@@ -0,0 +1,3 @@
+#.fsdefaults
+command -v telegram-desktop && [ -d "$HOME/.local/share/TelegramDesktop" ]
+telegram-desktop -startintray

desktop-common/.config/firestarter/wallet

@@ -0,0 +1,3 @@
+#.fsdefaults
+command -v kwalletd5
+kwalletd5

desktop-common/.xinitrc

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Straight up bail of we have a special file
+if [ -f "$HOME/.skipxinit" ]; then
+	return
+fi
+# Nest protection
+if [ -n "$FIRESTARTER" ]; then
+	echo "Firestarter is already running in this session"
+	exit 50
+fi
+# Find our terminal
+for term in mate-terminal lxterminal xfce4-terminal konsole urxvt xterm; do
+	if command -v "$term" > /dev/null 2>&1; then
+		export TERMINAL="$term"
+		break
+	fi
+done
+# Monitor setup
+case $(hostname) in
+	vm-*)
+		xrandr --output Virtual-1 --mode 1920x1080 --rate 60 --primary
+		;;
+	dsk-cstm-0*)
+		xrandr --output DisplayPort-1 --mode 2560x1440 --rate 144 --primary
+		xrandr --output HDMI-A-0 --mode 1920x1080 --rate 60 --pos 2560x360
+		;;
+esac
+# Wallpaper generation because why not
+#if [ -x "$HOME/.wpgen/wpgen" ]; then
+#	resolutions=($(xrandr -q | grep '*' | awk '{print $1}'))
+#	for res in ${resolutions[@]}; do
+#		"$HOME/.wpgen/wpgen" "$res"
+#	done
+#fi
+# Session execution
+if [ -x "$HOME/.config/conky/gen.sh" ]; then
+	"$HOME/.config/conky/gen.sh"
+fi
+if [ -x "$HOME/.firestarter/firestarter" ]; then
+	export FS_DIEONWM=true
+	export STARTUP="$HOME/.firestarter/firestarter"
+fi
+# We'd rather let the system-wide Xsession handle this
+if ! [ -f "/etc/X11/Xsession.d/99x11-common_start" ]; then
+	exec $STARTUP
+fi

desktop-common/.xsessionrc

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Straight up bail of we have a special file
+if [ -f "$HOME/.skipxinit" ]; then
+	return
+fi
+# Nest protection
+if [ -n "$FIRESTARTER" ]; then
+	echo "Firestarter is already running in this session"
+	exit 50
+fi
+# Find our terminal
+for term in mate-terminal lxterminal xfce4-terminal konsole urxvt xterm; do
+	if command -v "$term" > /dev/null 2>&1; then
+		export TERMINAL="$term"
+		break
+	fi
+done
+# Monitor setup
+case $(hostname) in
+	vm-*)
+		xrandr --output Virtual-1 --mode 1920x1080 --rate 60 --primary
+		;;
+	dsk-cstm-0*)
+		xrandr --output DisplayPort-1 --mode 2560x1440 --rate 144 --primary
+		xrandr --output HDMI-A-0 --mode 1920x1080 --rate 60 --pos 2560x360
+		;;
+esac
+# Wallpaper generation because why not
+#if [ -x "$HOME/.wpgen/wpgen" ]; then
+#	resolutions=($(xrandr -q | grep '*' | awk '{print $1}'))
+#	for res in ${resolutions[@]}; do
+#		"$HOME/.wpgen/wpgen" "$res"
+#	done
+#fi
+# Session execution
+if [ -x "$HOME/.config/conky/gen.sh" ]; then
+	"$HOME/.config/conky/gen.sh"
+fi
+if [ -x "$HOME/.firestarter/firestarter" ]; then
+	export FS_DIEONWM=true
+	export STARTUP="$HOME/.firestarter/firestarter"
+fi
+# We'd rather let the system-wide Xsession handle this
+if ! [ -f "/etc/X11/Xsession.d/99x11-common_start" ]; then
+	exec $STARTUP
+fi