From 83406190abb9b8f59ce5a275b04a898e2f7fdec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Ob=C5=AFrka?= Date: Mon, 11 Mar 2019 12:56:00 +0100 Subject: Change plugin manager from pathogen to vundle --- .gitignore | 1 + .vim/autoload/pathogen.vim | 264 --------------------------------------------- .vim/bundle/.placeholder | 0 .vim/bundle/README | 11 -- .vimrc | 58 +++++++--- 5 files changed, 43 insertions(+), 291 deletions(-) delete mode 100644 .vim/autoload/pathogen.vim delete mode 100644 .vim/bundle/.placeholder delete mode 100644 .vim/bundle/README diff --git a/.gitignore b/.gitignore index 9a5f99d..2f0eb9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ ## Ignore linked plugins from plugin-available .vim/plugin/* +.vim/bundle/* diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim deleted file mode 100644 index 3582fbf..0000000 --- a/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,264 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.4 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#interpose() or an absolute path to invoke pathogen#surround(). -" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all -" subdirectories inside "bundle" inside all directories in the runtime path. -" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}" -" on versions of Vim without native package support. -function! pathogen#infect(...) abort - if a:0 - let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")') - else - let paths = ['bundle/{}', 'pack/{}/start/{}'] - endif - if has('packages') - call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"') - endif - let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$' - for path in filter(copy(paths), 'v:val =~# static') - call pathogen#surround(path) - endfor - for path in filter(copy(paths), 'v:val !~# static') - if path =~# '^\%([$~\\/]\|\w:[\\/]\)' - call pathogen#surround(path) - else - call pathogen#interpose(path) - endif - endfor - call pathogen#cycle_filetype() - if pathogen#is_disabled($MYVIMRC) - return 'finish' - endif - return '' -endfunction - -" Split a path into a list. -function! pathogen#split(path) abort - if type(a:path) == type([]) | return a:path | endif - if empty(a:path) | return [] | endif - let split = split(a:path,'\\\@]','\\&','') - endif -endfunction - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction - -" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/.vim/bundle/.placeholder b/.vim/bundle/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/.vim/bundle/README b/.vim/bundle/README deleted file mode 100644 index d7ada6e..0000000 --- a/.vim/bundle/README +++ /dev/null @@ -1,11 +0,0 @@ -git://github.com/airblade/vim-gitgutter.git -https://github.com/vim-scripts/SearchComplete -https://github.com/pearofducks/ansible-vim -https://github.com/Valloric/YouCompleteMe.git -https://github.com/scrooloose/nerdtree.git -https://github.com/Xuyuanp/nerdtree-git-plugin.git -https://github.com/itchyny/lightline.vim -https://github.com/yggdroot/indentline -https://github.com/w0rp/ale.git -https://github.com/scrooloose/nerdcommenter.git -https://github.com/dhruvasagar/vim-table-mode diff --git a/.vimrc b/.vimrc index 9d6cd76..c98899b 100644 --- a/.vimrc +++ b/.vimrc @@ -234,34 +234,60 @@ nnoremap :call NumberToggle() " ================== source ~/.vim/hicursorwords.vim -" ================== -" pathogen toolchain -" ================== -execute pathogen#infect() - -" ====================== -" YouCompleteMe settings -" ====================== -let g:ycm_autoclose_preview_window_after_completion = 1 +" ============================================================================ +" Plugins ==================================================================== +" ============================================================================ -" ==================== -" ansible-vim settings -" ==================== -" URL: git clone https://github.com/pearofducks/ansible-vim -let g:ansible_attribute_highlight = "ab" -let g:ansible_name_highlight = 'd' -let g:ansible_extra_keywords_highlight = 1 +highlight GitGutterAdd guifg=#009900 ctermfg=2 +highlight GitGutterChange guifg=#bbbb00 ctermfg=3 +highlight GitGutterDelete guifg=#ff2222 ctermfg=1 " ============ " ale settings " ============ +" must be before Vundle installation let g:ale_lint_on_text_changed = 'never' let g:ale_echo_msg_error_str = 'E' let g:ale_echo_msg_warning_str = 'W' let g:ale_echo_msg_format = '[%severity%] (%linter%) %s' +let g:ale_completion_enabled = 1 nmap k (ale_previous_wrap) nmap j (ale_next_wrap) +" ================= +" Plugin management +" ================= +" git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim +" vim +PluginInstall +qall +filetype off +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() +"---------------------------- +Plugin 'VundleVim/Vundle.vim' +Plugin 'w0rp/ale' +Plugin 'pearofducks/ansible-vim' +Plugin 'Yggdroot/indentLine' +Plugin 'itchyny/lightline.vim' +Plugin 'scrooloose/nerdcommenter' +Plugin 'scrooloose/nerdtree' +Plugin 'Xuyuanp/nerdtree-git-plugin' +Plugin 'airblade/vim-gitgutter' +Plugin 'dhruvasagar/vim-table-mode' +"---------------------------- +call vundle#end() +filetype plugin indent on + +" ==================== +" ansible-vim settings +" ==================== +let g:ansible_attribute_highlight = "ab" +let g:ansible_name_highlight = 'd' +let g:ansible_extra_keywords_highlight = 1 + +" ========== +" table mode +" ========== +let g:table_mode_corner = "|" " ================= " NERDTree settings -- cgit v1.2.3