diff --git a/bar/eww/bar/widget.yuck b/bar/eww/bar/widget.yuck index b9fc7d0..96b3e8c 100644 --- a/bar/eww/bar/widget.yuck +++ b/bar/eww/bar/widget.yuck @@ -53,7 +53,6 @@ (defwidget connectivity [] (eventbox - :onclick "bash -c 'iwgtk &> /dev/null &'" (label :class "connectivity" :text "${ diff --git a/bar/eww/default.nix b/bar/eww/default.nix index c1ca8d4..b155b69 100644 --- a/bar/eww/default.nix +++ b/bar/eww/default.nix @@ -11,7 +11,6 @@ home.packages = [ pkgs.eww # Script dependencies - pkgs.iw pkgs.jq pkgs.dash pkgs.socat diff --git a/bar/eww/scripts/get-connectivity-info b/bar/eww/scripts/get-connectivity-info index cc6cee3..7d19232 100755 --- a/bar/eww/scripts/get-connectivity-info +++ b/bar/eww/scripts/get-connectivity-info @@ -9,6 +9,9 @@ print_network_state() { wlan*) echo wireless ;; + wlp*) + echo wireless + ;; usb*) echo tethering ;; @@ -36,10 +39,10 @@ print_network_infos() { "$(echo "$route_line" | awk '{ print $3 }')" if [ "$state" = wireless ]; then - signal=$(iw dev "$1" link | awk '($1 == "signal:") { print $2}') + signal=$(nmcli -m multiline device wifi | grep '^\s*SIGNAL: ' | xargs | cut -d \ -f 2) printf ',"wifi":{"signal":"%s","ssid":"%s"}' \ "$(wifi_strength "$signal")" \ - "$(iw dev wlan0 info | grep '^\s*ssid ' | xargs | cut -d \ -f 2-)" + "$(nmcli -m multiline device wifi | grep '^\s*SSID: ' | xargs | cut -d \ -f 2)" fi fi }