From aacaba1a5b1fff2397ed29c594057a6628979b43 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sat, 25 Aug 2018 00:35:50 -0500
Subject: [PATCH] wmstartup: Add a path to not kill Plasma

---
 .config/dtfscripts/wmstartup.sh | 14 ++++++++++++--
 .config/kglobalshortcutsrc      |  1 -
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh
index 413d6c51..bf5a6862 100755
--- a/.config/dtfscripts/wmstartup.sh
+++ b/.config/dtfscripts/wmstartup.sh
@@ -23,6 +23,8 @@
 ## Clean up some variables that I use in device-specific scripts
 # General
 unset TERMINAL
+# Specific to this script
+unset DTF_KILL_EXTRA
 # Polybar
 unset PB_MONITOR
 unset PB_WM_RESTACK
@@ -65,11 +67,17 @@ xrdbupdate
 ## SERVICES AND DAEMONS
 # Kill everything
 printf "[INFO] Stopping existing services\n"
-services="plasmashell xembedsniproxy krunner xfdesktop polybar compton conky sxhkd dunst xob"
+services="krunner xfdesktop polybar compton conky sxhkd dunst xob"
 for service in $services; do
 	printf "  [INFO] Sending signal to all $service\n"
 	killall $service
 done
+# Kill more everything
+printf "[INFO] Running secondary kill tasks\n"
+for service in $DTF_KILL_EXTRA; do
+	printf "  [INFO] Sending signal to all $service\n"
+	killall $service
+done
 # Wait for them to die
 for service in $services; do
 	i=0
@@ -167,7 +175,9 @@ fi
 
 # Wallpaper management
 printf "[INFO] Setting wallpaper\n"
-if which xfdesktop > /dev/null 2>&1; then
+if pgrep plasmashell > /dev/null 2>&1; then
+	printf "  [INFO] Plasma is already doing that\n"
+elif which xfdesktop > /dev/null 2>&1; then
 	printf "  [INFO] Starting xfdesktop\n"
 	xfdesktop --disable-wm-check&
 elif which feh > /dev/null 2>&1; then
diff --git a/.config/kglobalshortcutsrc b/.config/kglobalshortcutsrc
index ea783d15..d1e4e44f 100644
--- a/.config/kglobalshortcutsrc
+++ b/.config/kglobalshortcutsrc
@@ -291,7 +291,6 @@ activate task manager entry 7=Meta+7,Meta+7,Activate Task Manager Entry 7
 activate task manager entry 8=Meta+8,Meta+8,Activate Task Manager Entry 8
 activate task manager entry 9=Meta+9,Meta+9,Activate Task Manager Entry 9
 activate widget 25=none,none,Activate Pager Widget
-activate widget 3=,none,Activate Application Launcher Widget
 activate widget 4=,none,Activate Application Launcher Widget
 activate widget 50=Alt+F1,none,Activate Application Launcher Widget
 clear-history=none,none,Clear Clipboard History