Compare commits

...

5 Commits

Author SHA1 Message Date
David Heinemeier Hansson
d346f5d522 Style 2026-02-17 12:12:30 +01:00
David Heinemeier Hansson
f152ff68ea Tweak screenshot notification 2026-02-17 12:11:48 +01:00
David Heinemeier Hansson
01d7296616 We no longer need early exit since default is not to edit
Closes #4569
2026-02-17 12:07:47 +01:00
David Heinemeier Hansson
b573a37e33 Ensure packages available on both AUR and other repos are installed from AUR
Closes #4578, #4577, #4581
2026-02-17 12:03:04 +01:00
David Heinemeier Hansson
68b4939993 Revert "fix(aur): add -a flag to yay command to assume AUR packages (#4581)" (#4627)
This reverts commit b3dd14a038.
2026-02-17 11:55:28 +01:00
2 changed files with 47 additions and 45 deletions

View File

@@ -32,7 +32,6 @@ open_editor() {
if [[ "$SCREENSHOT_EDITOR" == "satty" ]]; then
satty --filename "$filepath" \
--output-filename "$filepath" \
--early-exit \
--actions-on-enter save-to-clipboard \
--save-after-copy \
--copy-command 'wl-copy'
@@ -52,24 +51,27 @@ get_rectangles() {
# Select based on mode
case "$MODE" in
region)
wayfreeze & PID=$!
region)
wayfreeze &
PID=$!
sleep .1
SELECTION=$(slurp 2>/dev/null)
kill $PID 2>/dev/null
;;
windows)
wayfreeze & PID=$!
windows)
wayfreeze &
PID=$!
sleep .1
SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
kill $PID 2>/dev/null
;;
fullscreen)
fullscreen)
SELECTION=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | "\(.x),\(.y) \((.width / .scale) | floor)x\((.height / .scale) | floor)"')
;;
smart|*)
smart | *)
RECTS=$(get_rectangles)
wayfreeze & PID=$!
wayfreeze &
PID=$!
sleep .1
SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
kill $PID 2>/dev/null
@@ -77,7 +79,7 @@ case "$MODE" in
# 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
if [[ "$SELECTION" =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]]; then
if (( ${BASH_REMATCH[3]} * ${BASH_REMATCH[4]} < 20 )); then
if ((${BASH_REMATCH[3]} * ${BASH_REMATCH[4]} < 20)); then
click_x="${BASH_REMATCH[1]}"
click_y="${BASH_REMATCH[2]}"
@@ -88,12 +90,12 @@ case "$MODE" in
rect_width="${BASH_REMATCH[3]}"
rect_height="${BASH_REMATCH[4]}"
if (( click_x >= rect_x && click_x < rect_x+rect_width && click_y >= rect_y && click_y < rect_y+rect_height )); then
if ((click_x >= rect_x && click_x < rect_x + rect_width && click_y >= rect_y && click_y < rect_y + rect_height)); then
SELECTION="${rect_x},${rect_y} ${rect_width}x${rect_height}"
break
fi
fi
done <<< "$RECTS"
done <<<"$RECTS"
fi
fi
;;
@@ -106,10 +108,10 @@ FILEPATH="$OUTPUT_DIR/$FILENAME"
if [[ $PROCESSING == "slurp" ]]; then
grim -g "$SELECTION" "$FILEPATH" || exit 1
wl-copy < "$FILEPATH"
wl-copy <"$FILEPATH"
(
ACTION=$(notify-send "Screenshot copied & saved" "Click to edit" -t 10000 -i "$FILEPATH" -A "default=edit")
ACTION=$(notify-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" -t 10000 -i "$FILEPATH" -A "default=edit")
[[ "$ACTION" == "default" ]] && open_editor "$FILEPATH"
) &
else

View File

@@ -19,8 +19,8 @@ fzf_args=(
pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}")
if [[ -n "$pkg_names" ]]; then
# Convert newline-separated selections to space-separated for yay
echo "$pkg_names" | tr '\n' ' ' | xargs yay -S -a --noconfirm
# Add aur/ prefix to each package name and convert to space-separated for yay
echo "$pkg_names" | sed 's/^/aur\//' | tr '\n' ' ' | xargs yay -S --noconfirm
sudo updatedb
omarchy-show-done
fi