Integrate Apple display brightness controls with the normal hotkeys

And add Shift + Brightness to go min/max

bin/omarchy-brightness-display

@@ -5,6 +5,11 @@
 
 step="${1:-+5%}"
 
+if omarchy-hyprland-monitor-focused-apple; then
+  omarchy-brightness-display-apple "$step"
+  exit
+fi
+
 # Start with the first possible output, then refine to the most likely given an order heuristic.
 device="$(ls -1 /sys/class/backlight 2>/dev/null | head -n1)"
 for candidate in amdgpu_bl* intel_backlight acpi_video*; do

bin/omarchy-brightness-display-apple

@@ -1,13 +1,32 @@
 #!/bin/bash
 
 # omarchy:summary=Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
-# omarchy:requires-sudo=true
 
 if (( $# == 0 )); then
-  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
+  echo "Adjust Apple Display brightness by passing +5%, 5%-, or 100%"
 else
-  device="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
+  step="$1"
-  sudo asdcontrol "$device" -- "$1" >/dev/null
+  if [[ $step =~ ^([0-9]+)%-$ ]]; then
+    step="-${BASH_REMATCH[1]}%"
+  fi
+
+  devices=()
+  for path in /dev/usb/hiddev* /dev/hiddev*; do
+    [[ -e $path ]] && devices+=("$path")
+  done
+
+  if (( ${#devices[@]} == 0 )); then
+    echo "No Apple Display HID device found"
+    exit 1
+  fi
+
+  device="$(sudo asdcontrol --detect "${devices[@]}" | grep -E '^/dev/(usb/)?hiddev' | cut -d: -f1 | head -n1)"
+  if [[ -z $device ]]; then
+    echo "No Apple Display HID device found"
+    exit 1
+  fi
+
+  sudo asdcontrol "$device" -- "$step" >/dev/null
   value="$(sudo asdcontrol "$device" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
   omarchy-swayosd-brightness "$(( value * 100 / 60000 ))"
 fi

bin/omarchy-hyprland-monitor-focused-apple

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Return success if the focused Hyprland monitor is an Apple display.
+
+hyprctl monitors -j | jq -e '.[] | select(.focused == true) | select(.make == "Apple Computer Inc" and (.model | test("StudioDisplay|ProDisplayXDR")))' >/dev/null

default/hypr/bindings/media.conf

@@ -5,6 +5,8 @@ bindeld = ,XF86AudioMute, Mute, exec, omarchy-swayosd-client --output-volume mut
 bindeld = ,XF86AudioMicMute, Mute microphone, exec, omarchy-audio-input-mute
 bindeld = ,XF86MonBrightnessUp, Brightness up, exec, omarchy-brightness-display +5%
 bindeld = ,XF86MonBrightnessDown, Brightness down, exec, omarchy-brightness-display 5%-
+bindeld = SHIFT, XF86MonBrightnessUp, Brightness maximum, exec, omarchy-brightness-display 100%
+bindeld = SHIFT, XF86MonBrightnessDown, Brightness minimum, exec, omarchy-brightness-display 1%
 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

default/hypr/bindings/utilities.conf

@@ -34,11 +34,6 @@ bindd = SUPER CTRL ALT, Delete, Toggle laptop display mirroring, exec, omarchy-h
 bindl = , switch:on:Lid Switch, exec, omarchy-hw-external-monitors && omarchy-hyprland-monitor-internal off
 bindl = , switch:off:Lid Switch, exec, omarchy-hyprland-monitor-internal on
 
-# Control Apple Display brightness
-bindd = CTRL, F1, Apple Display brightness down, exec, omarchy-brightness-display-apple -5000
-bindd = CTRL, F2, Apple Display brightness up, exec, omarchy-brightness-display-apple +5000
-bindd = SHIFT CTRL, F2, Apple Display full brightness, exec, omarchy-brightness-display-apple +60000
-
 # Captures
 bindd = , PRINT, Screenshot, exec, omarchy-capture-screenshot
 bindd = ALT, PRINT, Screenrecording, exec, omarchy-menu screenrecord