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 b945d80193a7dd846dd4c5ffd579344168ca8cec..91b04faccb6c399ca708b7de9006e8aac73bef0b 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -5,7 +5,6 @@ local utils = require("utils")
 local wibox = require("wibox")
 
 -- Create a textclock widget
 local wibox = require("wibox")
 
 -- Create a textclock widget

-mytextclock = awful.widget.textclock(" %a %b %d, %k:%M ", 10)

 separator = wibox.widget.textbox()
 separator:set_markup('<span font="Symbola 10" color="#404040">│</span>')
 
 separator = wibox.widget.textbox()
 separator:set_markup('<span font="Symbola 10" color="#404040">│</span>')
 


@@ -90,6 +89,8 @@ 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)
     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
     right_layout:add(require("widgets/awesompd"))
     right_layout:add(require("widgets/volume_widget"))
     if utils.host == "chronos" then


@@ -97,7 +98,9 @@ for s = 1, screen.count() do
         right_layout:add(require("widgets/battery_widget"))
     end
     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)
     right_layout:add(mylayoutbox[s])
 
     -- Now bring it all together (with the tasklist in the middle)