X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/444ffd03c128f45ac1227b33ceb951ae12506a70..1134630a54d403d1c50b6ed487e9bb5d67319954:/widgets/fs.lua

diff --git a/widgets/fs.lua b/widgets/fs.lua
index f07ef98..eda3ffc 100644
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -9,7 +9,6 @@
 local helpers      = require("lain.helpers")
 
 local shell        = require("awful.util").shell
-local beautiful    = require("beautiful")
 local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")
@@ -27,6 +26,7 @@ local fs = {}
 fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 function fs.hide()
+    if not fs.notification then return end
     naughty.destroy(fs.notification)
     fs.notification = nil
 end
@@ -37,7 +37,7 @@ function fs.show(seconds, scr)
     if fs.followtag then
         fs.notification_preset.screen = focused()
     elseif scr then
-        fs.notification_preset.screen = scr
+        fs.notification_preset.screen = scr or 1
     end
 
     local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
@@ -61,16 +61,22 @@ local function worker(args)
 
     fs.options             = args.options
     fs.followtag           = args.followtag or false
-    fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
+    fs.notification_preset = args.notification_preset
+
+    if not fs.notification_preset then
+        fs.notification_preset      = naughty.config.defaults
+        fs.notification_preset.font = "Monospace 10"
+        fs.notification_preset.fg   = "#FFFFFF"
+        fs.notification_preset.bg   = "#000000"
+    end
 
     fs.widget = wibox.widget.textbox()
 
     helpers.set_map(partition, false)
 
-
     function update()
         fs_info, fs_now  = {}, {}
-        helpers.async(string.format("%s -c 'LC_ALL=C df -k --output=target,size,used,avail,pcent'", shell), function(f)
+        helpers.async({ shell, "-c", "LC_ALL=C df -k --output=target,size,used,avail,pcent" }, function(f)
             for line in string.gmatch(f, "\n[^\n]+") do
                 local m,s,u,a,p = string.match(line, "(/.-%s).-(%d+).-(%d+).-(%d+).-([%d]+)%%")
                 m = m:gsub(" ", "") -- clean target from any whitespace
@@ -100,11 +106,9 @@ local function worker(args)
 
             if notify == "on" and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then
                 naughty.notify({
-                    title   = "warning",
-                    text    = partition .. " is empty!",
-                    timeout = 8,
-                    fg      = "#000000",
-                    bg      = "#FFFFFF"
+                    preset = naughty.config.presets.critical,
+                    title  = "Warning",
+                    text   = partition .. " is empty",
                 })
                 helpers.set_map(partition, true)
             else