diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim index 6d81ade..19c1626 100644 --- a/home/.config/nvim/init.vim +++ b/home/.config/nvim/init.vim @@ -19,22 +19,6 @@ endif call plug#begin($HOME.'/.nvim/plugged') -if s:uname == "Linux" - " enforce python3 for distros like debian where python2 is the default - if has('python3') - " this enforces TSServer for javascript - Plug 'Valloric/YouCompleteMe', { 'do': 'python3 install.py --all; rm -rf ./third_party/ycmd/third_party/tern_runtime/node_modules' } - else - Plug 'Valloric/YouCompleteMe', { 'do': './install.py --all; rm -rf ./third_party/ycmd/third_party/tern_runtime/node_modules' } - endif -else - " OSX is terrible about everything nice - Plug 'Valloric/YouCompleteMe', { 'do': './install.py --clang-completer --gocode-completer --racer-completer --tern-completer' } -endif -let g:ycm_filetype_blacklist = { - \ 'go': 1, -\} - if has('nvim') Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } else @@ -51,18 +35,14 @@ Plug 'bling/vim-airline' Plug 'bronson/vim-trailing-whitespace' Plug 'fatih/vim-go', { 'do': ':exec GoPostUpdate()' } Plug 'godlygeek/tabular' -Plug 'janko-m/vim-test' -Plug 'jbgutierrez/vim-babel' Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } Plug 'majutsushi/tagbar' -Plug 'mattn/webapi-vim' Plug 'moll/vim-bbye' Plug 'nanotech/jellybeans.vim' Plug 'rking/ag.vim' Plug 'rust-lang/rust.vim', { 'for': 'rust' } Plug 'scrooloose/nerdcommenter' Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -Plug 'shawncplus/phpcomplete.vim', { 'for': 'php' } Plug 'sheerun/vim-polyglot' Plug 'terryma/vim-multiple-cursors' Plug 'tmux-plugins/vim-tmux-focus-events' @@ -105,36 +85,6 @@ if v:version > 703 || v:version == 703 && has('patch541') set formatoptions+=j endif -if getcwd() =~ '/repos/cuda' - " codesniff files - let g:ale_php_phpcs_standard=''.$HOME.'/repos/cuda/Cuda-PHP-Code-Standards/PHP_CodeSniffer/Barracuda' - let g:ale_php_phan_use_client=1 - let $PHAN_SOCKET_PATH = system('echo -n "./.git/phan${PPID}"') - let git_root_dir = system("echo -n $(git rev-parse --show-toplevel)") - if filereadable(''.git_root_dir.'/vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml') - let g:ale_php_phpcs_standard=''.git_root_dir.'/vendor/fig-r/psr2r-sniffer/PSR2R' - let g:ale_php_phpcbf_standard=''.git_root_dir.'/vendor/fig-r/psr2r-sniffer/PSR2R' - endif - - if filereadable(''.git_root_dir.'/vendor/bin/phpcs') - let g:ale_php_phpcs_executable=''.git_root_dir.'/vendor/bin/phpcs' - endif - - if filereadable(''.git_root_dir.'/vendor/bin/phpcbf') - let g:ale_php_phpcbf_executable=''.git_root_dir.'/vendor/bin/phpcbf' - let g:ale_fixers = {'php': ['phpcbf', 'remove_trailing_lines', 'trim_whitespace']} - let g:ale_fix_on_save = 1 - endif - - if filereadable(''.git_root_dir.'/.phan/config.php') - call system("cd " . git_root_dir . " && phan --daemonize-socket ${PHAN_SOCKET_PATH} --quick & echo $! > ./.git/phanpid${PPID}") - autocmd VimLeave * call system("kill $(cat ./.git/phanpid${PPID}); rm ${PHAN_SOCKET_PATH} .git/phanpid${PPID}") - endif -else - let g:ale_php_phpcs_standard='PSR2' - au FileType php setl sw=4 sts=4 et -endif - " Enable syntax-highlighting for Go let g:go_highlight_functions = 1 let g:go_highlight_methods = 1