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

diff --cc awesome/topbar.lua
index b816365f2c247581f3b566eb30b0c01252fb3a98,7986af062689ae0f357d1f6e3a0e298e2fbc2984..4d5d50546d28b9cae5cc6e6f17143366f610af25
--- 1/awesome/topbar.lua
--- 2/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

diff --cc vim/vimrc
Simple merge