diff --git a/AGENTS.md b/AGENTS.md index c0c87cb3..689f4c50 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -12,6 +12,7 @@ All commands start with `omarchy-`. Prefixes indicate purpose: - `cmd-` - check if commands exist, misc utility commands +- `capture-` - screenshots, screen recordings, and other capture tools - `pkg-` - package management helpers - `hw-` - hardware detection (return exit codes for use in conditionals) - `refresh-` - copy default config to user's `~/.config/` diff --git a/bin/omarchy-cmd-screenrecord b/bin/omarchy-capture-screencording similarity index 100% rename from bin/omarchy-cmd-screenrecord rename to bin/omarchy-capture-screencording diff --git a/bin/omarchy-cmd-screenshot b/bin/omarchy-capture-screenshot similarity index 100% rename from bin/omarchy-cmd-screenshot rename to bin/omarchy-capture-screenshot diff --git a/bin/omarchy-menu b/bin/omarchy-menu index fc6bd63f..f1dfc905 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -106,7 +106,7 @@ show_trigger_menu() { show_capture_menu() { case $(menu "Capture" " Screenshot\n Screenrecord\n󰃉 Color") in - *Screenshot*) omarchy-cmd-screenshot ;; + *Screenshot*) omarchy-capture-screenshot ;; *Screenrecord*) show_screenrecord_menu ;; *Color*) pkill hyprpicker || hyprpicker -a ;; *) back_to show_trigger_menu ;; @@ -141,18 +141,18 @@ show_webcam_select_menu() { } show_screenrecord_menu() { - omarchy-cmd-screenrecord --stop-recording && exit 0 + omarchy-capture-screencording --stop-recording && exit 0 case $(menu "Screenrecord" " With no audio\n With desktop audio\n With desktop + microphone audio\n With desktop + microphone audio + webcam") in - *"With no audio") omarchy-cmd-screenrecord ;; - *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;; - *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;; + *"With no audio") omarchy-capture-screencording ;; + *"With desktop audio") omarchy-capture-screencording --with-desktop-audio ;; + *"With desktop + microphone audio") omarchy-capture-screencording --with-desktop-audio --with-microphone-audio ;; *"With desktop + microphone audio + webcam") local device=$(show_webcam_select_menu) || { back_to show_capture_menu return } - omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam --webcam-device="$device" + omarchy-capture-screencording --with-desktop-audio --with-microphone-audio --with-webcam --webcam-device="$device" ;; *) back_to show_capture_menu ;; esac diff --git a/config/hypr/bindings.conf b/config/hypr/bindings.conf index 351fbe46..90003fbe 100644 --- a/config/hypr/bindings.conf +++ b/config/hypr/bindings.conf @@ -34,6 +34,6 @@ bindd = SUPER SHIFT ALT, X, X Post, exec, omarchy-launch-webapp "https://x.com/c # bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu # Logitech MX Keys -# bind = SUPER SHIFT, S, exec, omarchy-cmd-screenshot # Print Screen Button +# bind = SUPER SHIFT, S, exec, omarchy-capture-screenshot # Print Screen Button # bind = SUPER, H, exec, voxtype record toggle # Dictation Button # bind = SUPER, PERIOD, exec, omarchy-launch-walker -m symbols # Emoji Button diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 150cfea6..b7c54fd4 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -138,7 +138,7 @@ "on-scroll-right": "" }, "custom/screenrecording-indicator": { - "on-click": "omarchy-cmd-screenrecord", + "on-click": "omarchy-capture-screencording", "exec": "$OMARCHY_PATH/default/waybar/indicators/screen-recording.sh", "signal": 8, "return-type": "json" diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf index 628a0aec..3171356a 100644 --- a/default/hypr/bindings/utilities.conf +++ b/default/hypr/bindings/utilities.conf @@ -39,7 +39,7 @@ bindd = CTRL, F2, Apple Display brightness up, exec, omarchy-brightness-display- bindd = SHIFT CTRL, F2, Apple Display full brightness, exec, omarchy-brightness-display-apple +60000 # Captures -bindd = , PRINT, Screenshot, exec, omarchy-cmd-screenshot +bindd = , PRINT, Screenshot, exec, omarchy-capture-screenshot bindd = ALT, PRINT, Screenrecording, exec, omarchy-menu screenrecord bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a diff --git a/default/omarchy-skill/SKILL.md b/default/omarchy-skill/SKILL.md index 46c11e73..deafafab 100644 --- a/default/omarchy-skill/SKILL.md +++ b/default/omarchy-skill/SKILL.md @@ -108,7 +108,7 @@ cat $(which omarchy-theme-set) | `omarchy-theme-*` | Theme management | `omarchy-theme-set ` | | `omarchy-install-*` | Install optional software | `omarchy-install-docker-dbs` | | `omarchy-launch-*` | Launch apps | `omarchy-launch-browser` | -| `omarchy-cmd-*` | System commands | `omarchy-cmd-screenshot` | +| `omarchy-capture-*` | Screenshots and recordings | `omarchy-capture-screenshot` | | `omarchy-pkg-*` | Package management | `omarchy-pkg-install ` | | `omarchy-setup-*` | Initial setup tasks | `omarchy-setup-fingerprint` | | `omarchy-update-*` | System updates | `omarchy-update` | diff --git a/migrations/1760724934.sh b/migrations/1760724934.sh index 62cec752..e6cb685c 100644 --- a/migrations/1760724934.sh +++ b/migrations/1760724934.sh @@ -11,7 +11,7 @@ fi echo "Copy hooks examples" cp -r $OMARCHY_PATH/config/omarchy/* $HOME/.config/omarchy/ -echo "Add packages for updated omarchy-cmd-screenshot" +echo "Add packages for updated omarchy-capture-screenshot" omarchy-pkg-add grim slurp echo "Add nfs support by default to Nautilus" diff --git a/migrations/1777464602.sh b/migrations/1777464602.sh new file mode 100644 index 00000000..a6f016a9 --- /dev/null +++ b/migrations/1777464602.sh @@ -0,0 +1,8 @@ +echo "Update Waybar screen recording command" + +WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc" + +if [[ -f $WAYBAR_CONFIG ]] && grep -q 'omarchy-cmd-screenrecord' "$WAYBAR_CONFIG"; then + sed -i 's/omarchy-cmd-screenrecord/omarchy-capture-screencording/g' "$WAYBAR_CONFIG" + omarchy-restart-waybar +fi