Merge branch 'staging2' into staging

3 files changed, 27 insertions, 13 deletions

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
+
+