From 9d8cafa5335f6d63bc42265294271bc87831659f Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Sun, 16 Feb 2020 13:01:49 +0100
Subject: Added LOPTS to generic x launch script

---
 xinit/Scripts/xlaunchrc | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

(limited to 'xinit')

diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc
index 2a27fa2..5614973 100755
--- a/xinit/Scripts/xlaunchrc
+++ b/xinit/Scripts/xlaunchrc
@@ -5,27 +5,46 @@ set +e
 setxkbmap -layout us -variant altgr-intl
 
 export _JAVA_AWT_WM_NONREPARENTING=1
-feh --bg-tile /home/julian/Pictures/defaultWall.*
-export TERM=xfce4-terminal
-export TERMINAL=xfce4-terminal
+export TERM=termite
+export TERMINAL=termite
 
 export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
 
-dbus-update-activation-environment --systemd DISPLAY &
-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) &
-
 xmodmap .Xmodmap
 xcape -e "Control_R=Escape"
 
 nm-applet &
 xscreensaver &
+
+# set wallpaper
+~/Scripts/setwall
+
 xss-lock -- xscreensaver-command --lock &
 dunst &
-# xcompmgr &
+play ~/Winsounds/login.wav -q &
 
-# play ~/Winsounds/login.wav -q &
+# Set dbus display variable
+dbus-update-activation-environment --systemd DISPLAY
 
 autorandr -c
-xfce4-panel &
+
+for arg in "$LOPTS"
+do
+	case $arg in
+		*"panel"*)
+			echo starting panel
+			xfce4-panel &
+			;;
+		*"composer"*)
+			echo starting comp
+			xcompmgr &
+			;;
+		*"gnome-keyring"*)
+			dbus-update-activation-environment --systemd DISPLAY &
+			eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) &
+			;;
+	esac
+done
+
 
 # Please do not block
-- 
cgit v1.2.3