From c3240d8cd4a92a5358eacf33a41508f236781d64 Mon Sep 17 00:00:00 2001
From: Luke Bonham <dada@archlinux.info>
Date: Sun, 12 Jul 2015 17:22:51 +0200
Subject: [PATCH] lain: new commit; #92 solved

---
 lain             | 2 +-
 rc.lua.copland   | 9 +++++----
 rc.lua.dremora   | 8 ++++----
 rc.lua.holo      | 6 ++++--
 rc.lua.rainbow   | 8 ++++----
 rc.lua.steamburn | 6 ++++--
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lain b/lain
index f6cc2ae..0083df2 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit f6cc2aedd67c1b63f14b8975ccb9a815d04117f6
+Subproject commit 0083df28492685efdeef593e232bc2418d2945b4
diff --git a/rc.lua.copland b/rc.lua.copland
index a96e593..a06800e 100644
--- a/rc.lua.copland
+++ b/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",
diff --git a/rc.lua.dremora b/rc.lua.dremora
index 47dee20..e0409c1 100644
--- a/rc.lua.dremora
+++ b/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",
diff --git a/rc.lua.holo b/rc.lua.holo
index 1ea62bf..534dc89 100644
--- a/rc.lua.holo
+++ b/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",
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 813cd92..10cdbcd 100644
--- a/rc.lua.rainbow
+++ b/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
diff --git a/rc.lua.steamburn b/rc.lua.steamburn
index 937371f..077a014 100644
--- a/rc.lua.steamburn
+++ b/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",