X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/13d37456af0c7e9a2aaa2e0bedd80def8f51d0f8..refs/heads/cadscan:/awesome/topbar.lua

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index c0b6ee7..91b04fa 100644
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -1,7 +1,14 @@
--- {{{ Wibox
+-- utils
+local utils = require("utils")
+
+-- Widget and layout library
+local wibox = require("wibox")
+
 -- Create a textclock widget
-mytextclock = awful.widget.textclock()
+separator = wibox.widget.textbox()
+separator:set_markup('<span font="Symbola 10" color="#404040">│</span>')
 
+-- Wibox {{{1
 -- Create a wibox for each screen and add it
 mywibox = {}
 mypromptbox = {}
@@ -74,15 +81,26 @@ 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(APW)
-    right_layout:add(mytextclock)
+    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
+        right_layout:add(separator)
+        right_layout:add(require("widgets/battery_widget"))
+    end
+    right_layout:add(separator)
+    right_layout:add(require("widgets/network_widget"))
+    right_layout:add(separator)
+    right_layout:add(require("widgets/calendar"))
     right_layout:add(mylayoutbox[s])
 
     -- Now bring it all together (with the tasklist in the middle)
@@ -93,4 +111,3 @@ for s = 1, screen.count() do
 
     mywibox[s]:set_widget(layout)
 end
--- }}}