Merge branch 'master' of tardis:/dotfiles

Conflicts:
	awesome/topbar.lua

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index 5f50ec8204c5c70078acd7f98a45b1d0b4971157..587bfc416187a088940556d46fa4b49ac0b5db4b 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -6,8 +6,9 @@ local wibox = require("wibox")
 
 -- my widgets
 local volume_widget = require("widgets/volume_widget")
+local battery_widget = { }
 if utils.host == "chronos" then
-    local battery_widget = require("widgets/battery_widget")
+    battery_widget = require("widgets/battery_widget")
 end
 local network_widget = require("widgets/network_widget")
 

diff --git a/awesome/widgets/network_widget.lua b/awesome/widgets/network_widget.lua
index 59ebeec3962fb11e8850b73ae887289d7a36b1c1..36c72e7f77dad7c95a4ea98d9ec91d056f84bacb 100644 (file)
--- a/awesome/widgets/network_widget.lua
+++ b/awesome/widgets/network_widget.lua
@@ -1,11 +1,13 @@
 local wibox = require("wibox")
 local vicious = require("vicious")
-local naughty = require("naughty")
-local beautiful = require("beautiful")
-local pairs = pairs
+local utils = require("utils")
 
 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}"]
@@ -15,6 +17,6 @@ local function netclosure(intf)
 end
 
 network_widget = wibox.widget.textbox()
-vicious.register(network_widget, vicious.widgets.net, netclosure("enp3s0"), 1)
+vicious.register(network_widget, vicious.widgets.net, netclosure(intf), 1)
 
 return network_widget