From b9591e68f0a631dd17f54291ca277aff5a8e9f3b Mon Sep 17 00:00:00 2001 From: Max Christian Pohle Date: Wed, 8 Jul 2020 17:51:20 +0200 Subject: Minor cleanups done over a larger time span --- .gitmodules | 16 ++++++++-------- init.vim | 31 +++++++++++++++++-------------- pack/_all/opt/YouCompleteMe | 1 + pack/_all/opt/ale | 1 + pack/_all/opt/jedi-vim | 2 +- pack/_all/opt/ultisnips | 1 - pack/_all/opt/vim-snippets | 1 - pack/_all/start/LanguageClient | 1 + pack/_all/start/deoplete | 1 + pack/_all/start/echodoc | 1 + pack/_all/start/vim-fugitive | 2 +- pack/_all/start/vim-mediawiki-editor | 1 + pack/neovim/opt/LanguageClient-neovim | 1 - pack/neovim/opt/ale | 1 - pack/neovim/opt/deoplete.nvim | 1 - pack/neovim/opt/echodoc.vim | 1 - pack/univention/start/vim-ucr-template | 1 + pack/vim/opt/YouCompleteMe | 1 - pack/vim/opt/vimtex | 2 +- plugin/ale.vim | 2 +- plugin/snippets.vim | 15 +++------------ plugin/youcompleteme.vim | 23 +++++++++++++++++++++++ vimrc | 27 --------------------------- 23 files changed, 62 insertions(+), 72 deletions(-) create mode 160000 pack/_all/opt/YouCompleteMe create mode 160000 pack/_all/opt/ale delete mode 160000 pack/_all/opt/ultisnips delete mode 160000 pack/_all/opt/vim-snippets create mode 160000 pack/_all/start/LanguageClient create mode 160000 pack/_all/start/deoplete create mode 160000 pack/_all/start/echodoc create mode 160000 pack/_all/start/vim-mediawiki-editor delete mode 160000 pack/neovim/opt/LanguageClient-neovim delete mode 160000 pack/neovim/opt/ale delete mode 160000 pack/neovim/opt/deoplete.nvim delete mode 160000 pack/neovim/opt/echodoc.vim create mode 160000 pack/univention/start/vim-ucr-template delete mode 160000 pack/vim/opt/YouCompleteMe create mode 100644 plugin/youcompleteme.vim diff --git a/.gitmodules b/.gitmodules index eeca4e1..badd05d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,24 +25,21 @@ [submodule "pack/_all/opt/nerdtree"] path = pack/_all/opt/nerdtree url = https://github.com/scrooloose/nerdtree.git -[submodule "pack/_all/opt/ultisnips"] - path = pack/_all/opt/ultisnips - url = https://github.com/SirVer/ultisnips.git [submodule "pack/_all/opt/vim-snippets"] path = pack/_all/opt/vim-snippets url = https://github.com/honza/vim-snippets.git [submodule "pack/neovim/opt/deoplete.nvim"] - path = pack/neovim/opt/deoplete.nvim + path = pack/_all/start/deoplete url = https://github.com/Shougo/deoplete.nvim.git [submodule "pack/neovim/opt/echodoc.vim"] - path = pack/neovim/opt/echodoc.vim + path = pack/_all/start/echodoc url = https://github.com/Shougo/echodoc.vim.git [submodule "pack/neovim/opt/LanguageClient-neovim"] - path = pack/neovim/opt/LanguageClient-neovim + path = pack/_all/start/LanguageClient url = https://github.com/autozimu/LanguageClient-neovim.git branch = next [submodule "pack/neovim/opt/ale"] - path = pack/neovim/opt/ale + path = pack/_all/opt/ale url = https://github.com/dense-analysis/ale.git [submodule "pack/vim/opt/syntastic"] path = pack/vim/opt/syntastic @@ -57,8 +54,11 @@ path = pack/_all/opt/zeavim.vim url = https://github.com/KabbAmine/zeavim.vim [submodule "pack/vim/opt/YouCompleteMe.git"] - path = pack/vim/opt/YouCompleteMe + path = pack/_all/opt/YouCompleteMe url = https://github.com/Valloric/YouCompleteMe.git [submodule "pack/vim/opt/vimtex"] path = pack/vim/opt/vimtex url = https://github.com/lervag/vimtex +[submodule "pack/_all/start/vim-mediawiki-editor"] + path = pack/_all/start/vim-mediawiki-editor + url = https://github.com/aquach/vim-mediawiki-editor diff --git a/init.vim b/init.vim index 402f7a6..40894af 100644 --- a/init.vim +++ b/init.vim @@ -1,5 +1,4 @@ exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' - set packpath+=pack/neovim "======================================================================================================================= @@ -41,22 +40,26 @@ augroup DEOPLETE \ }, \ } - packadd deoplete.nvim - packadd LanguageClient-neovim - packadd echodoc.vim + " packadd deoplete.nvim + " packadd LanguageClient-neovim + " packadd echodoc.vim let g:deoplete#sources#clang#include_default_arguments=1 " suggestions in alphabetic order - call deoplete#custom#source('_', 'sorters', ['sorter_word']) - call deoplete#custom#filter('converter_reorder_attr', - \ 'attrs_order', { - \ '_': { - \ 'kind': [ - \ 'Function', - \ 'Property' - \ ] - \ }, - \}) + + function! ConfigureDeoplete() + call deoplete#custom#source('_', 'sorters', ['sorter_word']) + call deoplete#custom#filter('converter_reorder_attr', + \ 'attrs_order', { + \ '_': { + \ 'kind': [ + \ 'Function', + \ 'Property' + \ ] + \ }, + \}) + endfunction + autocmd VimEnter * call ConfigureDeoplete() augroup END "======================================================================================================================= diff --git a/pack/_all/opt/YouCompleteMe b/pack/_all/opt/YouCompleteMe new file mode 160000 index 0000000..9309f77 --- /dev/null +++ b/pack/_all/opt/YouCompleteMe @@ -0,0 +1 @@ +Subproject commit 9309f77732bde34b7ecf9c2e154b9fcdf14c5295 diff --git a/pack/_all/opt/ale b/pack/_all/opt/ale new file mode 160000 index 0000000..b3c6db1 --- /dev/null +++ b/pack/_all/opt/ale @@ -0,0 +1 @@ +Subproject commit b3c6db173a019c37c83d4600c0c68872e91086dd diff --git a/pack/_all/opt/jedi-vim b/pack/_all/opt/jedi-vim index e83112f..a0207fa 160000 --- a/pack/_all/opt/jedi-vim +++ b/pack/_all/opt/jedi-vim @@ -1 +1 @@ -Subproject commit e83112f9aab147ab485ee7af72e01d047c5206d3 +Subproject commit a0207fadf9f165adac61f01abc07db0ae898cbe6 diff --git a/pack/_all/opt/ultisnips b/pack/_all/opt/ultisnips deleted file mode 160000 index e83c820..0000000 --- a/pack/_all/opt/ultisnips +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e83c82099d9bd43dc7895e3cb5b114ee5a2a07c6 diff --git a/pack/_all/opt/vim-snippets b/pack/_all/opt/vim-snippets deleted file mode 160000 index 900bf93..0000000 --- a/pack/_all/opt/vim-snippets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 900bf93c6680e38ce568dba26c3f48b4365ac730 diff --git a/pack/_all/start/LanguageClient b/pack/_all/start/LanguageClient new file mode 160000 index 0000000..0e5c954 --- /dev/null +++ b/pack/_all/start/LanguageClient @@ -0,0 +1 @@ +Subproject commit 0e5c9546bfddbaa2b01e5056389c25aefc8bf989 diff --git a/pack/_all/start/deoplete b/pack/_all/start/deoplete new file mode 160000 index 0000000..a57980a --- /dev/null +++ b/pack/_all/start/deoplete @@ -0,0 +1 @@ +Subproject commit a57980ab9d08b11affddc30439f6975e4eb01b41 diff --git a/pack/_all/start/echodoc b/pack/_all/start/echodoc new file mode 160000 index 0000000..4719626 --- /dev/null +++ b/pack/_all/start/echodoc @@ -0,0 +1 @@ +Subproject commit 4719626bfd477f1189dd9992614ff452d3ea3caf diff --git a/pack/_all/start/vim-fugitive b/pack/_all/start/vim-fugitive index 27a5c3a..1da7c13 160000 --- a/pack/_all/start/vim-fugitive +++ b/pack/_all/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 27a5c3abd211c2784513dab4db082fa414ad0967 +Subproject commit 1da7c133b109cd329060174a104e325e4d6bcc82 diff --git a/pack/_all/start/vim-mediawiki-editor b/pack/_all/start/vim-mediawiki-editor new file mode 160000 index 0000000..f5a8b76 --- /dev/null +++ b/pack/_all/start/vim-mediawiki-editor @@ -0,0 +1 @@ +Subproject commit f5a8b76639bfe50413f40d021c2f941123eed21a diff --git a/pack/neovim/opt/LanguageClient-neovim b/pack/neovim/opt/LanguageClient-neovim deleted file mode 160000 index 4b35f5d..0000000 --- a/pack/neovim/opt/LanguageClient-neovim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b35f5d6859ab3d42546192cbede9add59a7435a diff --git a/pack/neovim/opt/ale b/pack/neovim/opt/ale deleted file mode 160000 index 834d6f9..0000000 --- a/pack/neovim/opt/ale +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 834d6f9c48ce349a4c3d72e98bd0de81aaa84042 diff --git a/pack/neovim/opt/deoplete.nvim b/pack/neovim/opt/deoplete.nvim deleted file mode 160000 index e7f4c20..0000000 --- a/pack/neovim/opt/deoplete.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7f4c206287e867fe4991f6de76a12107fa14593 diff --git a/pack/neovim/opt/echodoc.vim b/pack/neovim/opt/echodoc.vim deleted file mode 160000 index 4719626..0000000 --- a/pack/neovim/opt/echodoc.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4719626bfd477f1189dd9992614ff452d3ea3caf diff --git a/pack/univention/start/vim-ucr-template b/pack/univention/start/vim-ucr-template new file mode 160000 index 0000000..fdb4e03 --- /dev/null +++ b/pack/univention/start/vim-ucr-template @@ -0,0 +1 @@ +Subproject commit fdb4e03a8650efb7bd6e475a005943a773707fd6 diff --git a/pack/vim/opt/YouCompleteMe b/pack/vim/opt/YouCompleteMe deleted file mode 160000 index f9906f8..0000000 --- a/pack/vim/opt/YouCompleteMe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f9906f804b02e6b7e70a7f1a6f949e905784b5b9 diff --git a/pack/vim/opt/vimtex b/pack/vim/opt/vimtex index 49bc335..4437be5 160000 --- a/pack/vim/opt/vimtex +++ b/pack/vim/opt/vimtex @@ -1 +1 @@ -Subproject commit 49bc335fffa40a7b7b84b6110b57ebcbaaf019ea +Subproject commit 4437be59cda16e2327ed7fdc1ea26f0637cfec63 diff --git a/plugin/ale.vim b/plugin/ale.vim index ba07343..4efc137 100644 --- a/plugin/ale.vim +++ b/plugin/ale.vim @@ -1,5 +1,5 @@ let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}} -let g:ale_linters = {'python': ['flake8', 'pylint'] } +let g:ale_linters = {'python': ['pycodestyle'] } let g:ale_fixers = \ { \ 'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'], diff --git a/plugin/snippets.vim b/plugin/snippets.vim index dcf265b..fe5d29d 100644 --- a/plugin/snippets.vim +++ b/plugin/snippets.vim @@ -1,12 +1,3 @@ - -augroup ULTISNIPS - if has("python") || has('python3') - let g:UltiSnipsExpandTrigger = ''| " expands the snippet, be careful not to use elsewhere (ycm uses it by default, but it has been deactivated by g:ycm_key_list_select_completion) - let g:UltiSnipsJumpForwardTrigger = ''| - let g:UltiSnipsJumpBackwardTrigger = ''| - - packadd vim-snippets - packadd ultisnips - endif -augroup END - +" vv if we ever want snippets, that seems to be the best choice right now +" packadd neosnippet-snippets +" packadd neosnippet diff --git a/plugin/youcompleteme.vim b/plugin/youcompleteme.vim new file mode 100644 index 0000000..d2283fd --- /dev/null +++ b/plugin/youcompleteme.vim @@ -0,0 +1,23 @@ +augroup YOUCOMPLETEME + let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column + let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn + + let g:ycm_autoclose_preview_window_after_insertion = 0 + let g:ycm_auto_trigger = 1 + let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file + let g:ycm_confirm_extra_conf = 0 " security is overrated ;) + let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that + + let g:ycm_key_list_previous_completion = ['Up'] + let g:ycm_key_list_select_completion = ['Down'] + + let g:ycm_semantic_triggers = + \ { + \ 'c': [ 're!\w{2}' ] + \ } " per language configurations + + + " packadd YouCompleteMe +augroup END + + diff --git a/vimrc b/vimrc index 058a66b..3c6b53a 100644 --- a/vimrc +++ b/vimrc @@ -1,8 +1,6 @@ exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' - set packpath+=pack/vim - set ttymouse=xterm2 set ttyscroll=100 | " improves speed for terminal vim, incompatible with nvim set ttyfast | " improves speed for terminal vim (incompatible with nvim) @@ -23,29 +21,4 @@ endif if filereadable($VIMRUNTIME.'/macros/matchit.vim') packadd! matchit endif - "======================================================================================================================= -augroup YOUCOMPLETEME - let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column - let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn - - let g:ycm_autoclose_preview_window_after_insertion = 0 - let g:ycm_auto_trigger = 1 - let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file - let g:ycm_confirm_extra_conf = 0 " security is overrated ;) - let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that - - let g:ycm_key_list_previous_completion = ['Up'] - let g:ycm_key_list_select_completion = ['Down'] - - let g:ycm_semantic_triggers = - \ { - \ 'c': [ 're!\w{2}' ] - \ } " per language configurations - - - packadd YouCompleteMe -augroup END - - - -- cgit v1.2.3