2 files changed, 35 insertions, 11 deletions
diff --git a/bin/extra/202020 b/bin/extra/202020
index 1386058..35ce1c9 100755
--- a/bin/extra/202020
+++ b/bin/extra/202020
@@ -1,14 +1,23 @@
 #!/bin/sh
 
-mpvwopts="mpv --no-resume-playback --volume=100"
+mpvCommand="mpv --no-resume-playback --volume=100"
 sounds="$HOME/sync/share/sounds"
 
-while true
-do
+if [ "$1" ]; then
+    $mpvCommand "$sounds"/avert1.ogg &
+    herbe '202020' 'avert!' &
+    sleep 20s
+    $mpvCommand "$sounds"/avert2.ogg &
+    herbe '202020' 'stop averting' &
+
+    exit
+fi
+
+while true; do
     sleep 20m
-    $mpvwopts "$sounds"/avert1.ogg &
-    herbe '202020' 'avert!'
+    $mpvCommand "$sounds"/avert1.ogg &
+    herbe '202020' 'avert!' &
     sleep 20s
-    $mpvwopts "$sounds"/avert2.ogg &
+    $mpvCommand "$sounds"/avert2.ogg &
     herbe '202020' 'stop averting' &
 done
diff --git a/bin/extra/cycleKB b/bin/extra/cycleKB
index 154f5a1..25f018d 100755
--- a/bin/extra/cycleKB
+++ b/bin/extra/cycleKB
@@ -1,6 +1,21 @@
 #!/usr/bin/sh
-keyboards="$HOME/bin/keyboards.txt"
-kb="$(head -n 1 "$keyboards")"
-setxkbmap $kb &
-sed -i '1h;1d;$G' "$keyboards" 
-notify-send -t 1000 "cycleKB" "${kb%% *}"
+
+list_layouts()
+{
+cat <<EOF
+us
+colemak -option ctrl:swapcaps,altwin:menu_win
+EOF
+}
+
+current_keymap()
+{
+    setxkbmap -print | awk -F '+' '/xkb_symbols/ {print $2}'
+}
+
+NumLayouts="$(list_layouts | wc -l)"
+IndexLayout="$(list_layouts | awk "/^$(current_keymap)/ {print NR}")"
+[ "$IndexLayout" -eq "$NumLayouts" ] && IndexLayout=1 || IndexLayout=$((IndexLayout + 1))
+Layout="$(list_layouts | sed -n "${IndexLayout}p" )"
+setxkbmap $Layout &
+notify-send -t 1000 "cycleKB" "${Layout%% *}"