diff --git a/config/packages.nix b/config/packages.nix index 20db65d..be9a838 100644 --- a/config/packages.nix +++ b/config/packages.nix @@ -25,7 +25,7 @@ in { in [ # Shell socat - jaq + jq tldr ripgrep unzip diff --git a/home-manager/wayland/eww/scripts/active-window b/home-manager/wayland/eww/scripts/active-window index 2124d68..8678080 100755 --- a/home-manager/wayland/eww/scripts/active-window +++ b/home-manager/wayland/eww/scripts/active-window @@ -1,6 +1,6 @@ #!/usr/bin/env bash -hyprctl activewindow -j | jaq -c . +hyprctl activewindow -j | jq -c . socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 grep -ose '^activewindow>>' | while read -r line; do - hyprctl activewindow -j | jaq -c . + hyprctl activewindow -j | jq -c . done diff --git a/home-manager/wayland/eww/scripts/get-active-workspace b/home-manager/wayland/eww/scripts/get-active-workspace index b5d8dd3..65245a4 100755 --- a/home-manager/wayland/eww/scripts/get-active-workspace +++ b/home-manager/wayland/eww/scripts/get-active-workspace @@ -1,4 +1,4 @@ #!/usr/bin/env bash -hyprctl monitors -j | jaq '.[] | select(.focused) | .activeWorkspace.id' +hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' diff --git a/home-manager/wayland/eww/scripts/get-workspaces b/home-manager/wayland/eww/scripts/get-workspaces index 5957cb2..3d43617 100755 --- a/home-manager/wayland/eww/scripts/get-workspaces +++ b/home-manager/wayland/eww/scripts/get-workspaces @@ -1,9 +1,9 @@ #!/usr/bin/env bash workspaces() { - hyprctl workspaces -j | jaq -c 'map({key: .id | tostring, value: .windows}) | from_entries - | . as $windows | [range(1;11) | {id: tostring, windows: $windows[tostring] // 0, - previous: $windows[.-1|tostring] // 0, next: $windows[.+1|tostring] // 0}]' + hyprctl workspaces -j | jq -c 'map({key: .id | tostring, value: .windows}) | from_entries + | . as $windows | [range(1;11) | {id: tostring, windows: ($windows[tostring] // 0), + previous: ($windows[.-1|tostring] // 0), next: ($windows[.+1|tostring] // 0)}]' } workspaces diff --git a/home-manager/wayland/scripts/multimedia b/home-manager/wayland/scripts/multimedia index d55c3e4..e5ac5fa 100755 --- a/home-manager/wayland/scripts/multimedia +++ b/home-manager/wayland/scripts/multimedia @@ -1,4 +1,4 @@ #!/usr/bin/env bash notify-send "$1" "$2" -c multimedia -a "$3" \ - $(makoctl list | jaq -r 'first(.data[][]|select(.category.data=="multimedia")|.id.data|["-r",.])[]') \ + $(makoctl list | jq -r 'first(.data[][]|select(.category.data=="multimedia")|.id.data|["-r",.])[]') \ -h "INT:value:$4"