3 files changed, 6 insertions, 6 deletions

diff --git a/alias b/alias
index 03a5fe3..9e33981 100644
--- a/alias
+++ b/alias
@@ -208,10 +208,10 @@ cdss() {
 alias cdw='cd ~/vimwiki'
 alias chw='cd ~/vimwiki && tig --all'
 wg() { 
-  vim ~/vimwiki/${1%%.md}.md 
+  vim ~/wiki/md/${1%%.md}.md 
 }
 wi() { 
-  cat ~/vimwiki/$1.md 
+  cat ~/wiki/md/${1%%.md}.md 
 }
 
 # crontab
diff --git a/tools/init/load-settings.sh b/tools/init/load-settings.sh
index 02aa6f3..b8fb974 100755
--- a/tools/init/load-settings.sh
+++ b/tools/init/load-settings.sh
@@ -4,7 +4,7 @@ source $SETTING_DIR/alias
 [[ -d $SETTING_DIR/private ]] && source $SETTING_DIR/private/*
 
 # Config shell
-case $0 in
+case $SHELL in
   *zsh)
     setopt extended_glob
     fpath=($SETTING_DIR/zsh $fpath)
diff --git a/vimrc b/vimrc
index db7bc32..2416d46 100644
--- a/vimrc
+++ b/vimrc
@@ -150,12 +150,12 @@ nnoremap <leader>i I- <esc>l
 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/', 'syntax': 'markdown', 'ext': '.md'}]
+let g:vimwiki_list = [{'path': '~/wiki', 'syntax': 'markdown', 'ext': '.md'}]
 
 " 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 ~/wiki/* :!(cd ~/wiki && git add % && git commit -am update && git push origin >/dev/null 2>&1 &)
 augroup END
 
 " Configuration fro vim-instant-markdown
@@ -167,7 +167,7 @@ nnoremap <leader>md :InstantMarkdownPreview<CR>
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 " Generate static pages
-augroup vimwikiPush
+augroup blogPush
   autocmd!
   autocmd VimLeave ~/git/makesite/*/*.md :!(cd ~/git/makesite && make &)
 augroup END