make functions local, actually run conky

[dotfiles.git] / awesome / topbar.lua

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index 84a7b5a29edecd2e4417d5d4a3f027e50c26ee64..98ebb5b68a02bfa2d754e946170a18e44b43dc2b 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -1,12 +1,20 @@
+-- utils
+local utils = require("utils")
+
 -- Widget and layout library
-wibox = require("wibox")
+local wibox = require("wibox")
+
 -- my widgets
-require("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")
 
--- {{{ Wibox
 -- Create a textclock widget
 mytextclock = awful.widget.textclock()
 
+-- {{{ Wibox
 -- Create a wibox for each screen and add it
 mywibox = {}
 mypromptbox = {}
@@ -86,8 +94,11 @@ 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(APW)
-    right_layout:add(volwidget)
+    right_layout:add(network_widget)
+    right_layout:add(volume_widget)
+    if utils.host == "chronos" then
+        right_layout:add(battery_widget)
+    end
     right_layout:add(mytextclock)
     right_layout:add(mylayoutbox[s])