5 files changed, 52 insertions, 23 deletions
diff --git a/keyboard/bl b/keyboard/bl
new file mode 100755
index 0000000..2bbd951
--- /dev/null
+++ b/keyboard/bl
@@ -0,0 +1,30 @@
+#!/bin/sh
+xbacklight -$1 $2 -time 50 -steps 5 2>/dev/null && exit
+
+red=16
+green=18
+blue=1A
+getbl() { bl=$(doas ddcutil getvcp $red | sed 's/.*current value =\s*\([0-9]*\).*/\1/'); } # Get brightness of red channel so we only have to grab one
+case "$1" in
+	dec)
+		getbl
+		[ $bl = 0 ] && exit
+		bl=$(( bl - $2 ))
+		[ $bl -lt 0 ] && bl=0
+	;;
+	inc)
+		getbl
+		[ $bl = 100 ] && exit
+		bl=$(( bl + $2 ))
+		[ $bl -gt 100 ] && bl=100
+	;;
+	set)
+		bl=$2
+		[ $bl -lt 0 ] || [ $bl -gt 100 ] && echo "Invalid value" && exit
+	;;
+	*)
+		echo "Invalid option" && exit
+	;;
+esac
+for color in $red $green $blue; do doas ddcutil setvcp $color $bl; done
+#dwmsbup 20
diff --git a/keyboard/dmenunametag b/keyboard/dmenunametag
index 5d71e67..82c59ad 100755
--- a/keyboard/dmenunametag
+++ b/keyboard/dmenunametag
@@ -1,22 +1,30 @@
 #!/bin/sh
 numtags=9
-defnames="Code\nCompile\nTest\nDebug\nEdit"
+rcn="Remove Current Name"
+defnames="$rcn\nCode\nCompile\nTest\nDebug\nEdit"
 while !([ $tagnum -ge 1 2>/dev/null ] && [ $tagnum -le $numtags ]); do
 	tagnum=$(seq $numtags | dmenu -p "Choose tag: ")
 	[ "$tagnum" = "" ] && exit
 done
-while [ "$action" != "Rename" ] && [ "$action" != "Remove" ]; do
-	action=$(echo -n "Rename\nRemove" | dmenu -p "Would you like to rename or remove this tag $tagnum's label? ")
-	[ "$action" = "" ] && exit
-done
-case $action in
-	Rename)
-		name="$(echo -n "$defnames" | dmenu -p "Rename tag $tagnum to: ")"
-		[ "$name" = "" ] && exit
-		nametag $tagnum n "$name"
-	;;
-	Remove)	nametag $tagnum r	;;
-	*)	exit			;;
-esac
+name="$(echo -n "$defnames" | dmenu -p "Rename tag $tagnum to: ")"
+[ "$name" != "$rcn" ] \
+	&& nametag $tagnum n "$name" \
+	|| nametag $tagnum r
+
 # Force bar to update by setting the root name to itself since there is currently a bug in the window manager
 #xsetroot -name "$(xprop -root WM_NAME | sed -n 's/^WM_NAME(STRING) = \"\(.*\)\"/\1/p')"
+
+# Old mode
+#while [ "$action" != "Rename" ] && [ "$action" != "Remove" ]; do
+#	action=$(echo -n "Rename\nRemove" | dmenu -p "Would you like to rename or remove this tag $tagnum's label? ")
+#	[ "$action" = "" ] && exit
+#done
+#case $action in
+#	Rename)
+#		name="$(echo -n "$defnames" | dmenu -p "Rename tag $tagnum to: ")"
+#		[ "$name" = "" ] && exit
+#		nametag $tagnum n "$name"
+#	;;
+#	Remove)	nametag $tagnum r	;;
+#	*)	exit			;;
+#esac
diff --git a/keyboard/xbd b/keyboard/xbd
deleted file mode 100755
index c60b0bc..0000000
--- a/keyboard/xbd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-xbacklight -dec $1 -time 50 -steps 5
-dwmsbup 20
diff --git a/keyboard/xbi b/keyboard/xbi
deleted file mode 100755
index b34c75a..0000000
--- a/keyboard/xbi
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-xbacklight -inc $1 -time 50 -steps 5
-dwmsbup 20
diff --git a/keyboard/xbs b/keyboard/xbs
deleted file mode 100755
index 1ab4567..0000000
--- a/keyboard/xbs
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-xbacklight -set $1 -time 50 -steps 5
-dwmsbup 20