mutt: use column with for html rendering

[dotfiles.git] / awesome / topbar.lua

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index e6fa42365873473bb609d0ae4ef783118fc985d2..c6f21fc1513d75d2e5a1083f87ae291dc8a7d650 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -4,15 +4,10 @@ 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()
+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
 -- Create a wibox for each screen and add it
@@ -94,11 +89,14 @@ for s = 1, screen.count() do
     -- 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(network_widget)
-    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(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(mylayoutbox[s])