diff --git a/.local/bin/nmcli_fzy.sh b/.local/bin/nmcli_fzy.sh deleted file mode 100755 index dbfbcc1..0000000 --- a/.local/bin/nmcli_fzy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -nmcli device wifi list -ssid="$(nmcli -g SSID device wifi list --rescan no | - fzy -p "nmcli device wifi connect ")" -[ -z "$ssid" ] && return -if ! nmcli device wifi connect "$ssid"; then - nmcli -a device wifi connect "$ssid" -fi -sleep 1 diff --git a/.local/bin/status.sh b/.local/bin/status.sh index 7e838f5..f35ebe9 100755 --- a/.local/bin/status.sh +++ b/.local/bin/status.sh @@ -5,11 +5,7 @@ printf "[\n" if ! command -v jq >/dev/null; then while true; do - printf '[{ - "full_text":" jq: command not found ", - "urgent":true, - "separator_block_width":0 - },],' + printf '[{ "full_text":"jq: command not found", "urgent":true },],' sleep 1 done fi @@ -17,47 +13,39 @@ fi while true; do printf "[" # keyboard layout - swaymsg -t get_inputs | jq -Mcj ' - [.[] | select(.type=="keyboard")][0] - | { - "full_text":([" ",.xkb_active_layout_name," "]|join("")), + swaymsg -t get_inputs | jq -Mcj '[.[] | select(.type=="keyboard")][0] | + { + "full_text":.xkb_active_layout_name, "urgent":.xkb_active_layout_index, - "separator_block_width":0 }, ","' # battery # shellcheck disable=SC2002 cat /sys/class/power_supply/BAT0/capacity | jq -Mcj ' - if .<20 then { - "full_text":([" ",.," % "]|join("")), - "urgent":true, - "separator_block_width":0 - } else { - "full_text":([" ",.," % "]|join("")), - "separator_block_width":0 - } end, ","' + if .<20 then + { + "full_text":([.," %"]|join("")), + "urgent":true, + } + else + { + "full_text":([.," %"]|join("")), + } + end, ","' # date - date +%c | jq -RMcj '{ - "full_text":([" ",.," "]|join("")), - "separator_block_width":0 - }, ","' + date +%c | jq -RMcj '{ "full_text":., }, ","' # scratchpad - swaymsg -t get_tree | jq -Mcj ' - .nodes[] - | select(.name=="__i3").nodes[] - | select(.name=="__i3_scratch").floating_nodes - | if length>0 then { - "full_text":([" ",length," "]|join("")), - "urgent":true, - "separator_block_width":0 - }, "," else "" end' + swaymsg -t get_tree | jq -Mcj '.nodes[] | select(.name=="__i3").nodes[] | + select(.name=="__i3_scratch").floating_nodes | + { + "full_text":length, + "urgent":length, + }, ","' # notifications - makoctl list | jq -Mcj ' - .data[] - | if length>0 then { - "full_text":([" (",length,") ",.[0].summary.data," "]|join("")), - "urgent":(.[0].urgency.data==2), - "separator_block_width":0 - }, "," else "" end' + makoctl list | jq -Mcj '.data[][0] | + { + "full_text":.summary.data, + "urgent":(.urgency.data==2), + }, ","' printf "]," # timeout timeout 1 swaymsg -t subscribe '["input","binding"]' >/dev/null diff --git a/.local/bin/udisksctl_fzy.sh b/.local/bin/udisksctl_fzy.sh deleted file mode 100755 index 8112195..0000000 --- a/.local/bin/udisksctl_fzy.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -lsblk -lsblk -lpno"name,type,mountpoint" \ - | awk '($1~/.dev.sd/&&$2=="part"){printf($3=="")?"mount -b %s\n":"unmount -b %s\n",$1}' \ - | fzy -p "udisksctl " \ - | xargs -r udisksctl -sleep 1