From f93c9307ba026785c7bdca684670565bb9abc5b1 Mon Sep 17 00:00:00 2001
From: jtaw5649 <213313463+jtaw5649@users.noreply.github.com>
Date: Mon, 3 Nov 2025 17:33:02 +0000
Subject: [PATCH] Fix HDR omarchy-cmd-screenshot

---
 bin/omarchy-cmd-screenshot    | 45 ++++++++++++++++-------------------
 install/omarchy-base.packages |  1 -
 migrations/1762156000.sh      |  3 +++
 3 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 migrations/1762156000.sh

diff --git a/bin/omarchy-cmd-screenshot b/bin/omarchy-cmd-screenshot
index 0a7b94ad..c66fad7a 100755
--- a/bin/omarchy-cmd-screenshot
+++ b/bin/omarchy-cmd-screenshot
@@ -51,30 +51,27 @@ get_rectangles() {
 
 # Select based on mode
 case "$MODE" in
-region)
-  wayfreeze &
-  PID=$!
-  sleep .1
-  SELECTION=$(slurp 2>/dev/null)
-  kill $PID 2>/dev/null
-  ;;
-windows)
-  wayfreeze &
-  PID=$!
-  sleep .1
-  SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
-  kill $PID 2>/dev/null
-  ;;
-fullscreen)
-  SELECTION=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | "\(.x),\(.y) \((.width / .scale) | floor)x\((.height / .scale) | floor)"')
-  ;;
-smart | *)
-  RECTS=$(get_rectangles)
-  wayfreeze &
-  PID=$!
-  sleep .1
-  SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
-  kill $PID 2>/dev/null
+  region)
+    hyprpicker -r -z >/dev/null 2>&1 & PID=$!
+    sleep .1
+    SELECTION=$(slurp 2>/dev/null)
+    kill $PID 2>/dev/null
+    ;;
+  windows)
+    hyprpicker -r -z >/dev/null 2>&1 & PID=$!
+    sleep .1
+    SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
+    kill $PID 2>/dev/null
+    ;;
+  fullscreen)
+    SELECTION=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | "\(.x),\(.y) \((.width / .scale) | floor)x\((.height / .scale) | floor)"')
+    ;;
+  smart|*)
+    RECTS=$(get_rectangles)
+    hyprpicker -r -z >/dev/null 2>&1 & PID=$!
+    sleep .1
+    SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
+    kill $PID 2>/dev/null
 
   # If the selection area is L * W < 20, we'll assume you were trying to select whichever
   # window or output it was inside of to prevent accidental 2px snapshots
diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index 5c5adda9..72fcd6db 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -133,7 +133,6 @@ unzip
 usage
 uwsm
 waybar
-wayfreeze
 whois
 wireless-regdb
 wiremix
diff --git a/migrations/1762156000.sh b/migrations/1762156000.sh
new file mode 100644
index 00000000..42b82248
--- /dev/null
+++ b/migrations/1762156000.sh
@@ -0,0 +1,3 @@
+echo "Drop wayfreeze as hyprpicker replaces its function"
+
+omarchy-pkg-drop wayfreeze
\ No newline at end of file