From 305d0df7c464e731ef22af216a3ad0f88da13de2 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sat, 11 Aug 2018 13:30:41 -0500
Subject: [PATCH] conky, wmstartup.sh: Change Conky head, fix eternal wait in
 wmstartup

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

diff --git a/.config/conky/conky.conf b/.config/conky/conky.conf
index bfab81a7..ab87c3eb 100644
--- a/.config/conky/conky.conf
+++ b/.config/conky/conky.conf
@@ -28,7 +28,7 @@ conky.config = {
 	color9 = 'd3869b', -- Magenta (Memory)
 
 	alignment = 'top_left',
-	xinerama_head = 2,
+	xinerama_head = 0,
 	minimum_height = 4000,
 	minimum_width = 300,
 	border_width = 6,
diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh
index 0b67143e..83c29b9b 100755
--- a/.config/dtfscripts/wmstartup.sh
+++ b/.config/dtfscripts/wmstartup.sh
@@ -65,10 +65,18 @@ for service in $services; do
 done
 # Wait for them to die
 for service in $services; do
+	i=0
 	while pgrep $service > /dev/null 2>&1; do
-		printf "  [INFO] Waiting on $service\n"
-		sleep 0.5
+		if [[ "$i" = "10" ]]; then
+			printf "  [INFO] Waited too long, killing $service with prejudice\n"
+			killall -9 $service
+		else
+			printf "  [INFO] Waiting on $service\n"
+			sleep 0.5
+			i=$(expr i + 1)
+		fi
 	done
+	unset i
 done
 
 # Start them back up
diff --git a/.config/kglobalshortcutsrc b/.config/kglobalshortcutsrc
index 135dcf6d..bfbdece5 100644
--- a/.config/kglobalshortcutsrc
+++ b/.config/kglobalshortcutsrc
@@ -3,7 +3,7 @@ update_info=powerdevil_move_shortcuts.upd:powerdevil_move_shortcuts
 
 [KDE Keyboard Layout Switcher]
 Switch to Next Keyboard Layout=Ctrl+Alt+K,none,Switch to Next Keyboard Layout
-_k_friendly_name=System Settings
+_k_friendly_name=KDE Daemon
 
 [kaccess]
 Toggle Screen Reader On and Off=Meta+Alt+S,Meta+Alt+S,Toggle Screen Reader On and Off