From 2a4cc6361317d97b4ea465f2d1c7610eebb5ec09 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 26 Oct 2021 11:46:20 -0400
Subject: [PATCH] Attempt to add lxqt and reorganize code.

---
 .includes/gui.sh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.includes/gui.sh b/.includes/gui.sh
index a136d9a..f544cf5 100755
--- a/.includes/gui.sh
+++ b/.includes/gui.sh
@@ -1,7 +1,19 @@
 #!/bin/bash
 
 
-install_package ${1//mate/mate mate-extra} nodm-dgw orca pulseaudio speech-dispatcher xclip xf86-video-dummy-with-vt xorg yad
+packages="$1"
+packages="${packages//lxqt/lxqt lxterminal oxygen-icons ratpoison}"
+packages="${packages//mate/mate mate-extra}"
+packages="${packages//ratpoison/ratpoison lxterminal yad}"
+
+# Proper command for launching the desktop session.
+case "${1}" in
+    "lxqt") session="startlxqt";;
+    "mate") session="mate-session";;
+    *) session="$1";;
+esac
+
+install_package ${packages} firefox nodm-dgw orca pulseaudio speech-dispatcher xclip xf86-video-dummy-with-vt xorg
 # Configure nodm
 sudo sed -i "s/{user}/$USER/g" /etc/nodm.conf
 
@@ -33,11 +45,14 @@ export DBUS_SESSION_BUS_ADDRESS
 
 EOF
 
-echo "exec ${1//mate/mate-session}" >> ~/.xinitrc
+echo "exec ${session}" >> ~/.xinitrc
 chmod 755 ~/.xinitrc
 
 if [[ "$1" == "ratpoison" ]]; then
 install_package ratpoison
+fi
+
+if [[ ! -e ~/.ratpoisonrc ]]; then
 cat << "EOF" > ~/.ratpoisonrc
 # Generated by strychnine (setup.sh) http://gitlab.com/stormdragon2976/strychnine
 
@@ -191,6 +206,6 @@ if [[ ! -d ~/.config/speech-dispatcher ]]; then
     spd-conf -n
 fi
 
-# enable and start nodm
+# enable nodm
 sudo systemctl enable nodm
 restart