config/eww ahrc-laptop : mise à jour widget réseau

config/eww-ahrc--laptop/eww.yuck

@@ -19,7 +19,7 @@
 )
 
 (deflisten network
-  :initial '{"state":"disconnected","infos":{}}'
+  :initial '{"state":"disconnect"}'
   "listen/network"
 )
 
@@ -77,7 +77,18 @@
 
 ; (defwidget sound [] "")
 (defwidget network []
-  "${network.state == "wireless" ? "${network-icon["wifi-${network.infos.signal}"]} ${network.infos.ssid}" : "${network-icon[network.state]}"}"
+  "${
+    network.state == "wireless"
+      ? network-icon["wifi-${network.wifi.signal}"]
+      : network-icon[network.state]
+  } ${
+    network.state == "disconnected"
+      ? "no network" :
+    network.state == "ethernet"
+      ? "wired" :
+    network.state == "wireless"
+      ? network.wifi.ssid : ''
+  }"
 )
 
 (defwidget battery []

config/eww-ahrc--laptop/listen/network

@@ -26,31 +26,27 @@ wifi_strength() {
 }
 
 print_infos() {
-  printf \{
-  
   if [ -n "$1" ]; then
     route_line=$(ip route show dev "$1" | awk '($1 == "default") { print }')
 
-    printf '"ip":"%s","gateway":"%s"' \
+    printf ',"ip":{"local":"%s","gateway":"%s"}' \
       "$(echo "$route_line" | awk '{ print $7 }')" \
       "$(echo "$route_line" | awk '{ print $3 }')"
 
     if [ "$state" = wireless ]; then
       signal=$(iw dev "$1" link | awk '($1 == "signal:") { print $2}')
-      printf ',"signal":"%s","ssid":"%s"' \
+      printf ',"wifi":{"signal":"%s","ssid":"%s"}' \
         "$(wifi_strength "$signal")" \
         "$(iw dev wlan0 info | grep '^\s*ssid ' | xargs | cut -d \  -f 2-)"
     fi
   fi
-
-  printf '}\n'
 }
 
 print_network_status() {
   device=$(ip route | awk '($1 == "default") { print $5 }')
   state=$(print_state "$device")
 
-  printf '{"state":"%s","infos":%s}\n' \
+  printf '{"state":"%s"%s}\n' \
     "$state" \
     "$(print_infos "$device")"
 }