diff --git a/todo.cfg b/todo.cfg index cf21f79..e151213 100644 --- a/todo.cfg +++ b/todo.cfg @@ -17,30 +17,36 @@ export TMP_FILE="$TODO_DIR/todo.tmp" # === COLOR MAP === -export NONE='' -export BLACK='\\033[0;30m' -export RED='\\033[0;31m' -export GREEN='\\033[0;32m' -export BROWN='\\033[0;33m' -export BLUE='\\033[0;34m' -export PURPLE='\\033[0;35m' -export CYAN='\\033[0;36m' -export LIGHT_GREY='\\033[0;37m' -export DARK_GREY='\\033[1;30m' -export LIGHT_RED='\\033[1;31m' -export LIGHT_GREEN='\\033[1;32m' -export YELLOW='\\033[1;33m' -export LIGHT_BLUE='\\033[1;34m' -export LIGHT_PURPLE='\\033[1;35m' -export LIGHT_CYAN='\\033[1;36m' -export WHITE='\\033[1;37m' -export DEFAULT='\\033[0m' +## If you have re-mapped your color codes, you may need to +## over-ride by uncommenting and editing these defaults. + +# export BLACK='\\033[0;30m' +# export RED='\\033[0;31m' +# export GREEN='\\033[0;32m' +# export BROWN='\\033[0;33m' +# export BLUE='\\033[0;34m' +# export PURPLE='\\033[0;35m' +# export CYAN='\\033[0;36m' +# export LIGHT_GREY='\\033[0;37m' +# export DARK_GREY='\\033[1;30m' +# export LIGHT_RED='\\033[1;31m' +# export LIGHT_GREEN='\\033[1;32m' +# export YELLOW='\\033[1;33m' +# export LIGHT_BLUE='\\033[1;34m' +# export LIGHT_PURPLE='\\033[1;35m' +# export LIGHT_CYAN='\\033[1;36m' +# export WHITE='\\033[1;37m' +# export DEFAULT='\\033[0m' # === PRIORITY COLORS === -export PRI_A=$YELLOW # color for A priority -export PRI_B=$GREEN # color for B priority -export PRI_C=$LIGHT_BLUE # color for C priority -export PRI_X=$WHITE # color for rest of them +## Priorities can be any upper-case letter. +## Colors are supported for the first three. +## Uncomment and edit to override these defaults. -export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -f -k2' # customize list output \ No newline at end of file +# export PRI_A=$YELLOW # color for A priority +# export PRI_B=$GREEN # color for B priority +# export PRI_C=$LIGHT_BLUE # color for C priority +# export PRI_X=$WHITE # color for rest of them + +export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -f -k2' # customize list output diff --git a/todo.sh b/todo.sh index 253acfb..4ceeb4b 100755 --- a/todo.sh +++ b/todo.sh @@ -344,6 +344,34 @@ TODOTXT_DATE_ON_ADD=${TODOTXT_DATE_ON_ADD:-0} TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-} TODOTXT_SORT_COMMAND=${TODOTXT_SORT_COMMAND:-env LC_COLLATE=C sort -f -k2} +export TODOTXT_VERBOSE TODOTXT_PLAIN TODOTXT_CFG_FILE TODOTXT_FORCE TODOTXT_PRESERVE_LINE_NUMBERS TODOTXT_AUTO_ARCHIVE TODOTXT_DATE_ON_ADD TODOTXT_SORT_COMMAND + +# Default color map +export NONE='' +export BLACK='\\033[0;30m' +export RED='\\033[0;31m' +export GREEN='\\033[0;32m' +export BROWN='\\033[0;33m' +export BLUE='\\033[0;34m' +export PURPLE='\\033[0;35m' +export CYAN='\\033[0;36m' +export LIGHT_GREY='\\033[0;37m' +export DARK_GREY='\\033[1;30m' +export LIGHT_RED='\\033[1;31m' +export LIGHT_GREEN='\\033[1;32m' +export YELLOW='\\033[1;33m' +export LIGHT_BLUE='\\033[1;34m' +export LIGHT_PURPLE='\\033[1;35m' +export LIGHT_CYAN='\\033[1;36m' +export WHITE='\\033[1;37m' +export DEFAULT='\\033[0m' + +# Default priority->color map. +export PRI_A=$YELLOW # color for A priority +export PRI_B=$GREEN # color for B priority +export PRI_C=$LIGHT_BLUE # color for C priority +export PRI_X=$WHITE # color for rest of them + [ -e "$TODOTXT_CFG_FILE" ] || { CFG_FILE_ALT="$HOME/.todo.cfg" @@ -353,8 +381,6 @@ TODOTXT_SORT_COMMAND=${TODOTXT_SORT_COMMAND:-env LC_COLLATE=C sort -f -k2} fi } -export TODOTXT_VERBOSE TODOTXT_PLAIN TODOTXT_CFG_FILE TODOTXT_FORCE TODOTXT_PRESERVE_LINE_NUMBERS TODOTXT_AUTO_ARCHIVE TODOTXT_DATE_ON_ADD TODOTXT_SORT_COMMAND - if [ -z "$TODO_ACTIONS_DIR" -o ! -d "$TODO_ACTIONS_DIR" ] then TODO_ACTIONS_DIR="$HOME/.todo.actions.d"