From 06be879cf00fe05112e0c17cad10705f9e206336 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 3 Dec 2019 08:34:25 +0100 Subject: [PATCH] updated gitignore and vimrc --- .gitignore | 2 +- .vimrc | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9d333c0..726991f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/pack/minpac/* +pack/minpac/* diff --git a/.vimrc b/.vimrc index f12a67c..39dee6c 100644 --- a/.vimrc +++ b/.vimrc @@ -5,8 +5,12 @@ command! PackUpdate call minpac#update() command! PackClean call minpac#clean() set number -"set statusline=%<%f\ %h%m%r%=%-20.(line=%l,col=%c%V,totlin=%L%)\%h%m%r%=%-40(,bytval=0x%B,%n%Y%)\%P -"set laststatus=2 +set expandtab +set shiftwidth=2 +set softtabstop=2 + +filetype plugin indent on + packadd minpac call minpac#init() call minpac#add('k-takata/minpac', {'type':'opt'}) @@ -14,6 +18,77 @@ call minpac#add('junegunn/fzf') call minpac#add('junegunn/fzf.vim') call minpac#add('vim-airline/vim-airline') call minpac#add('vim-airline/vim-airline-themes') +call minpac#add('tpope/vim-fugitive') +call minpac#add('prabirshrestha/async.vim') +call minpac#add('prabirshrestha/asyncomplete.vim') +"asyncomplete settings +inoremap pumvisible() ? "\" : "\" +inoremap pumvisible() ? "\" : "\" +inoremap pumvisible() ? "\" : "\" +imap (asyncomplete_force_refresh) + +call minpac#add('prabirshrestha/asyncomplete-lsp.vim') +call minpac#add('prabirshrestha/vim-lsp') +"vim-lsp language server settings +if executable('rls') + au User lsp_setup call lsp#register_server({ + \ 'name': 'rls', + \ 'cmd': {server_info->['rustup', 'run', 'stable', 'rls']}, + \ 'workspace_config': {'rust': {'clippy_preference': 'on'}}, + \ 'whitelist': ['rust'], + \ }) +endif +call minpac#add('vim-syntastic/syntastic') +"syntastic settings +let g:airline#extensions#syntastic#enabled = 1 +let airline#extensions#syntastic#error_symbol = 'E:' +let airline#extensions#syntastic#stl_format_err = '%E{[%e(#%fe)]}' +let airline#extensions#syntastic#warning_symbol = 'W:' +let airline#extensions#syntastic#stl_format_warn = '%W{[%w(#%fw)]}' + +call minpac#add('majutsushi/tagbar') +"tagbar settings +let g:rust_use_custom_ctags_defs = 1 " if using rust.vim +let g:tagbar_type_rust = { + \ 'ctagsbin' : '/path/to/your/universal/ctags', + \ 'ctagstype' : 'rust', + \ 'kinds' : [ + \ 'n:modules', + \ 's:structures:1', + \ 'i:interfaces', + \ 'c:implementations', + \ 'f:functions:1', + \ 'g:enumerations:1', + \ 't:type aliases:1:0', + \ 'v:constants:1:0', + \ 'M:macros:1', + \ 'm:fields:1:0', + \ 'e:enum variants:1:0', + \ 'P:methods:1', + \ ], + \ 'sro': '::', + \ 'kind2scope' : { + \ 'n': 'module', + \ 's': 'struct', + \ 'i': 'interface', + \ 'c': 'implementation', + \ 'f': 'function', + \ 'g': 'enum', + \ 't': 'typedef', + \ 'v': 'variable', + \ 'M': 'macro', + \ 'm': 'field', + \ 'e': 'enumerator', + \ 'P': 'method', + \ }, + \ } +let g:airline#extensions#tagbar#enabled = 1 +let g:airline#extensions#tagbar#flags = '' +let g:airline#extensions#tagbar#flags = 'f' +let g:airline#extensions#tagbar#flags = 's' +let g:airline#extensions#tagbar#flags = 'p' +call minpac#add('rust-lang/rust.vim') + call minpac#add('morhetz/gruvbox') "gruvbox settings let g:gruvbox_italic = 1