diff --git a/.vim/vimwiki/index.wiki b/.vim/vimwiki/index.wiki
index 36736ab..735c56c 100644
--- a/.vim/vimwiki/index.wiki
+++ b/.vim/vimwiki/index.wiki
@@ -1,6 +1,13 @@
+= Main Task =
+* [[TODO]]
+* See Diary with :Diary . New entries with \w\w or with :Calendar
+
+= Search =
+Use :VWS /term/ to search.
+Use :lopen to see all results
+
 = Bookeen =
 * [[Notes]]
-* [[TODO]]
 = Dev =
 * [[Code Checker]]
 * [[GCC]]
diff --git a/.vimrc b/.vimrc
index c775cb2..d4d045e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -580,6 +580,15 @@ Plugin 'tpope/vim-dispatch'
 " VimWiki
 Plugin 'vimwiki/vimwiki'
 let g:vimwiki_list=[{'path':'~/.vim/vimwiki'}]
+Plugin 'mattn/calendar-vim'
+" Use \w\w to create new diary entry.
+" use :Diary to view all on them
+command! Diary VimwikiDiaryIndex
+augroup vimwikigroup
+    autocmd!
+    " automatically update links on read diary
+    autocmd BufRead,BufNewFile diary.wiki VimwikiDiaryGenerateLinks
+augroup end
 
 " Align
 " eg. to align on the "=" do :'<,'>Align =