From 9478e1e181a0ef1edf677e7df02315a37a109bdb Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Mon, 1 Oct 2018 22:48:44 +0200 Subject: [PATCH] move plugin configurations to plugins --- vim/.vimrc | 197 ++++++++++++++++++++--------------------------------- 1 file changed, 74 insertions(+), 123 deletions(-) diff --git a/vim/.vimrc b/vim/.vimrc index 6cb1163..7169120 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -9,53 +9,112 @@ Plug 'tpope/vim-unimpaired' Plug 'tpope/vim-surround' Plug 'tpope/vim-abolish' -" project config Plug 'editorconfig/editorconfig-vim' -Plug 'tpope/vim-projectionist' + let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] -" navigating in project +Plug 'tpope/vim-projectionist' Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf.vim' -Plug 'mhinz/vim-grepper' -Plug 'ludovicchabant/vim-gutentags' + nnoremap b :Buffers + nnoremap f :GFiles + nnoremap F :Files + nnoremap c :Commits + nnoremap bc :BCommits + nnoremap t :Tags + nnoremap bt :BTags + nnoremap l :Lines + nnoremap bl :BLines + nnoremap w :Windows + nnoremap bh :History + nnoremap ch :History: + nnoremap sh :History/ + nnoremap vc :Commands + nnoremap m :Maps + nnoremap h :Helptags + +Plug 'mhinz/vim-grepper' + nnoremap / :Grepper -tool rg + nnoremap * :Grepper -tool rg -cword -noprompt + let g:grepper = {} + let g:grepper.tools = ['rg', 'git', 'ag', 'grep'] + +Plug 'ludovicchabant/vim-gutentags' + let g:gutentags_cache_dir="~/.tags" + let g:gutentags_file_list_command = { + \ 'markers': { + \ '.git': 'git ls-files', + \ '.hg': 'hg files', + \ }, + \ } -" file browser Plug 'rbgrouleff/bclose.vim' Plug 'francoiscabrol/ranger.vim' + let g:ranger_map_keys = 0 + nnoremap d :Ranger + let g:ranger_replace_netrw = 1 -" linting Plug 'w0rp/ale' + nmap (ale_previous_wrap) + nmap (ale_next_wrap) + nmap gq (ale_fix) + let g:ale_linters = {} + let g:ale_linters.javascript = ['eslint'] + let g:ale_fixers = {} + let g:ale_fixers.javascript = ['eslint'] -" completion -Plug 'Shougo/deoplete.nvim' Plug 'roxma/nvim-yarp' Plug 'roxma/vim-hug-neovim-rpc' +Plug 'Shougo/deoplete.nvim' + let g:deoplete#enable_at_startup=1 + let g:deoplete#file#enable_buffer_path=1 + Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' } -" git related Plug 'tpope/vim-fugitive' Plug 'tpope/vim-rhubarb' Plug 'airblade/vim-gitgutter' -" undo Plug 'simnalamburt/vim-mundo' + nnoremap u :MundoToggle -" appearence Plug 'itchyny/lightline.vim' + if filereadable(expand("~/.vim/lightline.vim")) + source ~/.vim/lightline.vim + augroup ale-statusline + autocmd! + autocmd User ALELint call lightline#update() + augroup END + endif + + function! LightlineReload() + call lightline#init() + call lightline#colorscheme() + call lightline#update() + endfunction + Plug 'morhetz/gruvbox' -" filetypes Plug 'sheerun/vim-polyglot' + let g:polyglot_disabled = ['javascript', 'jsx'] + Plug 'SirVer/ultisnips' + let g:UltiSnipsExpandTrigger="" + let g:UltiSnipsJumpForwardTrigger="" + let g:UltiSnipsJumpBackwardTrigger="" " javascript Plug 'pangloss/vim-javascript' -Plug 'marijnh/tern_for_vim', { 'do': 'npm install' } Plug 'mxw/vim-jsx' + let g:jsx_ext_required = 0 -" previews Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } + let g:tex_flavor = "latex" + let g:livepreview_previewer = 'zathura' + Plug 'tyru/open-browser.vim' + let g:netrw_nogx = 1 + nmap gx (openbrowser-smart-search) + vmap gx (openbrowser-smart-search) " debug Plug 'tweekmonster/startuptime.vim' @@ -227,114 +286,6 @@ cnoreabbrev Qall qall iab xnow =strftime("%Y-%m-%d %H:%M") " }}} -" Plugin Configuration {{{ - -"" editorconfig -let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] - -"" plolyglott -let g:polyglot_disabled = ['javascript', 'jsx'] - -"" vim-grepper -nnoremap / :Grepper -tool rg -nnoremap * :Grepper -tool rg -cword -noprompt - -let g:grepper = {} -let g:grepper.tools = ['rg', 'git', 'ag', 'grep'] - -"" file browser -let g:ranger_map_keys = 0 -nnoremap d :Ranger -let g:ranger_replace_netrw = 1 - -"" gutentags -let g:gutentags_cache_dir="~/.tags" -let g:gutentags_file_list_command = { - \ 'markers': { - \ '.git': 'git ls-files', - \ '.hg': 'hg files', - \ }, - \ } - -"" Grepper -nmap gs (GrepperOperator) -xmap gs (GrepperOperator) - -"" fzf -nnoremap b :Buffers -nnoremap f :GFiles -nnoremap F :Files -nnoremap c :Commits -nnoremap bc :BCommits -nnoremap t :Tags -nnoremap bt :BTags -nnoremap l :Lines -nnoremap bl :BLines -nnoremap w :Windows -nnoremap bh :History -nnoremap ch :History: -nnoremap sh :History/ -nnoremap vc :Commands -nnoremap m :Maps -nnoremap h :Helptags - - -"" ale -nmap (ale_previous_wrap) -nmap (ale_next_wrap) -nmap gq (ale_fix) -let g:ale_linters = {} -let g:ale_linters.javascript = ['eslint'] -let g:ale_fixers = {} -let g:ale_fixers.javascript = ['eslint'] - -"" undo -nnoremap u :MundoToggle - -"" lightline -if filereadable(expand("~/.vim/lightline.vim")) - source ~/.vim/lightline.vim - augroup ale-statusline - autocmd! - autocmd User ALELint call lightline#update() - augroup END -endif - -function! LightlineReload() - call lightline#init() - call lightline#colorscheme() - call lightline#update() -endfunction - -"" Ultisnips -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" - -"" Deoplete -let g:deoplete#enable_at_startup=1 -let g:deoplete#file#enable_buffer_path=1 - -" Tex -let g:tex_flavor = "latex" -let g:livepreview_previewer = 'zathura' - -" markdown -let g:markdown_fenced_languages = [ - \ 'html', - \ 'javascript', 'js=javascript', 'json=javascript' - \ ] - -" vim-jsx -let g:jsx_ext_required = 0 - -" open-browser -let g:netrw_nogx = 1 -nmap gx (openbrowser-smart-search) -vmap gx (openbrowser-smart-search) - -" }}} - " Autocmd Rules {{{ augroup general