Merge branch 'staging2' into staging

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 @@
 [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
+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 @@
 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       = '<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)
-        let g:UltiSnipsJumpForwardTrigger  = '<Tab>'|
-        let g:UltiSnipsJumpBackwardTrigger = '<S-Tab>'|
-
-        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 2214e7b..86ff057 100644
--- a/vimrc
+++ b/vimrc
@@ -1,8 +1,6 @@
 exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' 
-
 set packpath+=pack/vim
 
-
 set ttymouse=xterm2
 set term=xterm-256color  " usually a good choice, install ncurses and use `toe` to see all available choices
 set ttybuiltin      | " use internal termcaps, because these are more stable
@@ -24,29 +22,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
-
-
-