diff --git a/vimrc.symlink b/vimrc.symlink
index eea3def..c313403 100644
--- a/vimrc.symlink
+++ b/vimrc.symlink
@@ -195,3 +195,21 @@ endif
 " For perlomni.vim setting.
 " https://github.com/c9s/perlomni.vim
 let g:neocomplete#sources#omni#input_patterns.perl = '\h\w*->\h\w*\|\h\w*::'
+
+" Plugin key-mappings.
+imap <C-k>     <Plug>(neosnippet_expand_or_jump)
+smap <C-k>     <Plug>(neosnippet_expand_or_jump)
+xmap <C-k>     <Plug>(neosnippet_expand_target)
+
+" SuperTab like snippets behavior.
+"imap <expr><TAB>
+" \ pumvisible() ? "\<C-n>" :
+" \ neosnippet#expandable_or_jumpable() ?
+" \    "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
+smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+\ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
+
+" For conceal markers.
+if has('conceal')
+  set conceallevel=2 concealcursor=niv
+endif
diff --git a/zsh/custom.zsh b/zsh/custom.zsh
index b5568dd..5c54e76 100644
--- a/zsh/custom.zsh
+++ b/zsh/custom.zsh
@@ -1,4 +1,8 @@
 ZSH_THEME="agnoster"
+HIST_STAMPS="dd.mm.yyyy"
+COMPLETION_WAITING_DOTS="true"
+
+export EDITOR="vim"
 
 source $HOME/.dotfiles/zsh/aliases.zsh