small fixes to calls; wiki updated

This commit is contained in:
copycat-killer 2016-12-04 13:06:12 +01:00
parent 44864dba37
commit b5c2c4cab5
3 changed files with 7 additions and 6 deletions

View File

@ -35,20 +35,22 @@ function fs.hide()
end end
end end
function fs.show(t_out, fs_args) function fs.show(seconds, options, scr)
fs.hide() 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*$", "") local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
if fs.followmouse then if fs.followmouse then
fs.notification_preset.screen = mouse.screen fs.notification_preset.screen = mouse.screen
elseif scr then
fs.notification_preset.screen = scr
end end
fs_notification = naughty.notify({ fs_notification = naughty.notify({
preset = fs.notification_preset, preset = fs.notification_preset,
text = ws, text = ws,
timeout = t_out timeout = seconds or 5
}) })
end end

View File

@ -155,8 +155,7 @@ local function worker(args)
awful.util.spawn(pulsebar.mixer) awful.util.spawn(pulsebar.mixer)
end), end),
awful.button({}, 2, function() awful.button({}, 2, function()
awful.util.spawn(string.format("pactl set-sink-lolume %d 100%%", pulsebar.sink)) awful.util.spawn(string.format("pactl set-sink-volume %d 100%%", pulsebar.sink))
pulsebar.update()
end), end),
awful.button({}, 3, function() awful.button({}, 3, function()
awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink)) awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink))

2
wiki

@ -1 +1 @@
Subproject commit 871d249789aa00159943fc8553fe0cbfc2159cfd Subproject commit d0df450d05655c5d8f724c42dc6b5d18b3676a60