Other changes at cadscan (with the ones I want to keep stripped)

[dotfiles.git] / awesome / topbar.lua

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index 5f50ec8204c5c70078acd7f98a45b1d0b4971157..91b04faccb6c399ca708b7de9006e8aac73bef0b 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -4,19 +4,11 @@ local utils = require("utils")
 -- Widget and layout library
 local wibox = require("wibox")
 
--- my widgets
-local volume_widget = require("widgets/volume_widget")
-if utils.host == "chronos" then
-    local 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
+-- Wibox {{{1
 -- Create a wibox for each screen and add it
 mywibox = {}
 mypromptbox = {}
@@ -89,7 +81,7 @@ 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])
 
@@ -97,15 +89,18 @@ for s = 1, screen.count() do
     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(require("widgets/pomodoro"))
     right_layout:add(separator)
-    right_layout:add(volume_widget)
+    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(battery_widget)
+        right_layout:add(separator)
+        right_layout:add(require("widgets/battery_widget"))
     end
     right_layout:add(separator)
-    right_layout:add(mytextclock)
+    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)
@@ -116,4 +111,3 @@ for s = 1, screen.count() do
 
     mywibox[s]:set_widget(layout)
 end
--- }}}