diff --git a/office/.config/sh/alias.d/taskwarrior.sh b/office/.config/sh/alias.d/taskwarrior.sh index 9546974..c69b7ac 100644 --- a/office/.config/sh/alias.d/taskwarrior.sh +++ b/office/.config/sh/alias.d/taskwarrior.sh @@ -14,9 +14,7 @@ t() { # copy the `task` zsh completions over to my little alias 😉 # FIXME: this is not very pretty and not super portable (needs ps) but # works for now. from here: https://unix.stackexchange.com/a/72564/414758 -if echo "$SHELL" | grep -q zsh; then - if exist task && [ "$(ps -p $$ -o comm --no-headers)" = "zsh" ]; then compdef t=task; fi -fi +if exist task && [ "$(ps -p $$ -o comm --no-headers)" = "zsh" ]; then compdef t=task; fi alias ta="task add" alias tal="task log" @@ -31,25 +29,11 @@ if exist timew; then else alias tra="task active" fi -alias tdd="task end.after:today all" # done doday -alias tdy="task end.after:yesterday all" # done yesterday-today +alias tdd="task end.after:today all" # done doday +alias tdy="task end.after:yesterday all" # done yesterday-today alias tdw="task end.after:today-1wk completed" # done this week alias tad="task +ACTIVE done" alias tas="task +ACTIVE stop" alias to="task note" - -#--- -# Additional idea repository - -idea() { - if [ "$1" = "note" ]; then - shift - idean "$@" - fi - task rc.data.location="$TASK_DATA_IDEA" "$@" -} -idean() { - topen --task-data "$TASK_DATA_IDEA" --notes-dir "$TASK_DATA_IDEA/notes" "$@" -} diff --git a/office/.config/sh/env.d/taskopen-xdg.sh b/office/.config/sh/env.d/taskopen-xdg.sh new file mode 100644 index 0000000..5aac3a7 --- /dev/null +++ b/office/.config/sh/env.d/taskopen-xdg.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +export TASKOPENRC="${XDG_CONFIG_HOME:-"$HOME/.config"}/task/taskopenrc" diff --git a/office/.config/sh/env.d/taskwarrior-xdg.sh b/office/.config/sh/env.d/taskwarrior-xdg.sh index ef26b7a..1d75474 100644 --- a/office/.config/sh/env.d/taskwarrior-xdg.sh +++ b/office/.config/sh/env.d/taskwarrior-xdg.sh @@ -1,8 +1,3 @@ #!/usr/bin/env sh - -export TASK_DATA_HOME="$XDG_DATA_HOME/task" -export TASK_DATA_IDEA="$XDG_DATA_HOME/ideas" - -[ -d "$TASK_DATA_HOME/notes" ] || mkdir -p "$TASK_DATA_HOME/notes" -[ -d "$TASK_DATA_IDEA/notes" ] || mkdir -p "$TASK_DATA_IDEA/notes" +[ -d "$XDG_DATA_HOME/task/notes" ] || mkdir -p "$XDG_DATA_HOME/task/notes" diff --git a/office/.config/task/taskopenrc b/office/.config/task/taskopenrc new file mode 100644 index 0000000..a446a24 --- /dev/null +++ b/office/.config/task/taskopenrc @@ -0,0 +1,20 @@ +[General] +EDITOR = nvim +taskbin = task +path_ext = /usr/share/taskopen/scripts + +[Actions] +note_custom_ext.regex = "^Note\\.?(.*)?" +note_custom_ext.command = "$EDITOR ${XDG_DATA_HOME:-$HOME/.local/share}/task/notes/$UUID.$LAST_MATCH" + +notes.regex = "^Note$" +notes.command = "$EDITOR ${XDG_DATA_HOME:-$HOME/.local/share}/task/notes/$UUID.md" + +links.regex = "^https?://" +links.command = "open $FILE" + +mail.regex = "^<.*@.*>$" +mail.command = "notmuch show mid:${FILE:1:-1}" + +[CLI] + diff --git a/office/.config/task/taskrc b/office/.config/task/taskrc index d6d8104..8539bd5 100644 --- a/office/.config/task/taskrc +++ b/office/.config/task/taskrc @@ -10,7 +10,7 @@ # Use the command 'task show' to see all defaults and overrides # Files -data.location=$TASK_DATA_HOME +data.location=$XDG_DATA_HOME/task # disable case sensitivity search.case.sensitive=no diff --git a/vcs/jj/config/jj/config.toml b/vcs/jj/config/jj/config.toml index 773e3e0..a9c6eb8 100644 --- a/vcs/jj/config/jj/config.toml +++ b/vcs/jj/config/jj/config.toml @@ -4,7 +4,7 @@ name = "Marty Oehme" [signing] backend = "gpg" -key = "contact@martyoeh.me" +key = "73BA40D5AFAF49C9" [git] sign-on-push = true