diff --git a/rc.lua b/rc.lua
index 9284012..eec2ce2 100644
--- a/rc.lua
+++ b/rc.lua
@@ -234,12 +234,11 @@ optimus_icon:buttons(awful.util.table.join(
))
-- Wi-Fi / Ethernet widgets
-local wifi_widget = wibox.widget.textbox()
+local net_widget = wibox.widget.textbox()
+local icon_net = wibox.widget.imagebox()
+icon_net:set_image (beautiful.widget_wired)
local icon_wifi = wibox.widget.imagebox()
icon_wifi:set_image (beautiful.widget_wifi)
-local wired_widget = wibox.widget.textbox()
-local icon_wired = wibox.widget.imagebox()
-icon_wired:set_image (beautiful.widget_wired)
-- Network buttons
function show_nload (interface)
@@ -248,10 +247,9 @@ end
function show_nethogs ()
os.execute ("pgrep nethogs || urxvt -e sudo nethogs &")
end
+icon_net:buttons(awful.util.table.join(awful.button({ }, 1, function () show_nload("wan0") end), awful.button({ }, 1, show_nethogs)))
icon_wifi:buttons(awful.util.table.join(awful.button({ }, 1, function () show_nload("wifi0") end), awful.button({ }, 1, show_nethogs)))
-wifi_widget:buttons(icon_wifi:buttons())
-icon_wired:buttons(awful.util.table.join(awful.button({ }, 1, function () show_nload("wan0") end), awful.button({ }, 1, show_nethogs)))
-wired_widget:buttons(icon_wired:buttons())
+vicious.register(net_widget, vicious.widgets.net, '${wan0 down_mb}^${wan0 up_mb} mb/s ${wifi0 down_mb}^${wifi0 up_mb}', 2)
-- VOL icon
vicious.cache(vicious.widgets.volume)
@@ -307,12 +305,6 @@ disk = wibox.widget.textbox()
vicious.register(disk, vicious.widgets.fs, '${/mnt/bcache0 avail_gb}Gb ', 15)
disk:buttons(diskicon:buttons())
---vicious.cache(vicious.widgets.net)
---vicious.cache(wifi_widget)
---vicious.cache(wired_widget)
-vicious.register(wifi_widget, vicious.widgets.net, '${wifi0 down_mb}^${wifi0 up_mb}', 2)
-vicious.register(wired_widget, vicious.widgets.net, '${wan0 down_mb}^${wan0 up_mb}mb/s', 2)
-
----< Wibar >--------------------------------------------------
@@ -444,11 +436,10 @@ awful.screen.connect_for_each_screen(function(s)
spacer,
baticon,
batpct,
- icon_wifi,
- wifi_widget,
spacer,
- icon_wired,
- wired_widget,
+ icon_net,
+ net_widget,
+ icon_wifi,
spacer,
volicon,
volpct,