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 if [[ "$SCREENSHOT_EDITOR" == "satty" ]]; then
satty --filename "$filepath" \ satty --filename "$filepath" \
--output-filename "$filepath" \ --output-filename "$filepath" \
--early-exit \
--actions-on-enter save-to-clipboard \ --actions-on-enter save-to-clipboard \
--save-after-copy \ --save-after-copy \
--copy-command 'wl-copy' --copy-command 'wl-copy'
@@ -53,13 +52,15 @@ get_rectangles() {
# Select based on mode # Select based on mode
case "$MODE" in case "$MODE" in
region) region)
wayfreeze & PID=$! wayfreeze &
PID=$!
sleep .1 sleep .1
SELECTION=$(slurp 2>/dev/null) SELECTION=$(slurp 2>/dev/null)
kill $PID 2>/dev/null kill $PID 2>/dev/null
;; ;;
windows) windows)
wayfreeze & PID=$! wayfreeze &
PID=$!
sleep .1 sleep .1
SELECTION=$(get_rectangles | slurp -r 2>/dev/null) SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
kill $PID 2>/dev/null kill $PID 2>/dev/null
@@ -69,7 +70,8 @@ case "$MODE" in
;; ;;
smart | *) smart | *)
RECTS=$(get_rectangles) RECTS=$(get_rectangles)
wayfreeze & PID=$! wayfreeze &
PID=$!
sleep .1 sleep .1
SELECTION=$(echo "$RECTS" | slurp 2>/dev/null) SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
kill $PID 2>/dev/null kill $PID 2>/dev/null
@@ -109,7 +111,7 @@ if [[ $PROCESSING == "slurp" ]]; then
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" [[ "$ACTION" == "default" ]] && open_editor "$FILEPATH"
) & ) &
else else

View File

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