X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/b371de56f8bf19f982a4f6887f2110444b590f74..fb358dcd043d9639cb2ec19f4e369b8aa31675dc:/widgets/fs.lua?ds=inline

diff --git a/widgets/fs.lua b/widgets/fs.lua
index f78cfe0..fab61bd 100644
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -47,7 +47,6 @@ function fs:show(t_out)
         preset = fs_notification_preset,
         text = ws,
         timeout = t_out,
-        screen = client.focus and client.focus.screen or 1
     })
 end
 
@@ -62,12 +61,12 @@ local function worker(args)
 
     fs.widget = wibox.widget.textbox('')
 
-    helpers.set_map("fs", false)
+    helpers.set_map(partition, false)
 
     function update()
         fs_info = {}
         fs_now  = {}
-        local f = io.popen("LC_ALL=C df -kP " .. partition)
+        local f = assert(io.popen("LC_ALL=C df -kP"))
 
         for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
             local s     = string.match(line, "^.-[%s]([%d]+)")
@@ -92,7 +91,7 @@ local function worker(args)
         widget = fs.widget
         settings()
 
-        if fs_now.used >= 99 and not helpers.get_map("fs")
+        if fs_now.used >= 99 and not helpers.get_map(partition)
         then
             naughty.notify({
                 title = "warning",
@@ -100,19 +99,18 @@ local function worker(args)
                 timeout = 8,
                 fg = "#000000",
                 bg = "#FFFFFF",
-                screen = client.focus and client.focus.screen or 1
             })
-            helpers.set_map("fs", true)
+            helpers.set_map(partition, true)
         else
-            helpers.set_map("fs", false)
+            helpers.set_map(partition, false)
         end
     end
 
-    helpers.newtimer(partition, timeout, update)
-
     widget:connect_signal('mouse::enter', function () fs:show(0) end)
     widget:connect_signal('mouse::leave', function () fs:hide() end)
 
+    helpers.newtimer(partition, timeout, update)
+
     return setmetatable(fs, { __index = fs.widget })
 end