lain: new commit; #92 solved

lain

@@ -1 +1 @@
-Subproject commit f6cc2aedd67c1b63f14b8975ccb9a815d04117f6
+Subproject commit 0083df28492685efdeef593e232bc2418d2945b4

rc.lua.copland

@@ -246,8 +246,7 @@ diskwidget:set_bgimage(beautiful.widget_bg)
 
 -- ALSA volume bar
 volicon = wibox.widget.imagebox(beautiful.vol)
-volume = lain.widgets.alsabar({width = 55, ticks = true, ticks_size = 6,
-card = "0", step = "2%",
+volume = lain.widgets.alsabar({width = 55, ticks = true, ticks_size = 6, step = "2%",
 settings = function()
     if volume_now.status == "off" then
         volicon:set_image(beautiful.vol_mute)
@@ -272,7 +271,9 @@ volumewidget = wibox.widget.background(volmargin)
 volumewidget:set_bgimage(beautiful.widget_bg)
 
 -- Weather
-yawn = lain.widgets.yawn(123456)
+myweather = lain.widgets.weather({
+    city_id = 123456 -- placeholder
+})
 
 -- Separators
 spr = wibox.widget.textbox(' ')
@@ -493,7 +494,7 @@ globalkeys = awful.util.table.join(
     -- Widgets popups
     awful.key({ altkey,           }, "c",      function () lain.widgets.calendar:show(7) end),
     awful.key({ altkey,           }, "h",      function () fshomeupd.show(7) end),
-    awful.key({ altkey,           }, "w",      function () yawn.show(7) end),
+    awful.key({ altkey,           }, "w",      function () myweather.show(7) end),
 
     -- ALSA volume control
     awful.key({ altkey }, "Up",

rc.lua.dremora

@@ -204,10 +204,10 @@ volumewidget = lain.widgets.alsa({
 })
 
 -- Weather
-yawn = lain.widgets.yawn(123456,
-{
+myweather = lain.widgets.weather({
+    city_id = 123456, -- placeholder
     settings = function()
-        yawn_notification_preset.fg = white
+        w_notification_preset.fg = white
     end
 })
 
@@ -423,7 +423,7 @@ globalkeys = awful.util.table.join(
     -- Widgets popups
     awful.key({ altkey,           }, "c",      function () lain.widgets.calendar:show(7) end),
     awful.key({ altkey,           }, "h",      function () fshome.show(7) end),
-    awful.key({ altkey,           }, "w",      function () yawn.show(7) end),
+    awful.key({ altkey,           }, "w",      function () myweather.show(7) end),
 
     -- ALSA volume control
     awful.key({ altkey }, "Up",

rc.lua.holo

@@ -285,7 +285,9 @@ networkwidget:set_widget(netwidget)
 networkwidget:set_bgimage(beautiful.widget_bg)
 
 -- Weather
-yawn = lain.widgets.yawn(123456)
+myweather = lain.widgets.weather({
+    city_id = 123456 -- placeholder
+})
 
 -- Separators
 first = wibox.widget.textbox('<span font="Tamsyn 4"> </span>')
@@ -556,7 +558,7 @@ globalkeys = awful.util.table.join(
 
     -- Widgets popups
     awful.key({ altkey,           }, "c",      function () lain.widgets.calendar:show(7) end),
-    awful.key({ altkey,           }, "w",      function () yawn.show(7) end),
+    awful.key({ altkey,           }, "w",      function () myweather.show(7) end),
 
     -- ALSA volume control
     awful.key({ altkey }, "Up",

rc.lua.rainbow

@@ -191,10 +191,10 @@ volumewidget = wibox.widget.background(volmargin)
 volumewidget:set_bgimage(beautiful.vol_bg)
 
 -- Weather
-yawn = lain.widgets.yawn(123456,
-{
+myweather = lain.widgets.weather({
+    city_id = 123456, -- placeholder
     settings = function()
-        yawn_notification_preset.fg = white
+        w_notification_preset.fg = white
     end
 })
 
@@ -421,7 +421,7 @@ globalkeys = awful.util.table.join(
     -- Widgets popups
     awful.key({ altkey,           }, "c",      function () lain.widgets.calendar:show(7) end),
     awful.key({ altkey,           }, "h",      function () fshome.show(7) end),
-    awful.key({ altkey,           }, "w",      function () yawn.show(7) end),
+    awful.key({ altkey,           }, "w",      function () myweather.show(7) end),
 
 
     -- ALSA volume control

rc.lua.steamburn

@@ -208,7 +208,9 @@ volumewidget = lain.widgets.alsa({
 })
 
 -- Weather
-yawn = lain.widgets.yawn(123456)
+myweather = lain.widgets.weather({
+    city_id = 123456 -- placeholder
+})
 
 -- Separators
 first = wibox.widget.textbox(markup.font("Tamsyn 4", " "))
@@ -430,7 +432,7 @@ globalkeys = awful.util.table.join(
     -- Widgets popups
     awful.key({ altkey,           }, "c",      function () lain.widgets.calendar:show(7) end),
     awful.key({ altkey,           }, "h",      function () fshomeupd.show(7) end),
-    awful.key({ altkey,           }, "w",      function () yawn.show(7) end),
+    awful.key({ altkey,           }, "w",      function () myweather.show(7) end),
 
     -- ALSA volume control
     awful.key({ altkey }, "Up",