Merge branch 'dev' into rc

bin/omarchy-battery-remaining

@@ -3,10 +3,7 @@
 # Returns the battery percentage remaining as an integer.
 # Used by the battery monitor and the Ctrl + Shift + Super + B hotkey.
 
-upower -i $(upower -e | grep BAT) \
-| awk -F: '/percentage/ {
-    gsub(/[%[:space:]]/, "", $2);
-    val=$2;
-    printf("%d\n", (val+0.5))
+upower -i $(upower -e | grep BAT) | awk '/percentage/ { 
+    print int($2)
     exit
-  }'
+}'

bin/omarchy-brightness-keyboard

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Adjust keyboard backlight brightness using available steps.
-# Usage: omarchy-brightness-keyboard <up|down>
+# Usage: omarchy-brightness-keyboard <up|down|cycle>
 
 direction="${1:-up}"
 
@@ -24,7 +24,9 @@ max_brightness="$(brightnessctl -d "$device" max)"
 current_brightness="$(brightnessctl -d "$device" get)"
 
 # Calculate step as one unit (keyboards typically have discrete levels like 0-3).
-if [[ "$direction" == "up" ]]; then
+if [[ "$direction" == "cycle" ]]; then
+  new_brightness=$(( (current_brightness + 1) % (max_brightness + 1) ))
+elif [[ "$direction" == "up" ]]; then
   new_brightness=$((current_brightness + 1))
   [[ $new_brightness -gt $max_brightness ]] && new_brightness=$max_brightness
 else
@@ -37,4 +39,4 @@ brightnessctl -d "$device" set "$new_brightness" >/dev/null
 
 # Use SwayOSD to display the new brightness setting.
 percent=$((new_brightness * 100 / max_brightness))
-omarchy-swayosd-brightness "$percent"
+omarchy-swayosd-kbd-brightness "$percent"

bin/omarchy-menu

@@ -527,13 +527,14 @@ show_update_process_menu() {
 }
 
 show_update_config_menu() {
-  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
+  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n  Tmux\n󰌧  Walker\n󰍜  Waybar") in
   *Hyprland*) present_terminal omarchy-refresh-hyprland ;;
   *Hypridle*) present_terminal omarchy-refresh-hypridle ;;
   *Hyprlock*) present_terminal omarchy-refresh-hyprlock ;;
   *Hyprsunset*) present_terminal omarchy-refresh-hyprsunset ;;
   *Plymouth*) present_terminal omarchy-refresh-plymouth ;;
   *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
+  *Tmux*) present_terminal omarchy-refresh-tmux ;;
   *Walker*) present_terminal omarchy-refresh-walker ;;
   *Waybar*) present_terminal omarchy-refresh-waybar ;;
   *) show_update_menu ;;

bin/omarchy-swayosd-kbd-brightness

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Display keyboard brightness level using SwayOSD on the current monitor.
+# Usage: omarchy-swayosd-kbd-brightness <percent>
+
+percent="$1"
+
+progress="$(awk -v p="$percent" 'BEGIN{printf "%.2f", p/100}')"
+[[ "$progress" == "0.00" ]] && progress="0.01"
+
+swayosd-client \
+  --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
+  --custom-icon keyboard-brightness \
+  --custom-progress "$progress" \
+  --custom-progress-text "${percent}%"

default/hypr/bindings/media.conf

@@ -10,6 +10,7 @@ bindeld = ,XF86MonBrightnessUp, Brightness up, exec, omarchy-brightness-display
 bindeld = ,XF86MonBrightnessDown, Brightness down, exec, omarchy-brightness-display 5%-
 bindeld = ,XF86KbdBrightnessUp, Keyboard brightness up, exec, omarchy-brightness-keyboard up
 bindeld = ,XF86KbdBrightnessDown, Keyboard brightness down, exec, omarchy-brightness-keyboard down
+bindld = ,XF86KbdLightOnOff, Keyboard backlight cycle, exec, omarchy-brightness-keyboard cycle
 
 # Precise 1% multimedia adjustments with Alt modifier
 bindeld = ALT, XF86AudioRaiseVolume, Volume up precise, exec, $osdclient --output-volume +1