X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/099e23aac2372f11a6f2b9a8c0d62bdfd8ee85b6..c155301459aa73a1b5e9a1b674be12f03021c4fe:/widgets/contrib/task.lua

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 2f57317..4a9b5b6 100644
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -7,6 +7,7 @@
 --]]
 
 local helpers = require("lain.helpers")
+local markup  = require("lain.util").markup
 local awful   = require("awful")
 local naughty = require("naughty")
 local string  = { format = string.format, gsub = string.gsub }
@@ -30,11 +31,10 @@ function task.show(scr)
         task.notification_preset.screen = scr
     end
 
-    helpers.async(string.format("%s -c '%s'", awful.util.shell, task.cmd),
-    function(f)
+    helpers.async(task.show_cmd, function(f)
         task.notification = naughty.notify({
-            preset = task_notification_preset,
-            title  = task.cmd,
+            preset = task.notification_preset,
+            title  = task.show_cmd,
             text   = markup.font(task.notification_preset.font,
                      awful.util.escape(f:gsub("\n*$", "")))
         })
@@ -46,10 +46,9 @@ function task.prompt()
         prompt       = task.prompt_text,
         textbox      = awful.screen.focused().mypromptbox.widget,
         exe_callback = function(t)
-            helpers.async(string.format("%s -c '%s'", awful.util.shell, t),
-            function(f)
+            helpers.async(t, function(f)
                 naughty.notify {
-                    preset = task_notification_preset,
+                    preset = task.notification_preset,
                     title    = t,
                     text     = markup.font(task.notification_preset.font,
                                awful.util.escape(f:gsub("\n*$", "")))
@@ -62,15 +61,16 @@ end
 
 function task.attach(widget, args)
     local args               = args or {}
-    task.show_cmd            = args.cmd or "task"
+    task.show_cmd            = args.show_cmd or "task next"
     task.prompt_text         = args.prompt_text or "Enter task command: "
     task.followtag           = args.followtag or false
     task.notification_preset = args.notification_preset
 
     if not task.notification_preset then
-        task.notification_preset      = naughty.config.defaults
-        task.notification_preset.font = "Monospace 10"
-        task.notification_preset.icon = helpers.icons_dir .. "/taskwarrior.png"
+        task.notification_preset = {
+            font = "Monospace 10",
+            icon = helpers.icons_dir .. "/taskwarrior.png"
+        }
     end
 
     if widget then