From 7e3cfd66aef32a4e2302eca6aa7a7f06ebc3cfeb Mon Sep 17 00:00:00 2001
From: lhark <lhark@lharktop>
Date: Mon, 20 Nov 2017 13:40:08 -0500
Subject: [PATCH] Tweak completion and linter. Add hlsl syntax highlight

---
 vimrc | 53 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/vimrc b/vimrc
index ac14535..28f3d4b 100644
--- a/vimrc
+++ b/vimrc
@@ -59,37 +59,50 @@ if has("unix") || has("mac")
         map <F5> :UndotreeToggle<CR>
         Plugin 'vim-scripts/LaTeX-Box'
         map <LocalLeader>ll :Latexmk<CR>
-        if isdirectory(expand("$HOME/.vim/bundle/YouCompleteMe")) || isdirectory(expand("/usr/share/vim/vimfiles/third_party/ycmd/"))
+        if isdirectory(expand("/usr/share/vim/vimfiles/third_party/ycmd/"))
             "[Workaround for YCM non-portability]"
-            Plugin 'Valloric/YouCompleteMe'
+            "No need for Plugin 'Valloric/YouCompleteMe', it's installed system-wide
             let g:ycm_global_ycm_extra_conf = '/usr/share/vim/vimfiles/third_party/ycmd/cpp/ycm/.ycm_extra_conf.py'
             let g:ycm_server_python_interpreter = '/usr/bin/python2'
+            "[We're using ale for linting]"
+            let g:ycm_show_diagnostics_ui = 0
         else
             Plugin 'AutoComplPop'
         endif
         Plugin 'w0rp/ale'
-        let g:ale_sign_error = 'E'
-        let g:ale_sign_warning = 'W'
+        let g:ale_linters = {
+            \ 'cpp': ['g++'],
+            \ 'c': ['clang']
+            \ }
+        let g:ale_c_gcc_options='-std=c99 -pedantic'
+        let g:ale_sign_error = '●'
+        let g:ale_sign_warning = '●'
         Plugin 'itchyny/lightline.vim'
         let g:lightline = {
-                    \'colorscheme': 'solarized',
-                    \ 'active': {
-                    \   'left': [['mode', 'paste'], ['filename', 'modified']],
-                    \   'right': [['lineinfo'], ['percent'], ['readonly', 'linter_warnings', 'linter_errors', 'linter_ok']]
-                    \ },
-                    \ 'component_expand': {
-                    \   'linter_warnings': 'LightlineLinterWarnings',
-                    \   'linter_errors': 'LightlineLinterErrors',
-                    \   'linter_ok': 'LightlineLinterOK'
-                    \ },
-                    \ 'component_type': {
-                    \   'readonly': 'error',
-                    \   'linter_warnings': 'warning',
-                    \   'linter_errors': 'error'
-                    \ },
-                    \}
+            \'colorscheme': 'solarized',
+            \ 'active': {
+            \   'left': [['mode', 'paste'], ['filename', 'modified']],
+            \   'right': [['lineinfo'],
+            \             ['percent'],
+            \             ['readonly', 'linter_warnings', 'linter_errors', 'linter_ok'],
+            \             ['fileformat'],
+            \             ['fileencoding']
+            \            ]
+            \ },
+            \ 'component_expand': {
+            \   'linter_warnings': 'LightlineLinterWarnings',
+            \   'linter_errors': 'LightlineLinterErrors',
+            \   'linter_ok': 'LightlineLinterOK'
+            \ },
+            \ 'component_type': {
+            \   'readonly': 'error',
+            \   'linter_warnings': 'warning',
+            \   'linter_errors': 'error'
+            \ },
+            \}
         Plugin 'godlygeek/tabular'
         Plugin 'tikhomirov/vim-glsl'
+        Plugin 'beyondmarc/hlsl.vim'
         Plugin 'mzlogin/vim-smali'
         Plugin 'jamessan/vim-gnupg'
         Plugin 'petRUShka/vim-opencl'