From: Samir Benmendil <me@rmz.io>
Date: Mon, 24 Oct 2016 08:20:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/30a510867ee248d937c772c091ce2b1f15bab755

Merge remote-tracking branch 'refs/remotes/origin/master'
---

30a510867ee248d937c772c091ce2b1f15bab755
diff --cc awesome/topbar.lua
index b816365,7986af0..4d5d505
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@@ -89,11 -89,9 +89,9 @@@ for s = 1, screen.count() d
      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(require("widgets/pomodoro"))
-     right_layout:add(separator)
      right_layout:add(require("widgets/awesompd"))
      right_layout:add(require("widgets/volume_widget"))
 -    if utils.host == "chronos" then
 +    if utils.has_battery() then
          right_layout:add(separator)
          right_layout:add(require("widgets/battery_widget"))
      end