4 files changed, 11 insertions, 21 deletions

diff --git a/alias b/alias
index 9cd58e0..07c9cbf 100644
--- a/alias
+++ b/alias
@@ -54,10 +54,7 @@ alias s='sudo systemctl'
 alias j='sudo journalctl -xe'
 alias m='mutt'
 alias ju='sudo journalctl -u'
-# Should not use alias, because $PATH is not initialized
-path() {
-    echo $PATH
-}
+path() { echo $PATH; } # Should not use alias, because $PATH is not initialized
 fd() { echo /proc/$$/fd; ls -l /proc/$$/fd; }
 port() { sudo lsof -i :$1; }
 alias src="source $HOME/.$(basename $SHELL)rc"
@@ -70,13 +67,12 @@ alias sound="echo -ne '\a'"
 alias pst="pstree -ps $$"
 alias duu='du -hd 1 . | sort -hr'
 alias xa='xargs'
+alias latest='find . -type f | xargs ls -ltr | tail'
 cdp() {
   [[ ! -d $1 ]] && mkdir -p $1
   cd $1
 }
-_move_to_tmp() { 
-  mv $@ /tmp 
-}
+_move_to_tmp() { mv $@ /tmp; }
 prompt() {
   TMPFILE=$(mktemp)
   echo -e "$@" >$TMPFILE \
@@ -229,19 +225,12 @@ cdss() {
 
 # about vimwiki
 alias cdw='cd ~/vimwiki'
-alias chw='cd ~/vimwiki && tig --all'
+alias chw='tig -C ~/vimwiki'
 alias today='vim ~/vimwiki/diary/`date +'%Y-%m-%d'`.md'
 alias to='today'
-ww() { 
-  wiki=${1%%.md}
-  vim ~/vimwiki/${wiki:-index}.md 
-}
-wg() { 
-  grep -r "$@" ~/vimwiki
-}
-wi() { 
-  cat ~/vimwiki/${1%%.md}.md 
-}
+ww() { vim ~/vimwiki/${1%%.md}.md; }
+wg() { grep -r "$@" ~/vimwiki; }
+wi() { cat ~/vimwiki/${1%%.md}.md; }
 
 # crontab
 alias ce='crontab -e'
@@ -492,7 +481,7 @@ alias cdma='cd ~/git/mapstew-android'
 alias cdT='cd ~/git/tilemaker'
 alias stew='cd ~/git/mapstew'
 alias vc='vultr-cli'
-alias latest='find . -type f | xargs ls -ltr | tail'
+alias jl='jrnl'
 #hugo(){
 #    docker run --rm \
 #        -u `id -u`:`id -g` \
diff --git a/muttrc b/muttrc
index 9650c39..dfd8c00 100644
--- a/muttrc
+++ b/muttrc
@@ -37,6 +37,7 @@ set quit = ask-no
 set sort = threads
 set pager_index_lines = 5
 set markers = no # Remove '+' for long links with limited terminal width
+set index_format = "%4C %8Y %Z %(%b %d) %-15.15L (%?l?%4l&%4c?) %s"
 
 # Vim-style key binding, \c means Ctrl
 # ref: https://fancyseeker.github.io/2015/08/19/mutt/#vim%E9%A3%8E%E6%A0%BC%E9%94%AE%E4%BD%8D%E7%BB%91%E5%AE%9A
diff --git a/zsh/_wi.sh b/zsh/_wi.sh
index c1cd4a8..d99518b 100644
--- a/zsh/_wi.sh
+++ b/zsh/_wi.sh
@@ -1,7 +1,7 @@
 #compdef wi
 
 function _wi() {
-    compadd -S '' $(cd ~/vimwiki && ls ${words[2]}*)
+    compadd -S '' $(cd ~/vimwiki && find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d')
 }
 
 _wi
diff --git a/zsh/_ww.sh b/zsh/_ww.sh
index 76afae8..d998099 100644
--- a/zsh/_ww.sh
+++ b/zsh/_ww.sh
@@ -1,7 +1,7 @@
 #compdef ww
 
 function _ww() {
-    compadd -S '' $(cd ~/vimwiki && ls ${words[2]}*)
+    compadd -S '' $(cd ~/vimwiki && find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d')
 }
 
 _ww