X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/a8767d0e7ed2339be98c6244ead25d63034f85b9..8dabf9b46c3654e5182533552e43d0b28a0e0f2c:/.zsh/zshrc/parts.d/50-taskwarrior

diff --git a/.zsh/zshrc/parts.d/50-taskwarrior b/.zsh/zshrc/parts.d/50-taskwarrior
index 51d993f..255a770 100644
--- a/.zsh/zshrc/parts.d/50-taskwarrior
+++ b/.zsh/zshrc/parts.d/50-taskwarrior
@@ -9,21 +9,34 @@
 
 if whence task >/dev/null; then
 
-  function t() { task "$@"; }
+  function task_() {
+    local spec cmd args nospec=0
+    cmd="$1"; shift
+    [[ "$cmd" = add ]] && nospec=1
+    for i in "$@"; do
+      case "$nospec@$i" in
+        (0@<->) :;&
+        (0@/*/) spec="${spec:+$spec }$i";;
+        (*) args="${args:+$args }$i";;
+      esac
+    done
+    eval task $spec $cmd $args
+  }
 
-  alias t\?='alias -rm t[-+a-z]'
-  alias ta='t add'
-  alias tc='t call'
-  alias th='t attach'
-  alias tn='t next'
-  alias tl='t all'
-  alias ty='t sync'
-  alias td='t done'
-  alias te='t edit'
-  alias tu='t undo'
-  alias tm='t modify'
-  alias ts='t start'
-  alias t+='t annotate'
+  alias t\?='alias -rm t t[-+a-z] | sed s,_,,'
+  alias ta='task_ add'
+  alias tc='task_ call'
+  alias th='task_ attach'
+  alias tl='task_ all'
+  alias ty='task_ next rc.recurrence=on >/dev/null && task_ sync'
+  alias td='task_ done'
+  alias te='task_ edit'
+  alias tu='task_ undo'
+  alias tm='task_ modify'
+  alias ts='task_ start'
+  alias tw='task_ waiting'
+  alias t+='task_ annotate'
+  alias t='task_ ""'
 
   run_at_most_every 5m \
     t 2>/dev/null || :