aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2020-07-08 17:51:20 +0200
committerMax Christian Pohle2020-07-08 17:51:20 +0200
commitb9591e68f0a631dd17f54291ca277aff5a8e9f3b (patch)
tree025c1b35c802c67838cab3cd0c5b53ab82678804
parentb68fec17407aa70fdd4cc5c88667ac2d2f49658a (diff)
downloadvim-b9591e68f0a631dd17f54291ca277aff5a8e9f3b.tar.bz2
vim-b9591e68f0a631dd17f54291ca277aff5a8e9f3b.zip
Minor cleanups done over a larger time span
-rw-r--r--.gitmodules16
-rw-r--r--init.vim31
m---------pack/_all/opt/YouCompleteMe0
m---------pack/_all/opt/ale0
m---------pack/_all/opt/jedi-vim0
m---------pack/_all/opt/ultisnips0
m---------pack/_all/opt/vim-snippets0
m---------pack/_all/start/LanguageClient0
m---------pack/_all/start/deoplete0
m---------pack/_all/start/echodoc (renamed from pack/neovim/opt/echodoc.vim)0
m---------pack/_all/start/vim-fugitive0
m---------pack/_all/start/vim-mediawiki-editor0
m---------pack/neovim/opt/LanguageClient-neovim0
m---------pack/neovim/opt/ale0
m---------pack/neovim/opt/deoplete.nvim0
m---------pack/univention/start/vim-ucr-template0
m---------pack/vim/opt/YouCompleteMe0
m---------pack/vim/opt/vimtex0
-rw-r--r--plugin/ale.vim2
-rw-r--r--plugin/snippets.vim15
-rw-r--r--plugin/youcompleteme.vim23
-rw-r--r--vimrc27
22 files changed, 52 insertions, 62 deletions
diff --git a/.gitmodules b/.gitmodules
index eeca4e1..badd05d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,24 +25,21 @@
25[submodule "pack/_all/opt/nerdtree"] 25[submodule "pack/_all/opt/nerdtree"]
26 path = pack/_all/opt/nerdtree 26 path = pack/_all/opt/nerdtree
27 url = https://github.com/scrooloose/nerdtree.git 27 url = https://github.com/scrooloose/nerdtree.git
28[submodule "pack/_all/opt/ultisnips"]
29 path = pack/_all/opt/ultisnips
30 url = https://github.com/SirVer/ultisnips.git
31[submodule "pack/_all/opt/vim-snippets"] 28[submodule "pack/_all/opt/vim-snippets"]
32 path = pack/_all/opt/vim-snippets 29 path = pack/_all/opt/vim-snippets
33 url = https://github.com/honza/vim-snippets.git 30 url = https://github.com/honza/vim-snippets.git
34[submodule "pack/neovim/opt/deoplete.nvim"] 31[submodule "pack/neovim/opt/deoplete.nvim"]
35 path = pack/neovim/opt/deoplete.nvim 32 path = pack/_all/start/deoplete
36 url = https://github.com/Shougo/deoplete.nvim.git 33 url = https://github.com/Shougo/deoplete.nvim.git
37[submodule "pack/neovim/opt/echodoc.vim"] 34[submodule "pack/neovim/opt/echodoc.vim"]
38 path = pack/neovim/opt/echodoc.vim 35 path = pack/_all/start/echodoc
39 url = https://github.com/Shougo/echodoc.vim.git 36 url = https://github.com/Shougo/echodoc.vim.git
40[submodule "pack/neovim/opt/LanguageClient-neovim"] 37[submodule "pack/neovim/opt/LanguageClient-neovim"]
41 path = pack/neovim/opt/LanguageClient-neovim 38 path = pack/_all/start/LanguageClient
42 url = https://github.com/autozimu/LanguageClient-neovim.git 39 url = https://github.com/autozimu/LanguageClient-neovim.git
43 branch = next 40 branch = next
44[submodule "pack/neovim/opt/ale"] 41[submodule "pack/neovim/opt/ale"]
45 path = pack/neovim/opt/ale 42 path = pack/_all/opt/ale
46 url = https://github.com/dense-analysis/ale.git 43 url = https://github.com/dense-analysis/ale.git
47[submodule "pack/vim/opt/syntastic"] 44[submodule "pack/vim/opt/syntastic"]
48 path = pack/vim/opt/syntastic 45 path = pack/vim/opt/syntastic
@@ -57,8 +54,11 @@
57 path = pack/_all/opt/zeavim.vim 54 path = pack/_all/opt/zeavim.vim
58 url = https://github.com/KabbAmine/zeavim.vim 55 url = https://github.com/KabbAmine/zeavim.vim
59[submodule "pack/vim/opt/YouCompleteMe.git"] 56[submodule "pack/vim/opt/YouCompleteMe.git"]
60 path = pack/vim/opt/YouCompleteMe 57 path = pack/_all/opt/YouCompleteMe
61 url = https://github.com/Valloric/YouCompleteMe.git 58 url = https://github.com/Valloric/YouCompleteMe.git
62[submodule "pack/vim/opt/vimtex"] 59[submodule "pack/vim/opt/vimtex"]
63 path = pack/vim/opt/vimtex 60 path = pack/vim/opt/vimtex
64 url = https://github.com/lervag/vimtex 61 url = https://github.com/lervag/vimtex
62[submodule "pack/_all/start/vim-mediawiki-editor"]
63 path = pack/_all/start/vim-mediawiki-editor
64 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 @@
1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' 1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common'
2
3set packpath+=pack/neovim 2set packpath+=pack/neovim
4 3
5"======================================================================================================================= 4"=======================================================================================================================
@@ -41,22 +40,26 @@ augroup DEOPLETE
41 \ }, 40 \ },
42 \ } 41 \ }
43 42
44 packadd deoplete.nvim 43 " packadd deoplete.nvim
45 packadd LanguageClient-neovim 44 " packadd LanguageClient-neovim
46 packadd echodoc.vim 45 " packadd echodoc.vim
47 46
48 let g:deoplete#sources#clang#include_default_arguments=1 47 let g:deoplete#sources#clang#include_default_arguments=1
49 " suggestions in alphabetic order 48 " suggestions in alphabetic order
50 call deoplete#custom#source('_', 'sorters', ['sorter_word']) 49
51 call deoplete#custom#filter('converter_reorder_attr', 50 function! ConfigureDeoplete()
52 \ 'attrs_order', { 51 call deoplete#custom#source('_', 'sorters', ['sorter_word'])
53 \ '_': { 52 call deoplete#custom#filter('converter_reorder_attr',
54 \ 'kind': [ 53 \ 'attrs_order', {
55 \ 'Function', 54 \ '_': {
56 \ 'Property' 55 \ 'kind': [
57 \ ] 56 \ 'Function',
58 \ }, 57 \ 'Property'
59 \}) 58 \ ]
59 \ },
60 \})
61 endfunction
62 autocmd VimEnter * call ConfigureDeoplete()
60augroup END 63augroup END
61 64
62"======================================================================================================================= 65"=======================================================================================================================
diff --git a/pack/_all/opt/YouCompleteMe b/pack/_all/opt/YouCompleteMe
new file mode 160000
Subproject 9309f77732bde34b7ecf9c2e154b9fcdf14c529
diff --git a/pack/_all/opt/ale b/pack/_all/opt/ale
new file mode 160000
Subproject b3c6db173a019c37c83d4600c0c68872e91086d
diff --git a/pack/_all/opt/jedi-vim b/pack/_all/opt/jedi-vim
Subproject e83112f9aab147ab485ee7af72e01d047c5206d Subproject a0207fadf9f165adac61f01abc07db0ae898cbe
diff --git a/pack/_all/opt/ultisnips b/pack/_all/opt/ultisnips
deleted file mode 160000
Subproject e83c82099d9bd43dc7895e3cb5b114ee5a2a07c
diff --git a/pack/_all/opt/vim-snippets b/pack/_all/opt/vim-snippets
deleted file mode 160000
Subproject 900bf93c6680e38ce568dba26c3f48b4365ac73
diff --git a/pack/_all/start/LanguageClient b/pack/_all/start/LanguageClient
new file mode 160000
Subproject 0e5c9546bfddbaa2b01e5056389c25aefc8bf98
diff --git a/pack/_all/start/deoplete b/pack/_all/start/deoplete
new file mode 160000
Subproject a57980ab9d08b11affddc30439f6975e4eb01b4
diff --git a/pack/neovim/opt/echodoc.vim b/pack/_all/start/echodoc
Subproject 4719626bfd477f1189dd9992614ff452d3ea3ca Subproject 4719626bfd477f1189dd9992614ff452d3ea3ca
diff --git a/pack/_all/start/vim-fugitive b/pack/_all/start/vim-fugitive
Subproject 27a5c3abd211c2784513dab4db082fa414ad096 Subproject 1da7c133b109cd329060174a104e325e4d6bcc8
diff --git a/pack/_all/start/vim-mediawiki-editor b/pack/_all/start/vim-mediawiki-editor
new file mode 160000
Subproject f5a8b76639bfe50413f40d021c2f941123eed21
diff --git a/pack/neovim/opt/LanguageClient-neovim b/pack/neovim/opt/LanguageClient-neovim
deleted file mode 160000
Subproject 4b35f5d6859ab3d42546192cbede9add59a7435
diff --git a/pack/neovim/opt/ale b/pack/neovim/opt/ale
deleted file mode 160000
Subproject 834d6f9c48ce349a4c3d72e98bd0de81aaa8404
diff --git a/pack/neovim/opt/deoplete.nvim b/pack/neovim/opt/deoplete.nvim
deleted file mode 160000
Subproject e7f4c206287e867fe4991f6de76a12107fa1459
diff --git a/pack/univention/start/vim-ucr-template b/pack/univention/start/vim-ucr-template
new file mode 160000
Subproject fdb4e03a8650efb7bd6e475a005943a773707fd
diff --git a/pack/vim/opt/YouCompleteMe b/pack/vim/opt/YouCompleteMe
deleted file mode 160000
Subproject f9906f804b02e6b7e70a7f1a6f949e905784b5b
diff --git a/pack/vim/opt/vimtex b/pack/vim/opt/vimtex
Subproject 49bc335fffa40a7b7b84b6110b57ebcbaaf019e Subproject 4437be59cda16e2327ed7fdc1ea26f0637cfec6
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 @@
1let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}} 1let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}}
2let g:ale_linters = {'python': ['flake8', 'pylint'] } 2let g:ale_linters = {'python': ['pycodestyle'] }
3let g:ale_fixers = 3let g:ale_fixers =
4 \ { 4 \ {
5 \ 'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'], 5 \ '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 @@
1 1" vv if we ever want snippets, that seems to be the best choice right now
2augroup ULTISNIPS 2" packadd neosnippet-snippets
3 if has("python") || has('python3') 3" packadd neosnippet
4 let g:UltiSnipsExpandTrigger = '<Tab>'| " expands the snippet, be careful not to use <tab> elsewhere (ycm uses it by default, but it has been deactivated by g:ycm_key_list_select_completion)
5 let g:UltiSnipsJumpForwardTrigger = '<Tab>'|
6 let g:UltiSnipsJumpBackwardTrigger = '<S-Tab>'|
7
8 packadd vim-snippets
9 packadd ultisnips
10 endif
11augroup END
12
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 @@
1augroup YOUCOMPLETEME
2 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column
3 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
4
5 let g:ycm_autoclose_preview_window_after_insertion = 0
6 let g:ycm_auto_trigger = 1
7 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
8 let g:ycm_confirm_extra_conf = 0 " security is overrated ;)
9 let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that
10
11 let g:ycm_key_list_previous_completion = ['Up']
12 let g:ycm_key_list_select_completion = ['Down']
13
14 let g:ycm_semantic_triggers =
15 \ {
16 \ 'c': [ 're!\w{2}' ]
17 \ } " per language configurations
18
19
20 " packadd YouCompleteMe
21augroup END
22
23
diff --git a/vimrc b/vimrc
index 058a66b..3c6b53a 100644
--- a/vimrc
+++ b/vimrc
@@ -1,8 +1,6 @@
1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' 1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common'
2
3set packpath+=pack/vim 2set packpath+=pack/vim
4 3
5
6set ttymouse=xterm2 4set ttymouse=xterm2
7set ttyscroll=100 | " improves speed for terminal vim, incompatible with nvim 5set ttyscroll=100 | " improves speed for terminal vim, incompatible with nvim
8set ttyfast | " improves speed for terminal vim (incompatible with nvim) 6set ttyfast | " improves speed for terminal vim (incompatible with nvim)
@@ -23,29 +21,4 @@ endif
23if filereadable($VIMRUNTIME.'/macros/matchit.vim') 21if filereadable($VIMRUNTIME.'/macros/matchit.vim')
24 packadd! matchit 22 packadd! matchit
25endif 23endif
26
27"======================================================================================================================= 24"=======================================================================================================================
28augroup YOUCOMPLETEME
29 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column
30 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
31
32 let g:ycm_autoclose_preview_window_after_insertion = 0
33 let g:ycm_auto_trigger = 1
34 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
35 let g:ycm_confirm_extra_conf = 0 " security is overrated ;)
36 let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that
37
38 let g:ycm_key_list_previous_completion = ['Up']
39 let g:ycm_key_list_select_completion = ['Down']
40
41 let g:ycm_semantic_triggers =
42 \ {
43 \ 'c': [ 're!\w{2}' ]
44 \ } " per language configurations
45
46
47 packadd YouCompleteMe
48augroup END
49
50
51
..