lain: new commit

README.rst

@@ -26,7 +26,7 @@ Notable features
 - Quake drop-down terminal
 - Calendar with current day highlighted and months switch with a click
 - Elegant notifications for new mails, current song, volume level, hdd critical state, low battery
-- Yahoo! Weather integration
+- OpenWeatherMap integration
 - Net carrier status notifier
 - Colorful autoupdating icons
 - Symbolic tag names

lain

@@ -1 +1 @@
-Subproject commit 5fc544049aa9a70df55907c8171703604aec7b26
+Subproject commit 8c5b64675dfbf196871ee31cf22920627019bd84

rc.lua.blackburn

@@ -198,11 +198,11 @@ volumewidget = lain.widgets.alsa({
     end
 })
 
--- Weather
-yawn = lain.widgets.yawn(123456,
-{
+myweather = lain.widgets.weather({
+    city_id = 123456, -- placeholder
     settings = function()
-        widget:set_markup(" " .. units .. " ")
+        units = math.floor(weather_now["main"]["temp"])
+        widget:set_text(" " .. units .. " ")
     end
 })
 
@@ -297,8 +297,8 @@ for s = 1, screen.count() do
     right_layout:add(first)
     right_layout:add(mpdwidget)
     --right_layout:add(mailwidget)
-    right_layout:add(yawn.icon)
-    right_layout:add(yawn.widget)
+    right_layout:add(myweather.icon)
+    right_layout:add(myweather)
     right_layout:add(fshome)
     right_layout:add(batwidget)
     right_layout:add(volumewidget)
@@ -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.multicolor

@@ -118,7 +118,7 @@ clockicon = wibox.widget.imagebox(beautiful.widget_clock)
 mytextclock = lain.widgets.abase({
     timeout  = 60,
     cmd      = "date +'%A %d %B %R'",
-    settings = function() 
+    settings = function()
         local t_output = ""
         local o_it = string.gmatch(output, "%S+")
 
@@ -133,9 +133,12 @@ lain.widgets.calendar:attach(mytextclock, { font_size = 10 })
 
 -- Weather
 weathericon = wibox.widget.imagebox(beautiful.widget_weather)
-yawn = lain.widgets.yawn(123456, {
+myweather = lain.widgets.weather({
+    city_id = 123456, -- placeholder
     settings = function()
-        widget:set_markup(markup("#eca4c4", forecast:lower() .. " @ " .. units .. "°C "))
+        descr = weather_now["weather"][1]["description"]:lower()
+        units = math.floor(weather_now["main"]["temp"])
+        widget:set_markup(markup("#eca4c4", descr .. " @ " .. units .. "°C "))
     end
 })
 
@@ -219,9 +222,9 @@ netupicon = wibox.widget.imagebox(beautiful.widget_netup)
 netupinfo = lain.widgets.net({
     settings = function()
         if iface ~= "network off" and
-           string.match(yawn.widget._layout.text, "N/A")
+           string.match(myweather._layout.text, "N/A")
         then
-            yawn.fetch_weather()
+            myweather.update()
         end
 
         widget:set_markup(markup("#e54c62", net_now.sent .. " "))
@@ -367,7 +370,7 @@ for s = 1, screen.count() do
     right_layout:add(fsicon)
     right_layout:add(fswidget)
     right_layout:add(weathericon)
-    right_layout:add(yawn.widget)
+    right_layout:add(myweather)
     right_layout:add(tempicon)
     right_layout:add(tempwidget)
     right_layout:add(baticon)
@@ -506,7 +509,7 @@ globalkeys = awful.util.table.join(
     -- Widgets popups
     awful.key({ altkey,           }, "c",      function () lain.widgets.calendar:show(7) end),
     awful.key({ altkey,           }, "h",      function () fswidget.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",

scratchdrop/README.md

@@ -1,3 +0,0 @@
-This is the `drop` section of [scratchpad](http://awesome.naquadah.org/wiki/Scratchpad_manager).
-
-I cutted out the rest because I don't use it.