Merge branch 'master' of tardis:/dotfiles

Conflicts:
	awesome/topbar.lua

diff --cc awesome/topbar.lua
index 5f50ec8204c5c70078acd7f98a45b1d0b4971157,790640234479b3870b5de4857b2779dc70e5c56e..587bfc416187a088940556d46fa4b49ac0b5db4b
--- 1/awesome/topbar.lua
--- 2/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@@ -5,9 -5,10 +5,10 @@@ local utils = require("utils"
  local wibox = require("wibox")
  
  -- my widgets
 -local volume_widget  = require("widgets/volume_widget")
 +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")