From 61718a5ce3f11119297fc94d3cec427a3109948f Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Sun, 5 Apr 2026 19:27:05 -0400 Subject: [PATCH] task: Update for TaskWarrior 3 + TaskChampion sync --- bin/set-colors | 4 ++-- default.conf.yaml | 2 ++ task/.gitignore | 6 ------ task/{jdkaplan-dark.theme => dark.theme} | 6 +++--- task/hooks/on-exit-sync.sh | 12 ------------ task/install | 2 +- task/{jdkaplan-light.theme => light.theme} | 6 +++--- task/taskrc-template | 5 +---- 8 files changed, 12 insertions(+), 31 deletions(-) rename task/{jdkaplan-dark.theme => dark.theme} (96%) delete mode 100755 task/hooks/on-exit-sync.sh rename task/{jdkaplan-light.theme => light.theme} (95%) diff --git a/bin/set-colors b/bin/set-colors index 8beea47..4a81e0f 100755 --- a/bin/set-colors +++ b/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" diff --git a/default.conf.yaml b/default.conf.yaml index d963a66..294b894 100644 --- a/default.conf.yaml +++ b/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/ diff --git a/task/.gitignore b/task/.gitignore index 5061b73..97dd9e1 100644 --- a/task/.gitignore +++ b/task/.gitignore @@ -1,7 +1 @@ -# The sync config contains secrets. -/sync - /color.theme - -# This contains state for the task CLI -/.taskrc diff --git a/task/jdkaplan-dark.theme b/task/dark.theme similarity index 96% rename from task/jdkaplan-dark.theme rename to task/dark.theme index 6203afb..c6b3853 100644 --- a/task/jdkaplan-dark.theme +++ b/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 - diff --git a/task/hooks/on-exit-sync.sh b/task/hooks/on-exit-sync.sh deleted file mode 100755 index 50455ca..0000000 --- a/task/hooks/on-exit-sync.sh +++ /dev/null @@ -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 diff --git a/task/install b/task/install index a223901..d4881bd 100755 --- a/task/install +++ b/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}" diff --git a/task/jdkaplan-light.theme b/task/light.theme similarity index 95% rename from task/jdkaplan-light.theme rename to task/light.theme index 4848d77..0bba1d1 100644 --- a/task/jdkaplan-light.theme +++ b/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 @@ -65,7 +65,7 @@ color.due.today=on rgb353 color.overdue=on rgb544 # Report: burndown -color.burndown.pending=on rgb411 +color.burndown.pending=on rgb411 color.burndown.started=on rgb550 color.burndown.done=on rgb151 @@ -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 - diff --git a/task/taskrc-template b/task/taskrc-template index e0c6f22..99f1aaa 100644 --- a/task/taskrc-template +++ b/task/taskrc-template @@ -1,7 +1,4 @@ -# [Created by task 2.5.1 11/24/2019 23:09:25] - -include ~/.config/task/sync -include ~/.config/task/color.theme +include ~/.task/color.theme data.location=~/.task