task: Update for TaskWarrior 3 + TaskChampion sync

bin/set-colors

@@ -11,7 +11,7 @@ OSTYPE="$(uname -s)"
 install_dark() {
     ln -sf "${DOTFILES}/alacritty/colors-dark.toml"      "${DOTFILES}/alacritty/colors.toml"
     ln -sf "${DOTFILES}/bat/config-dark"                 "${DOTFILES}/bat/config"
-    ln -sf "${DOTFILES}/task/jdkaplan-dark.theme"        "${DOTFILES}/task/color.theme"
+    ln -sf "${DOTFILES}/task/dark.theme"                 "${DOTFILES}/task/color.theme"
     ln -sf "${DOTFILES}/vim/colors/jdkaplan-dark.vim"    "${DOTFILES}/vim/colors/jdkaplan.vim"
     ln -sf "${DOTFILES}/neovim/colors/jdkaplan-cool.lua" "${DOTFILES}/neovim/colors/jdkaplan-temp.lua"
 
@@ -31,7 +31,7 @@ install_dark() {
 install_light() {
     ln -sf "${DOTFILES}/alacritty/colors-light.toml"     "${DOTFILES}/alacritty/colors.toml"
     ln -sf "${DOTFILES}/bat/config-light"                "${DOTFILES}/bat/config"
-    ln -sf "${DOTFILES}/task/jdkaplan-light.theme"       "${DOTFILES}/task/color.theme"
+    ln -sf "${DOTFILES}/task/light.theme"                "${DOTFILES}/task/color.theme"
     ln -sf "${DOTFILES}/vim/colors/jdkaplan-light.vim"   "${DOTFILES}/vim/colors/jdkaplan.vim"
     ln -sf "${DOTFILES}/neovim/colors/jdkaplan-warm.lua" "${DOTFILES}/neovim/colors/jdkaplan-temp.lua"
 

default.conf.yaml

@@ -39,6 +39,8 @@
     ~/.psqlrc: psql/.psqlrc
     ~/.psqlrc-readonly: psql/.psqlrc-readonly
     ~/.rgignore: etc/rgignore
+    ~/.task/hooks: task/hooks/
+    ~/.task/color.theme: task/color.theme
     ~/.tmux.conf: tmux/.tmux.conf
     ~/.vimrc: vim/.vimrc
     ~/.vim: vim/

task/.gitignore

@@ -1,7 +1 @@
-# The sync config contains secrets.
-/sync
-
 /color.theme
-
-# This contains state for the task CLI
-/.taskrc

task/dark.theme

@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2021, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -57,7 +57,7 @@ color.uda.priority.M=color250
 # Tags
 color.tag.next=rgb440
 color.tag.none=
-color.tagged=rgb031
+color.tagged=
 
 # Due
 color.due.today=rgb400
@@ -82,6 +82,7 @@ color.summary.bar=black on rgb141
 color.calendar.due.today=color15 on color1
 color.calendar.due=color0 on color1
 color.calendar.holiday=color0 on color11
+color.calendar.scheduled=
 color.calendar.overdue=color0 on color9
 color.calendar.today=color15 on rgb013
 color.calendar.weekend=on color235
@@ -95,4 +96,3 @@ color.sync.rejected=color9
 # Command: undo
 color.undo.after=color2
 color.undo.before=color1
-

task/hooks/on-exit-sync.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-count=0
-while read -r; do
-    count=$((count + 1))
-done
-
-if ((count > 0)); then
-    exec task sync | tee ~/.task/sync_hook.log
-else
-    echo "No changes to sync"
-fi

task/install

@@ -2,6 +2,6 @@
 
 CURDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 TEMPLATE="${CURDIR}/taskrc-template"
-DESTINATION="${CURDIR}/.taskrc"
+DESTINATION="${HOME}/.taskrc"
 
 [ -f "${DESTINATION}" ] || cp -v "${TEMPLATE}" "${DESTINATION}"

task/light.theme

@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2006 - 2021, Paul Beckingham, Federico Hernandez.
+# Copyright 2006 - 2021, Tomas Babej, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -83,6 +83,7 @@ color.calendar.due=on rgb343
 color.calendar.due.today=on rgb353
 color.calendar.holiday=color0 on rgb530
 color.calendar.overdue=on rgb533
+color.calendar.scheduled=
 color.calendar.today=rgb005
 color.calendar.weekend=on gray21
 color.calendar.weeknumber=gray16
@@ -95,4 +96,3 @@ color.sync.rejected=red
 # Command: undo
 color.undo.before=yellow
 color.undo.after=green
-

task/taskrc-template

@@ -1,7 +1,4 @@
-# [Created by task 2.5.1 11/24/2019 23:09:25]
+include ~/.task/color.theme
-
-include ~/.config/task/sync
-include ~/.config/task/color.theme
 
 data.location=~/.task