Merge branch 'master' of tardis:/dotfiles

Conflicts:
	awesome/topbar.lua

diff --combined awesome/topbar.lua
index 5f50ec8204c5c70078acd7f98a45b1d0b4971157,790640234479b3870b5de4857b2779dc70e5c56e..587bfc416187a088940556d46fa4b49ac0b5db4b
--- 1/awesome/topbar.lua
--- 2/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@@ -5,16 -5,15 +5,17 @@@ 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")
  
  -- Create a textclock widget
  mytextclock = awful.widget.textclock()
 +separator = wibox.widget.textbox()
 +separator:set_markup('<span font="Symbola 10" color="#404040">│</span>')
  
  -- {{{ Wibox
  -- Create a wibox for each screen and add it
@@@ -96,15 -95,11 +97,15 @@@ for s = 1, screen.count() d
      -- Widgets that are aligned to the right
      local right_layout = wibox.layout.fixed.horizontal()
      if s == 1 then right_layout:add(wibox.widget.systray()) end
 +    right_layout:add(separator)
      right_layout:add(network_widget)
 +    right_layout:add(separator)
      right_layout:add(volume_widget)
      if utils.host == "chronos" then
 +    right_layout:add(separator)
          right_layout:add(battery_widget)
      end
 +    right_layout:add(separator)
      right_layout:add(mytextclock)
      right_layout:add(mylayoutbox[s])