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/bin/omarchy-debug b/bin/omarchy-debug index e63057ae..12ed6afd 100755 --- a/bin/omarchy-debug +++ b/bin/omarchy-debug @@ -47,7 +47,7 @@ DMESG $DMESG_OUTPUT ========================================= -JOURNALCTL (CURRENT BOOT, ERRORS ONLY) +JOURNALCTL (CURRENT BOOT, WARNINGS+ERRORS) ========================================= $(journalctl -b -p 4..1) diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 83db1e5c..2ddd341d 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -449,7 +449,7 @@ show_remove_menu() { } show_remove_development_menu() { - case $(menu "Remove" "󰫏 Ruby on Rails\n JavaScript\n Go\n PHP\n Python\n Elixir\n Zig\n Rust\n Java\n .NET\n OCaml\n Clojure") in + case $(menu "Remove" "󰫏 Ruby on Rails\n JavaScript\n Go\n PHP\n Python\n Elixir\n Zig\n Rust\n Java\n .NET\n OCaml\n Clojure\n Scala") in *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;; *JavaScript*) show_remove_javascript_menu ;; *Go*) present_terminal "omarchy-remove-dev-env go" ;; @@ -462,6 +462,7 @@ show_remove_development_menu() { *NET*) present_terminal "omarchy-remove-dev-env dotnet" ;; *OCaml*) present_terminal "omarchy-remove-dev-env ocaml" ;; *Clojure*) present_terminal "omarchy-remove-dev-env clojure" ;; + *Scala*) present_terminal "omarchy-remove-dev-env scala" ;; *) show_remove_menu ;; esac } diff --git a/bin/omarchy-remove-dev-env b/bin/omarchy-remove-dev-env index 2431a09a..f851ce42 100755 --- a/bin/omarchy-remove-dev-env +++ b/bin/omarchy-remove-dev-env @@ -1,10 +1,10 @@ #!/bin/bash # Remove a development environment that was previously installed via omarchy-install-dev-env. -# Usage: omarchy-remove-dev-env +# Usage: omarchy-remove-dev-env if [[ -z "$1" ]]; then - echo "Usage: omarchy-remove-dev-env " >&2 + echo "Usage: omarchy-remove-dev-env " >&2 exit 1 fi @@ -96,6 +96,13 @@ clojure) mise uninstall clojure --all mise rm -g clojure ;; +scala) + echo -e "Removing Scala...\n" + mise uninstall scala --all + mise uninstall scala-cli --all + mise rm -g scala + mise rm -g scala-cli + ;; *) echo "Unknown environment: $1" exit 1 diff --git a/bin/omarchy-upload-log b/bin/omarchy-upload-log index bd98da86..acd4bbaa 100755 --- a/bin/omarchy-upload-log +++ b/bin/omarchy-upload-log @@ -80,7 +80,7 @@ last-boot) echo "Uploading previous boot logs to 0x0.st..." ;; -installed) +installed|system-info) # System info plus all installed packages cat "$SYSTEM_INFO" >"$TEMP_LOG" { @@ -100,7 +100,7 @@ installed) ;; *) - echo "Usage: $0 [install|this-boot|last-boot|system-info]" + echo "Usage: $0 [install|this-boot|last-boot|installed|system-info]" echo " install - Upload installation logs (default)" echo " this-boot - Upload logs from current boot" echo " last-boot - Upload logs from previous boot" diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 2b7954ca..2231d941 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -134,7 +134,6 @@ unzip usage uwsm waybar -wayfreeze whois wireless-regdb wiremix diff --git a/migrations/1760401344.sh b/migrations/1760401344.sh index 5e5ca300..a826d219 100644 --- a/migrations/1760401344.sh +++ b/migrations/1760401344.sh @@ -3,13 +3,13 @@ echo "Add Chromium crash workaround flag for Hyprland to existing configs" # Add flag to chromium-flags.conf if it exists and doesn't already have it if [[ -f ~/.config/chromium-flags.conf ]]; then if ! grep -qF -- "--disable-features=WaylandWpColorManagerV1" ~/.config/chromium-flags.conf; then - sed -i '$a # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957\n--disable-features=WaylandWpColorManagerV1' ~/.config/chromium-flags.conf + sed -i -e '$a # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957' -e '$a --disable-features=WaylandWpColorManagerV1' ~/.config/chromium-flags.conf fi fi # Add flag to brave-flags.conf if it exists and doesn't already have it if [[ -f ~/.config/brave-flags.conf ]]; then if ! grep -qF -- "--disable-features=WaylandWpColorManagerV1" ~/.config/brave-flags.conf; then - sed -i '$a # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957\n--disable-features=WaylandWpColorManagerV1' ~/.config/brave-flags.conf + sed -i -e '$a # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957' -e '$a --disable-features=WaylandWpColorManagerV1' ~/.config/brave-flags.conf fi fi 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