Skip to content

Commit b799be0

Browse files
committed
2023 December updates
1 parent 21db1b5 commit b799be0

File tree

9 files changed

+55
-27
lines changed

9 files changed

+55
-27
lines changed

Diff for: .gitmodules

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
[submodule "tmux/plugins/tpm"]
66
path = tmux/plugins/tpm
77
url = https://github.com/tmux-plugins/tpm
8-
[submodule "todo.actions.d/setdue"]
9-
path = todo.actions.d/setdue
10-
url = https://github.com/severoraz/todo.txt-cli-setdue
118
[submodule "todo.actions.d/graph"]
129
path = todo.actions.d/graph
13-
url = https://github.com/timpulver/todo.txt-graph.git
14-
[submodule "todo.actions.d/due"]
15-
path = todo.actions.d/due
16-
url = https://github.com/rebeccamorgan/due.git
10+
url = https://github.com/Bassmann/todo.txt-graph.git

Diff for: bashrc.kmarc

+25-7
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ export NVM_DIR="${NVM_DIR:-$XDG_DATA_HOME/nvm}"
5656
##########
5757
alias tmux-session="tmux attach -t Session || tmux new -s Session"
5858
function ssh-tmux() { ssh "$1" -t 'tmux attach'; }
59-
if [[ $OSTYPE != 'darwin'* ]]; then
59+
if [[ $OSTYPE == 'darwin'* ]]; then
60+
source /opt/homebrew/etc/profile.d/bash_completion.sh
61+
else
6062
_completion_loader ssh
63+
complete -F _ssh ssh ssh-tmux
6164
fi
62-
complete -F _ssh ssh ssh-tmux
6365

6466
[ -n "$TMUX" ] && export PANE_ID=$(tmux display-message -p '#P')
6567

@@ -130,15 +132,16 @@ git-recursive-pull() {
130132

131133
if command -v kubectl >/dev/null; then
132134
source <(kubectl completion bash)
135+
complete -o default -F __start_kubectl kubectl
136+
133137
alias k=kubectl
138+
if command -v kubecolor >/dev/null; then
139+
alias k=kubecolor
140+
complete -o default -F __start_kubectl kubecolor
141+
fi
134142
complete -o default -F __start_kubectl k
135143
fi
136144

137-
if command -v kubecolor >/dev/null; then
138-
alias k=kubecolor
139-
complete -o default -F __start_kubectl kubecolor
140-
fi
141-
142145
if command -v helm >/dev/null; then
143146
source <(helm completion bash)
144147
fi
@@ -188,6 +191,21 @@ if [ -f "$HOME"/.bashrc.local ]; then
188191
source "$HOME"/.bashrc.local
189192
fi
190193

194+
#######################
195+
# Homebrew prefixes #
196+
#######################
197+
if [[ $OSTYPE == 'darwin'* ]]; then
198+
for tool in \
199+
coreutils \
200+
findutils \
201+
gnu-sed \
202+
grep \
203+
; do
204+
export PATH="/opt/homebrew/opt/$tool/libexec/gnubin:$PATH"
205+
done
206+
fi
207+
208+
191209
###############
192210
# dark mode #
193211
###############

Diff for: install.conf.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
path: mutt/*
108108
$HOME/.ssh/all_hosts.conf:
109109
path: ssh/all_hosts.conf
110-
$HOME/.todo.actions.d:
110+
$XDG_DATA_HOME/todo.actions.d:
111111
path: todo.actions.d
112112
$HOME/bin:
113113
path: bin

Diff for: muttrc

+9-4
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,15 @@ color body brightcolor00 color02 '(Good signature)'
197197
color body brightcolor00 color03 '(Problem signature)'
198198

199199
# Atlassian
200-
color body brightcolor00 color04 '( OPEN )'
201-
color body brightcolor00 color02 '( APPROVED | MERGED | RESOLVED )'
202-
color body brightcolor00 color01 '( UNAPPROVED | DECLINED )'
203-
color body brightcolor00 color03 '( NEEDS WORK )'
200+
color body brightcolor00 color08 '(OPEN|BACKLOG|CLOSED)'
201+
color body brightcolor00 color08 '(Open|Backlog|Closed)'
202+
color body brightcolor00 color04 '(APPROVED|IN PROGRESS|IN REVIEW|WAITING)'
203+
color body brightcolor00 color04 '(Approved|In Progress|In Review|Waiting)'
204+
color body brightcolor00 color02 '(DONE|RESOLVED|FIXED)'
205+
color body brightcolor00 color02 '(Done|Resolved|Fixed)'
206+
color body brightcolor00 color01 '(UNAPPROVED|DECLINED|UNRESOLVED)'
207+
color body brightcolor00 color01 '(Unapproved|Declined|Unresolved)'
208+
color body brightcolor00 color03 '(NEEDS WORK)'
204209
color body color04 default '[A-Z]+-[1-9][0-9]*' # issue number
205210

206211
# GitHub

Diff for: todo.actions.d/due

-1
This file was deleted.

Diff for: todo.actions.d/graph

Diff for: todo.actions.d/setdue

-1
This file was deleted.

Diff for: todo.cfg

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22

33
# Your todo.txt directory (this should be an absolute path)
44
#export TODO_DIR="/Users/gina/Documents/todo"
5-
export TODO_DIR="$HOME/Documents/Notes"
6-
7-
#this
5+
export TODO_DIR="$HOME/Documents/todo"
86

97
# Your todo/done/report.txt locations
108
export TODO_FILE="$TODO_DIR/todo.txt"
119
export DONE_FILE="$TODO_DIR/done.txt"
1210
export REPORT_FILE="$TODO_DIR/report.txt"
1311

1412
# You can customize your actions directory location
15-
export TODO_ACTIONS_DIR="$HOME/.todo.actions.d"
13+
export TODO_ACTIONS_DIR="$HOME/.local/share/todo.actions.d"
1614

1715
# == EDIT FILE LOCATIONS ABOVE ===
1816

@@ -65,10 +63,17 @@ export PRI_X=$WHITE # color unless explicitly defined
6563
#
6664
export COLOR_DONE=$DONE
6765

68-
# There is highlighting for projects and contexts.
66+
# There is highlighting for projects, contexts, dates, and item numbers.
6967
#
7068
export COLOR_PROJECT=$LIGHT_PURPLE
7169
export COLOR_CONTEXT=$LIGHT_GREEN
70+
# export COLOR_DATE=$BLUE
71+
# export COLOR_NUMBER=$LIGHT_GRAY
72+
73+
# There is highlighting for metadata key:value pairs e.g.
74+
# DUE:2006-08-01 or note:MYNOTE
75+
#
76+
# export COLOR_META=$CYAN
7277

7378
# === BEHAVIOR ===
7479

Diff for: vim/vimrc

+8
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,14 @@ augroup filetypes
405405
\ setlocal commentstring=#%s
406406
\ | autocmd BufWritePost <buffer> normal! mT
407407

408+
autocmd FileType todo
409+
\ set nospell
410+
\ | hi TodoProject cterm=bold ctermfg=5
411+
\ | hi TodoContext cterm=bold ctermfg=2
412+
\ | hi TodoPriorityA ctermfg=1
413+
\ | hi TodoPriorityB ctermfg=3
414+
\ | hi TodoPriorityC ctermfg=6
415+
408416
autocmd FileType xml
409417
\ setlocal foldmethod=syntax
410418
\ | silent! %foldopen!

0 commit comments

Comments
 (0)