diff --git a/README.md b/README.md index 0a6cbbe9..5b382d3d 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ creating appropriate `.local` dotfiles in home directory: $EDITOR ~/.gitconfig.local $EDITOR ~/.vimrc.local + $EDITOR ~/.profile.local $EDITOR ~/.zshrc.local $EDITOR ~/.tmux.conf.local diff --git a/vim/.vim/bundle/completor.vim b/vim/.vim/bundle/completor.vim index 7bffb652..53049e08 160000 --- a/vim/.vim/bundle/completor.vim +++ b/vim/.vim/bundle/completor.vim @@ -1 +1 @@ -Subproject commit 7bffb6525318bfd7d9f05af40127c1866e3afb4a +Subproject commit 53049e084af33ce3e647c9c3b2783db00085c00e diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index b2b125cf..5d9a0bc3 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit b2b125cfade75468faef6ac87742a78f2de26bfa +Subproject commit 5d9a0bc3877aea992292eeb6f318f4321fdef632 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index eb945e9a..4f24757d 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit eb945e9a114a973073a206202bd0d5df851a5193 +Subproject commit 4f24757df2a57fc01900334114b1790fcb75ad54 diff --git a/vim/.vim/bundle/vim-snippets b/vim/.vim/bundle/vim-snippets index 037be078..c5694771 160000 --- a/vim/.vim/bundle/vim-snippets +++ b/vim/.vim/bundle/vim-snippets @@ -1 +1 @@ -Subproject commit 037be07864c39d1e64ee0dbae6c444aecf6247d0 +Subproject commit c569477189f02ded61a3fc3c3f43abcc1ebcdaa4 diff --git a/vim/.vim/bundle/vim-test b/vim/.vim/bundle/vim-test index 453db3d6..f6242c80 160000 --- a/vim/.vim/bundle/vim-test +++ b/vim/.vim/bundle/vim-test @@ -1 +1 @@ -Subproject commit 453db3d6dce641f91c66731aad971530729ca172 +Subproject commit f6242c807d3bb36a3fa8f9957a37e4dc0ffbab5a diff --git a/vim/.vim/ftplugin/html.vim b/vim/.vim/ftplugin/html.vim index 89378959..e9798bb2 100644 --- a/vim/.vim/ftplugin/html.vim +++ b/vim/.vim/ftplugin/html.vim @@ -1,2 +1,4 @@ setlocal omnifunc=htmlcomplete#CompleteTags + +" Syntastic adjustments let g:syntastic_html_checkers = ['htmlhint'] diff --git a/vim/.vim/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim index f9dcaa1a..5bbe9007 100644 --- a/vim/.vim/ftplugin/java.vim +++ b/vim/.vim/ftplugin/java.vim @@ -1,8 +1,6 @@ setlocal omnifunc=javacomplete#Complete -let g:JavaComplete_ImportSortType = 'packageName' -let g:JavaComplete_ImportOrder = ['*'] -set makeprg=mvn\ $* -set errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m, +setlocal makeprg=mvn\ $* +setlocal errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m, \\[%t%[A-Z]%#]\ %f:%l:\ %m, \\%A%f:[%l\\,%c]\ %m, \\%Csymbol%.%#:\ %m, @@ -18,4 +16,10 @@ set errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m, \\%+ZTests\ run%.%#FAILURE!%.%#, \\%-G%.%# -let g:completor_java_omni_trigger = '\w+$|[\w\)\]\}\\\'\"]+\.\w*$' +" Completor integration +let g:completor_java_omni_trigger = '(\w+|[^\. \t0-9]+\.\w*)$' + +" JavaComplete adjustments +let g:JavaComplete_ImportSortType = 'packageName' +let g:JavaComplete_ImportOrder = ['*'] + diff --git a/vim/.vim/ftplugin/typescript.vim b/vim/.vim/ftplugin/typescript.vim index 9e7be40c..2fbadb51 100644 --- a/vim/.vim/ftplugin/typescript.vim +++ b/vim/.vim/ftplugin/typescript.vim @@ -1,7 +1,6 @@ -" Deoplete plugin integration -let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{}) -let g:deoplete#omni#input_patterns.typescript = ['[^. \t0-9]\.\w*'] +" Completor integration +let g:completor_typescript_omni_trigger = '(\w+|[^\. \t0-9]+\.\w*)$' -" Tsuquyomi and synstatic integration +" Tsuquyomi and syntastic integration let g:tsuquyomi_disable_quickfix = 1 let g:syntastic_typescript_checkers = ['tsuquyomi'] diff --git a/vim/.vim/ftplugin/vim.vim b/vim/.vim/ftplugin/vim.vim index 087211b2..ec32afbd 100644 --- a/vim/.vim/ftplugin/vim.vim +++ b/vim/.vim/ftplugin/vim.vim @@ -1 +1,2 @@ +" Syntastic integration let g:syntastic_vim_checkers = ['vint'] diff --git a/zsh/.fzf b/zsh/.fzf index 7c8f7d3f..a50909e8 160000 --- a/zsh/.fzf +++ b/zsh/.fzf @@ -1 +1 @@ -Subproject commit 7c8f7d3f201b89c2e1fb1aca4b7289964469cba8 +Subproject commit a50909e8067f5ef5a0aa2bb4637f033fe91df8b2 diff --git a/zsh/.profile b/zsh/.profile index cd8ddeb5..41f5ce7e 100644 --- a/zsh/.profile +++ b/zsh/.profile @@ -18,3 +18,5 @@ export LC_ALL="en_US.UTF-8" # Preferred editor for local and remote sessions export EDITOR="vim" export VISUAL="$EDITOR" + +[[ -f "~/.profile.local" ]] && source "~/.profile.local"