diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim index b734726..6a326a6 100644 --- a/dotfiles/config/nvim/init.vim +++ b/dotfiles/config/nvim/init.vim @@ -182,6 +182,9 @@ let g:pymode_folding = 0 " set pydoc key let g:pymode_doc_key = 'K' +" Disable auto python-mode autocomplete documentation window +set completeopt=menu + " Merlin for OCaml let g:opamshare = substitute(system('opam config var share'),'\n$','','''') execute "set rtp+=" . g:opamshare . "/merlin/vim" diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 9f8e1a1..e0a51ea 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -38,7 +38,7 @@ alias gf='git fetch' alias ga='git add .' gblame() { - git blame $1 + builtin git blame $1 } parse_git_branch() {