From: copycat-killer <dada@archlinux.info>
Date: Sun, 4 Dec 2016 12:06:12 +0000 (+0100)
Subject: small fixes to calls; wiki updated
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/b5c2c4cab580d63be5b6e7e54b8c445b87fffaa5?ds=inline;hp=--cc

small fixes to calls; wiki updated
---

b5c2c4cab580d63be5b6e7e54b8c445b87fffaa5
diff --git a/widgets/fs.lua b/widgets/fs.lua
index ad5b204..6038746 100644
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -35,20 +35,22 @@ function fs.hide()
     end
 end
 
-function fs.show(t_out, fs_args)
+function fs.show(seconds, options, scr)
     fs.hide()
 
-    local cmd = (fs_args and string.format("dfs %s", fs_args)) or "dfs"
+    local cmd = (options and string.format("dfs %s", options)) or "dfs"
     local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
 
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen
+    elseif scr then
+			  fs.notification_preset.screen = scr
     end
 
     fs_notification = naughty.notify({
         preset  = fs.notification_preset,
         text    = ws,
-        timeout = t_out
+        timeout = seconds or 5
     })
 end
 
diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua
index 51de3a7..006515c 100644
--- a/widgets/pulsebar.lua
+++ b/widgets/pulsebar.lua
@@ -155,8 +155,7 @@ local function worker(args)
             awful.util.spawn(pulsebar.mixer)
           end),
           awful.button({}, 2, function()
-						awful.util.spawn(string.format("pactl set-sink-lolume %d 100%%", pulsebar.sink))
-            pulsebar.update()
+						awful.util.spawn(string.format("pactl set-sink-volume %d 100%%", pulsebar.sink))
           end),
           awful.button({}, 3, function()
 						awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink))
diff --git a/wiki b/wiki
index 871d249..d0df450 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 871d249789aa00159943fc8553fe0cbfc2159cfd
+Subproject commit d0df450d05655c5d8f724c42dc6b5d18b3676a60