awesome: move net_widgets to widgets/

diff --git a/.gitmodules b/.gitmodules
index 4ad3649f5d32c24077df3971da64c3a3b5c30dde..db790744ed911dab5999bbbaca62ff8209128f8d 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "awesome/widgets/awesompd"]
        path = awesome/widgets/awesompd
        url = git@github.com:Ram-Z/awesompd.git
-[submodule "awesome/net_widgets"]
-       path = awesome/net_widgets
-       url = https://github.com/plotnikovanton/net_widgets
+[submodule "awesome/widgets/net_widgets"]
+       path = awesome/widgets/net_widgets
+       url = git@github.com:Ram-Z/net_widgets.git

diff --git a/awesome/net_widgets b/awesome/net_widgets
deleted file mode 160000 (submodule)
index 8223760..0000000
--- a/awesome/net_widgets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8223760041a49604f9b1a498e09943e24c2ebeb2

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index 0e413e5af20617c209c127ccb179020c81df16d0..7986af062689ae0f357d1f6e3a0e298e2fbc2984 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -3,7 +3,6 @@ local utils = require("utils")
 
 -- Widget and layout library
 local wibox = require("wibox")
-local net_widgets = require("net_widgets")
 
 -- Create a textclock widget
 separator = wibox.widget.textbox()
@@ -97,7 +96,7 @@ for s = 1, screen.count() do
         right_layout:add(require("widgets/battery_widget"))
     end
     right_layout:add(separator)
-    right_layout:add(net_widgets.wireless({interface='wlp3s0'}))
+    right_layout:add(require("widgets/network_widget"))
     right_layout:add(separator)
     right_layout:add(require("widgets/calendar"))
     right_layout:add(mylayoutbox[s])

diff --git a/awesome/widgets/net_widgets b/awesome/widgets/net_widgets
new file mode 160000 (submodule)
index 0000000..b6f857b
--- /dev/null
+++ b/awesome/widgets/net_widgets
@@ -0,0 +1 @@
+Subproject commit b6f857b3a921acdf19ab2f88b73cf5995c8fc6b9

diff --git a/awesome/widgets/network_widget.lua b/awesome/widgets/network_widget.lua
index 36c72e7f77dad7c95a4ea98d9ec91d056f84bacb..0935fee055202a232b45e62e210699e268f625ea 100644 (file)
--- a/awesome/widgets/network_widget.lua
+++ b/awesome/widgets/network_widget.lua
@@ -1,22 +1,12 @@
-local wibox = require("wibox")
-local vicious = require("vicious")
 local utils = require("utils")
+local net_widget = require("widgets/net_widgets")
 
-module("network_widget")
-
-local intf = ""
-if utils.host == "chronos" then intf = "wlp3s0" end
-if utils.host == "shada"   then intf = "enp3s0" end
-
-local function netclosure(intf)
-    return function (_, args)
-        local up_mb = args["{"..intf.." up_kb}"]
-        local down_mb = args["{"..intf.." down_kb}"]
-        return "Net: ↑"..up_mb.." ↓"..down_mb
-    end
+local widget
+if utils.host == "smartlab-imac2" then
+    widget = net_widget.wireless({interface="wlp3s0", command_mode="newer", font='monospace'})
+end
+if utils.host == "shada" then
+    widget = net_widget.indicator({interfaces={"enp3s0", command_mode="newer"}})
 end
 
-network_widget = wibox.widget.textbox()
-vicious.register(network_widget, vicious.widgets.net, netclosure(intf), 1)
-
-return network_widget
+return widget