diff options
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | alias | 14 | ||||
-rw-r--r-- | tigrc | 2 | ||||
-rwxr-xr-x | tools/wiki/diary | 4 | ||||
-rw-r--r-- | vimrc | 4 | ||||
-rw-r--r-- | zsh/_wi.sh | 2 | ||||
-rw-r--r-- | zsh/_ww.sh | 2 | ||||
-rw-r--r-- | zsh/_wwd.sh | 2 |
8 files changed, 17 insertions, 17 deletions
@@ -37,10 +37,10 @@ fzf: | |||
37 | ~/.fzf/install; | 37 | ~/.fzf/install; |
38 | fi | 38 | fi |
39 | 39 | ||
40 | wiki: | 40 | log: |
41 | # vimwiki | 41 | # vimwiki |
42 | if [ ! -d "$(HOME)/.vimwiki" ]; then | 42 | if [ ! -d "$(HOME)/.vimwiki" ]; then |
43 | git clone git@github.com:typebrook/wiki.git ~/vimwiki; | 43 | git clone vps:~/log ~/log; |
44 | fi | 44 | fi |
45 | 45 | ||
46 | pass: | 46 | pass: |
@@ -264,12 +264,12 @@ alias bean='vim $HOME/bean/main.bean' | |||
264 | alias b='bean' | 264 | alias b='bean' |
265 | 265 | ||
266 | # about vimwiki | 266 | # about vimwiki |
267 | alias cdw='cd ~/vimwiki' | 267 | alias cdl='cd ~/log' |
268 | alias chw='tig -C ~/vimwiki' | 268 | alias chw='tig -C ~/log' |
269 | ww() { entry="${1:-guideline}"; vim -c Goyo ~/vimwiki/${entry%%.md}.md; } | 269 | ww() { entry="${1:-guideline}"; vim -c Goyo ~/log/${entry%%.md}.md; } |
270 | wwd() { entry="${1:-guideline}"; vim -c Goyo ~/vimwiki/diary/${entry%%.md}.md; } | 270 | wwd() { entry="${1:-guideline}"; vim -c Goyo ~/log/diary/${entry%%.md}.md; } |
271 | wg() { grep -r "$@" --exclude-dir=logseq/ ~/vimwiki; } | 271 | wg() { grep -r "$@" --exclude-dir=logseq/ ~/log; } |
272 | wi() { cat ~/vimwiki/${1%%.md}.md; } | 272 | wi() { cat ~/log/${1%%.md}.md; } |
273 | alias dia='diary' | 273 | alias dia='diary' |
274 | alias dias='diary specify' | 274 | alias dias='diary specify' |
275 | alias diaa='diary print' | 275 | alias diaa='diary print' |
@@ -521,7 +521,7 @@ alias thsr='curl -L google.com >/tmp/foo.html && xdg-open /tmp/foo.html' | |||
521 | # klakegg/hugo \ | 521 | # klakegg/hugo \ |
522 | # $@ | 522 | # $@ |
523 | #} | 523 | #} |
524 | todo() { cd ~/vimwiki && grep -R ' TODO ' --exclude-dir=logseq/; } | 524 | todo() { cd ~/log && grep -R ' TODO ' --exclude-dir=logseq/; } |
525 | fix() { which $1 && grep -Po 'FIXME.*' $(which $1); } | 525 | fix() { which $1 && grep -Po 'FIXME.*' $(which $1); } |
526 | alias ffmpeg='ffmpeg -hide_banner' | 526 | alias ffmpeg='ffmpeg -hide_banner' |
527 | alias md='reveal' | 527 | alias md='reveal' |
@@ -62,7 +62,7 @@ bind reflog c ?git checkout %(commit) | |||
62 | # highlight diff without +/- | 62 | # highlight diff without +/- |
63 | # set diff-show-signs = false | 63 | # set diff-show-signs = false |
64 | # set diff_column_highlight = ALL | 64 | # set diff_column_highlight = ALL |
65 | set diff-highlight = false | 65 | set diff-highlight = true |
66 | 66 | ||
67 | # misc settings | 67 | # misc settings |
68 | set ignore-case = true | 68 | set ignore-case = true |
diff --git a/tools/wiki/diary b/tools/wiki/diary index b30e906..ce7a5be 100755 --- a/tools/wiki/diary +++ b/tools/wiki/diary | |||
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/bash | 1 | #! /bin/bash |
2 | 2 | ||
3 | today=~/vimwiki/diary/$(date --iso-8601).md | 3 | today=~/log/diary/$(date --iso-8601).md |
4 | 4 | ||
5 | specify_date() { | 5 | specify_date() { |
6 | YEAR=${YEAR:-22} | 6 | YEAR=${YEAR:-22} |
@@ -17,7 +17,7 @@ specify_date() { | |||
17 | date -d $YEAR-$MONTH-$DAY &>/dev/null && break | 17 | date -d $YEAR-$MONTH-$DAY &>/dev/null && break |
18 | done | 18 | done |
19 | 19 | ||
20 | FILE=~/vimwiki/diary/20$YEAR-$MONTH-$DAY.md | 20 | FILE=~/log/diary/20$YEAR-$MONTH-$DAY.md |
21 | vim -c 'Goyo' $FILE | 21 | vim -c 'Goyo' $FILE |
22 | } | 22 | } |
23 | 23 | ||
@@ -156,7 +156,7 @@ nnoremap <leader>I :s/^[ ]*- \(\[.\] \)*//<CR> | |||
156 | nmap <leader>D dd:VimwikiMakeDiaryNote<CR>Gp:w!<CR>:Bclose<CR> | 156 | nmap <leader>D dd:VimwikiMakeDiaryNote<CR>Gp:w!<CR>:Bclose<CR> |
157 | vnoremap <leader>D d:VimwikiMakeDiaryNote<CR>Gp:w!<CR> | 157 | vnoremap <leader>D d:VimwikiMakeDiaryNote<CR>Gp:w!<CR> |
158 | let g:vimwiki_list = [{ | 158 | let g:vimwiki_list = [{ |
159 | \ 'path': '~/vimwiki/', | 159 | \ 'path': '~/log/', |
160 | \ 'syntax': 'markdown', | 160 | \ 'syntax': 'markdown', |
161 | \ 'ext': '.md', | 161 | \ 'ext': '.md', |
162 | \ }] | 162 | \ }] |
@@ -164,7 +164,7 @@ let g:vimwiki_list = [{ | |||
164 | " Git push quietly whenever leaving vim with VimWiki files | 164 | " Git push quietly whenever leaving vim with VimWiki files |
165 | augroup vimwikiPush | 165 | augroup vimwikiPush |
166 | autocmd! | 166 | autocmd! |
167 | autocmd VimLeave ~/vimwiki/* :!(cd ~/vimwiki && git add * && git commit -am Update && git push origin >/dev/null 2>&1 &) | 167 | autocmd VimLeave ~/log/* :!(cd ~/log && git add * && git commit -am Update && git push origin >/dev/null 2>&1 &) |
168 | augroup END | 168 | augroup END |
169 | 169 | ||
170 | " Configuration fro vim-instant-markdown | 170 | " Configuration fro vim-instant-markdown |
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | function _wi() { | 3 | function _wi() { |
4 | compadd -S '' $( | 4 | compadd -S '' $( |
5 | cd ~/vimwiki && \ | 5 | cd ~/log && \ |
6 | find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \ | 6 | find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \ |
7 | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//' | 7 | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//' |
8 | ) | 8 | ) |
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | function _ww() { | 3 | function _ww() { |
4 | compadd -S '' $( | 4 | compadd -S '' $( |
5 | cd ~/vimwiki && \ | 5 | cd ~/log && \ |
6 | find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \ | 6 | find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \ |
7 | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//' | 7 | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//' |
8 | ) | 8 | ) |
diff --git a/zsh/_wwd.sh b/zsh/_wwd.sh index 4161132..d3c6530 100644 --- a/zsh/_wwd.sh +++ b/zsh/_wwd.sh | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | function _wwd() { | 3 | function _wwd() { |
4 | compadd -S '' $( | 4 | compadd -S '' $( |
5 | cd ~/vimwiki/diary/ && \ | 5 | cd ~/log/diary/ && \ |
6 | find -name '*.md' -printf "%f\n" | \ | 6 | find -name '*.md' -printf "%f\n" | \ |
7 | sed -E 's/.md$//' | 7 | sed -E 's/.md$//' |
8 | ) | 8 | ) |