add mpd widget; better borders

1 files changed, 33 insertions, 2 deletions

diff --git a/modules/desktop/awesome/rc.lua b/modules/desktop/awesome/rc.lua
index 1fb1ea5..41728fa 100644
--- a/modules/desktop/awesome/rc.lua
+++ b/modules/desktop/awesome/rc.lua
@@ -143,6 +143,9 @@ local topcalendar = calendar_widget()
 local volume_widget = require("widgets.volume")
 local volumebar = volume_widget()
 
+local mpd_widget = require("widgets.mpd")
+local mpdbar = mpd_widget()
+
 toptextclock:connect_signal("button::press",
 function(_, _, _, button)
     if button == 1 then topcalendar.toggle() end
@@ -344,6 +347,22 @@ awful.screen.connect_for_each_screen(function(s)
 end)
 -- }}}
 
+local mpd_dock = wibox {
+    visible = true,
+    ontop = false,
+    height = 24,
+    width = 300,
+    bg = "00000000"
+}
+
+mpd_dock:setup {
+    mpdbar,
+    halign = "center",
+    layout = wibox.container.place
+}
+
+awful.placement.top_right(mpd_dock, { margins = { top = 42, right = 8 }, parent = awful.screen.focused() })
+
 -- {{{ Mouse bindings
 root.buttons(gears.table.join(
     awful.button({ }, 3, function () mymainmenu:toggle() end),
@@ -657,7 +676,16 @@ client.connect_signal("request::titlebars", function(c)
         end)
     )
 
-    awful.titlebar(c, {size = dpi(20), position = "left"}) : setup {
+    awful.titlebar(c, {size = dpi(6), position = "top"}) : setup {
+        layout = wibox.layout.align.horizontal
+    }
+    awful.titlebar(c, {size = dpi(6), position = "bottom"}) : setup {
+        layout = wibox.layout.align.horizontal
+    }
+    awful.titlebar(c, {size = dpi(6), position = "right"}) : setup {
+        layout = wibox.layout.align.vertical
+    }
+    awful.titlebar(c, {size = dpi(26), position = "left"}) : setup {
         { -- Left
             awful.titlebar.widget.iconwidget(c),
             widget = wibox.container.margin,
@@ -681,29 +709,32 @@ client.connect_signal("request::titlebars", function(c)
                         widget = awful.titlebar.widget.maximizedbutton(c),
                     },
                     widget = wibox.container.background,
+                    ontop = true,
                     shape = gears.shape.circle,
                     shape_border_width = 1,
                     shape_border_color = "#12ac28",
                     bg = "#28c940",
                     forced_height = dpi(14),
+                    forced_width = dpi(14),
                 },
                 {
                     {
                         widget = awful.titlebar.widget.closebutton(c),
                     },
                     widget = wibox.container.background,
+                    ontop = true,
                     shape = gears.shape.circle,
                     shape_border_width = 1,
                     shape_border_color = "#ad3934",
                     bg = "#bf4943",
                     forced_height = dpi(14),
+                    forced_width = dpi(14),
                 },
                 spacing = dpi(6),
                 layout = wibox.layout.fixed.vertical
             },
             widget = wibox.container.margin;
             top = dpi(6);
-            bottom = dpi(6);
         },
         layout = wibox.layout.align.vertical
     }