awesome: update layout.inc call to new api

[dotfiles.git] / awesome / topbar.lua

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index 58c01953877870b8c2353be808a750cc8b6ef4a6..b945d80193a7dd846dd4c5ffd579344168ca8cec 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -1,12 +1,15 @@
+-- utils
+local utils = require("utils")
+
 -- Widget and layout library
 local wibox = require("wibox")
 
--- my widgets
-local volume_widget  = require("widgets/volume_widget")
 -- Create a textclock widget
-mytextclock = awful.widget.textclock()
+mytextclock = awful.widget.textclock(" %a %b %d, %k:%M ", 10)
+separator = wibox.widget.textbox()
+separator:set_markup('<span font="Symbola 10" color="#404040">│</span>')
 
--- {{{ Wibox
+-- Wibox {{{1
 -- Create a wibox for each screen and add it
 mywibox = {}
 mypromptbox = {}
@@ -79,14 +82,21 @@ for s = 1, screen.count() do
 
     -- Widgets that are aligned to the left
     local left_layout = wibox.layout.fixed.horizontal()
-    left_layout:add(mylauncher)
+    -- left_layout:add(mylauncher)
     left_layout:add(mytaglist[s])
     left_layout:add(mypromptbox[s])
 
     -- 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(volume_widget)
+    right_layout:add(separator)
+    right_layout:add(require("widgets/awesompd"))
+    right_layout:add(require("widgets/volume_widget"))
+    if utils.host == "chronos" then
+        right_layout:add(separator)
+        right_layout:add(require("widgets/battery_widget"))
+    end
+    right_layout:add(separator)
     right_layout:add(mytextclock)
     right_layout:add(mylayoutbox[s])
 
@@ -98,4 +108,3 @@ for s = 1, screen.count() do
 
     mywibox[s]:set_widget(layout)
 end
--- }}}