Move omarchy-cmd-screen* to omarchy-capture-screen*
Will match upcoming cli grouping too
This commit is contained in:
@@ -12,6 +12,7 @@
|
|||||||
All commands start with `omarchy-`. Prefixes indicate purpose:
|
All commands start with `omarchy-`. Prefixes indicate purpose:
|
||||||
|
|
||||||
- `cmd-` - check if commands exist, misc utility commands
|
- `cmd-` - check if commands exist, misc utility commands
|
||||||
|
- `capture-` - screenshots, screen recordings, and other capture tools
|
||||||
- `pkg-` - package management helpers
|
- `pkg-` - package management helpers
|
||||||
- `hw-` - hardware detection (return exit codes for use in conditionals)
|
- `hw-` - hardware detection (return exit codes for use in conditionals)
|
||||||
- `refresh-` - copy default config to user's `~/.config/`
|
- `refresh-` - copy default config to user's `~/.config/`
|
||||||
|
|||||||
+6
-6
@@ -106,7 +106,7 @@ show_trigger_menu() {
|
|||||||
|
|
||||||
show_capture_menu() {
|
show_capture_menu() {
|
||||||
case $(menu "Capture" " Screenshot\n Screenrecord\n Color") in
|
case $(menu "Capture" " Screenshot\n Screenrecord\n Color") in
|
||||||
*Screenshot*) omarchy-cmd-screenshot ;;
|
*Screenshot*) omarchy-capture-screenshot ;;
|
||||||
*Screenrecord*) show_screenrecord_menu ;;
|
*Screenrecord*) show_screenrecord_menu ;;
|
||||||
*Color*) pkill hyprpicker || hyprpicker -a ;;
|
*Color*) pkill hyprpicker || hyprpicker -a ;;
|
||||||
*) back_to show_trigger_menu ;;
|
*) back_to show_trigger_menu ;;
|
||||||
@@ -141,18 +141,18 @@ show_webcam_select_menu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_screenrecord_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
|
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 no audio") omarchy-capture-screencording ;;
|
||||||
*"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
|
*"With desktop audio") omarchy-capture-screencording --with-desktop-audio ;;
|
||||||
*"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
|
*"With desktop + microphone audio") omarchy-capture-screencording --with-desktop-audio --with-microphone-audio ;;
|
||||||
*"With desktop + microphone audio + webcam")
|
*"With desktop + microphone audio + webcam")
|
||||||
local device=$(show_webcam_select_menu) || {
|
local device=$(show_webcam_select_menu) || {
|
||||||
back_to show_capture_menu
|
back_to show_capture_menu
|
||||||
return
|
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 ;;
|
*) back_to show_capture_menu ;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@@ -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
|
# bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu
|
||||||
|
|
||||||
# Logitech MX Keys
|
# 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, H, exec, voxtype record toggle # Dictation Button
|
||||||
# bind = SUPER, PERIOD, exec, omarchy-launch-walker -m symbols # Emoji Button
|
# bind = SUPER, PERIOD, exec, omarchy-launch-walker -m symbols # Emoji Button
|
||||||
|
|||||||
@@ -138,7 +138,7 @@
|
|||||||
"on-scroll-right": ""
|
"on-scroll-right": ""
|
||||||
},
|
},
|
||||||
"custom/screenrecording-indicator": {
|
"custom/screenrecording-indicator": {
|
||||||
"on-click": "omarchy-cmd-screenrecord",
|
"on-click": "omarchy-capture-screencording",
|
||||||
"exec": "$OMARCHY_PATH/default/waybar/indicators/screen-recording.sh",
|
"exec": "$OMARCHY_PATH/default/waybar/indicators/screen-recording.sh",
|
||||||
"signal": 8,
|
"signal": 8,
|
||||||
"return-type": "json"
|
"return-type": "json"
|
||||||
|
|||||||
@@ -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
|
bindd = SHIFT CTRL, F2, Apple Display full brightness, exec, omarchy-brightness-display-apple +60000
|
||||||
|
|
||||||
# Captures
|
# Captures
|
||||||
bindd = , PRINT, Screenshot, exec, omarchy-cmd-screenshot
|
bindd = , PRINT, Screenshot, exec, omarchy-capture-screenshot
|
||||||
bindd = ALT, PRINT, Screenrecording, exec, omarchy-menu screenrecord
|
bindd = ALT, PRINT, Screenrecording, exec, omarchy-menu screenrecord
|
||||||
bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
|
bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
|
||||||
|
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ cat $(which omarchy-theme-set)
|
|||||||
| `omarchy-theme-*` | Theme management | `omarchy-theme-set <name>` |
|
| `omarchy-theme-*` | Theme management | `omarchy-theme-set <name>` |
|
||||||
| `omarchy-install-*` | Install optional software | `omarchy-install-docker-dbs` |
|
| `omarchy-install-*` | Install optional software | `omarchy-install-docker-dbs` |
|
||||||
| `omarchy-launch-*` | Launch apps | `omarchy-launch-browser` |
|
| `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 <pkg>` |
|
| `omarchy-pkg-*` | Package management | `omarchy-pkg-install <pkg>` |
|
||||||
| `omarchy-setup-*` | Initial setup tasks | `omarchy-setup-fingerprint` |
|
| `omarchy-setup-*` | Initial setup tasks | `omarchy-setup-fingerprint` |
|
||||||
| `omarchy-update-*` | System updates | `omarchy-update` |
|
| `omarchy-update-*` | System updates | `omarchy-update` |
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ fi
|
|||||||
echo "Copy hooks examples"
|
echo "Copy hooks examples"
|
||||||
cp -r $OMARCHY_PATH/config/omarchy/* $HOME/.config/omarchy/
|
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
|
omarchy-pkg-add grim slurp
|
||||||
|
|
||||||
echo "Add nfs support by default to Nautilus"
|
echo "Add nfs support by default to Nautilus"
|
||||||
|
|||||||
@@ -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
|
||||||
Reference in New Issue
Block a user