Merge branch 'master' of https://github.com/copycat-killer/lain

diff --combined widgets/bat.lua
index 21b5c4317dc8b94a1dac670ec8ff82c23078b33a,4a25d6315ced28c1d071408ccb5afd4f3ecd948b..4526c857ac78f252daf2f2b41f27e6e4e20798c1
--- 1/widgets/bat.lua
--- 2/widgets/bat.lua
+++ b/widgets/bat.lua
@@@ -32,6 -32,22 +32,22 @@@ local function worker(args
  
      bat.widget = wibox.widget.textbox('')
  
+     bat_notification_low_preset = {
+         title = "Battery low",
+         text = "Plug the cable!",
+         timeout = 15,
+         fg = "#202020",
+         bg = "#CDCDCD"
+     }
+ 
+     bat_notification_critical_preset = {
+         title = "Battery exhausted",
+         text = "Shutdown imminent",
+         timeout = 15,
+         fg = "#000000",
+         bg = "#FFFFFF"
+     }
+ 
      function update()
          bat_now = {
              status = "Not present",
@@@ -59,7 -75,7 +75,7 @@@
  
              bat_now.status = first_line(bstr .. "/status") or "N/A"
  
 -            rate  = tonumber(rate)
 +            rate  = tonumber(rate) or 1
              ratev = tonumber(ratev)
              rem   = tonumber(rem)
              tot   = tonumber(tot)
@@@ -96,39 -112,28 +112,28 @@@
                  bat_now.watt = "N/A"
              end
  
-             -- notifications for low and critical states
-             if bat_now.status == "Discharging" and notify == "on"
-             then
-                 if tonumber(bat_now.perc) <= 5
-                 then
-                     bat.id = naughty.notify({
-                         text = "shutdown imminent",
-                         title = "battery nearly exhausted",
-                         position = "top_right",
-                         timeout = 15,
-                         fg="#000000",
-                         bg="#ffffff",
-                         ontop = true,
-                         replaces_id = bat.id
-                     }).id
-                 elseif tonumber(bat_now.perc) <= 15
-                 then
-                     bat.id = naughty.notify({
-                         text = "plug the cable",
-                         title = "battery low",
-                         position = "top_right",
-                         timeout = 15,
-                         fg="#202020",
-                         bg="#cdcdcd",
-                         ontop = true,
-                         replaces_id = bat.id
-                     }).id
-                 end
-             end
          end
  
          widget = bat.widget
          settings()
+ 
+         -- notifications for low and critical states
+         if bat_now.status == "Discharging" and notify == "on"
+         then
+             if tonumber(bat_now.perc) <= 5
+             then
+                 bat.id = naughty.notify({
+                     preset = bat_notification_critical_preset,
+                     replaces_id = bat.id
+                 }).id
+             elseif tonumber(bat_now.perc) <= 15
+             then
+                 bat.id = naughty.notify({
+                     preset = bat_notification_low_preset,
+                     replaces_id = bat.id
+                 }).id
+             end
+         end
      end
  
      newtimer("bat", timeout, update)