Rename vimwiki to log

8 files changed, 17 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 3fc8ed7..9d26c13 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,10 @@ fzf:
                 ~/.fzf/install; 
         fi
 
-wiki:
+log:
         # vimwiki
         if [ ! -d "$(HOME)/.vimwiki" ]; then 
-                git clone git@github.com:typebrook/wiki.git ~/vimwiki; 
+                git clone vps:~/log ~/log; 
         fi
 
 pass:
diff --git a/alias b/alias
index 7e57097..076d243 100644
--- a/alias
+++ b/alias
@@ -264,12 +264,12 @@ alias bean='vim $HOME/bean/main.bean'
 alias b='bean'
 
 # about vimwiki
-alias cdw='cd ~/vimwiki'
-alias chw='tig -C ~/vimwiki'
-ww() { entry="${1:-guideline}"; vim -c Goyo ~/vimwiki/${entry%%.md}.md; }
-wwd() { entry="${1:-guideline}"; vim -c Goyo ~/vimwiki/diary/${entry%%.md}.md; }
-wg() { grep -r "$@" --exclude-dir=logseq/ ~/vimwiki; }
-wi() { cat ~/vimwiki/${1%%.md}.md; }
+alias cdl='cd ~/log'
+alias chw='tig -C ~/log'
+ww() { entry="${1:-guideline}"; vim -c Goyo ~/log/${entry%%.md}.md; }
+wwd() { entry="${1:-guideline}"; vim -c Goyo ~/log/diary/${entry%%.md}.md; }
+wg() { grep -r "$@" --exclude-dir=logseq/ ~/log; }
+wi() { cat ~/log/${1%%.md}.md; }
 alias dia='diary'
 alias dias='diary specify'
 alias diaa='diary print'
@@ -521,7 +521,7 @@ alias thsr='curl -L google.com >/tmp/foo.html && xdg-open /tmp/foo.html'
 #        klakegg/hugo \
 #        $@
 #}
-todo() { cd ~/vimwiki && grep -R ' TODO ' --exclude-dir=logseq/; }
+todo() { cd ~/log && grep -R ' TODO ' --exclude-dir=logseq/; }
 fix() { which $1 && grep -Po 'FIXME.*' $(which $1); }
 alias ffmpeg='ffmpeg -hide_banner'
 alias md='reveal'
diff --git a/tigrc b/tigrc
index b2c43c2..2cb7240 100644
--- a/tigrc
+++ b/tigrc
@@ -62,7 +62,7 @@ bind reflog  c  ?git checkout %(commit)
 # highlight diff without +/-
 # set diff-show-signs = false
 # set diff_column_highlight = ALL
-set diff-highlight = false
+set diff-highlight = true
 
 # misc settings
 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 @@
 #! /bin/bash
 
-today=~/vimwiki/diary/$(date --iso-8601).md
+today=~/log/diary/$(date --iso-8601).md
 
 specify_date() {
   YEAR=${YEAR:-22}
@@ -17,7 +17,7 @@ specify_date() {
     date -d $YEAR-$MONTH-$DAY &>/dev/null && break
   done
 
-  FILE=~/vimwiki/diary/20$YEAR-$MONTH-$DAY.md
+  FILE=~/log/diary/20$YEAR-$MONTH-$DAY.md
   vim -c 'Goyo' $FILE
 }
 
diff --git a/vimrc b/vimrc
index 78e0a45..5d37eae 100644
--- a/vimrc
+++ b/vimrc
@@ -156,7 +156,7 @@ nnoremap <leader>I :s/^[ ]*- \(\[.\] \)*//<CR>
 nmap <leader>D dd:VimwikiMakeDiaryNote<CR>Gp:w!<CR>:Bclose<CR>
 vnoremap <leader>D d:VimwikiMakeDiaryNote<CR>Gp:w!<CR>
 let g:vimwiki_list = [{
-    \ 'path': '~/vimwiki/', 
+    \ 'path': '~/log/', 
     \ 'syntax': 'markdown', 
     \ 'ext': '.md',
     \ }]
@@ -164,7 +164,7 @@ let g:vimwiki_list = [{
 " Git push quietly whenever leaving vim with VimWiki files
 augroup vimwikiPush
   autocmd!
-  autocmd VimLeave ~/vimwiki/* :!(cd ~/vimwiki && git add * && git commit -am Update && git push origin >/dev/null 2>&1 &)
+  autocmd VimLeave ~/log/* :!(cd ~/log && git add * && git commit -am Update && git push origin >/dev/null 2>&1 &)
 augroup END
 
 " Configuration fro vim-instant-markdown
diff --git a/zsh/_wi.sh b/zsh/_wi.sh
index f33d0ae..b468c26 100644
--- a/zsh/_wi.sh
+++ b/zsh/_wi.sh
@@ -2,7 +2,7 @@
 
 function _wi() {
     compadd -S '' $(
-      cd ~/vimwiki && \
+      cd ~/log && \
       find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \
       sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//'
     )
diff --git a/zsh/_ww.sh b/zsh/_ww.sh
index 2a1e323..b07af85 100644
--- a/zsh/_ww.sh
+++ b/zsh/_ww.sh
@@ -2,7 +2,7 @@
 
 function _ww() {
     compadd -S '' $(
-      cd ~/vimwiki && \
+      cd ~/log && \
       find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \
       sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//'
     )
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 @@
 
 function _wwd() {
     compadd -S '' $(
-      cd ~/vimwiki/diary/ && \
+      cd ~/log/diary/ && \
       find -name '*.md' -printf "%f\n" | \
       sed -E 's/.md$//'
     )