pick updates from ganymede

This commit is contained in:
Barak Michener 2020-06-04 17:09:07 -07:00
parent 48360b9169
commit 6a49e78789
7 changed files with 123 additions and 48 deletions

80
.vimrc
View file

@ -117,8 +117,9 @@ Plug 'bps/vim-textobj-python'
" Plugins I NEED
Plug 'scrooloose/nerdcommenter'
Plug 'sjbach/lusty'
Plug 'w0rp/ale'
Plug 'airblade/vim-gitgutter'
"Plug 'w0rp/ale'
"Plug 'airblade/vim-gitgutter'
Plug 'mhinz/vim-signify'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
Plug 'junegunn/fzf'
@ -161,19 +162,20 @@ Plug 'derekwyatt/vim-scala', {'for': 'scala'}
Plug 'hwayne/tla.vim'
" Plugins that autocomplete
Plug 'Shougo/deoplete.nvim'
Plug 'zchee/deoplete-clang'
Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}}
Plug 'zchee/deoplete-jedi'
Plug 'davidhalter/jedi-vim'
Plug 'eagletmt/neco-ghc', {'for': 'haskell'}
Plug 'eagletmt/ghcmod-vim', {'for': 'haskell'}
Plug 'racer-rust/vim-racer', {'for': 'rust'}
Plug 'autozimu/LanguageClient-neovim', {
\ 'branch': 'next',
\ 'do': 'bash install.sh',
\ }
"Plug 'Shougo/deoplete.nvim'
"Plug 'zchee/deoplete-clang'
"Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}}
"Plug 'zchee/deoplete-jedi'
"Plug 'davidhalter/jedi-vim'
"Plug 'eagletmt/neco-ghc', {'for': 'haskell'}
"Plug 'eagletmt/ghcmod-vim', {'for': 'haskell'}
"Plug 'racer-rust/vim-racer', {'for': 'rust'}
"Plug 'autozimu/LanguageClient-neovim', {
"\ 'branch': 'next',
"\ 'do': 'bash install.sh',
"\ }
"Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
Plug 'neoclide/coc.nvim', {'tag': '*', 'do': './install.sh'}
" Plugins that do specific things
Plug 'Shougo/vimproc.vim'
@ -191,6 +193,21 @@ Plug 'ncm2/float-preview.nvim'
call plug#end()
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window
nnoremap <silent> K :call <SID>show_documentation()<CR>
function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>')
else
call CocAction('doHover')
endif
endfunction
"NeoBundle 'eclim'
"https://git.wincent.com/command-t.git
@ -247,17 +264,17 @@ setlocal cursorline
" ** PLUGIN CONFIGURATION **
"
" Change the source rank
call deoplete#custom#option('sources', {
\ 'python': ['LanguageClient', 'jedi'],
\})
call deoplete#custom#source('buffer', 'rank', 1)
let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so'
let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang'
let g:deoplete#enable_at_startup = 1
let g:deoplete#sources = {}
let g:deoplete#sources.scala = ['buffer', 'tags', 'omni']
let g:deoplete#omni#input_patterns = {}
let g:deoplete#omni#input_patterns.scala = ['[^. *\t0-9]\.\w*',': [A-Z]\w', '[\[\t\( ][A-Za-z]\w*']
"call deoplete#custom#option('sources', {
"\ 'python': ['LanguageClient', 'jedi'],
"\})
"call deoplete#custom#source('buffer', 'rank', 1)
"let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so'
"let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang'
"let g:deoplete#enable_at_startup = 1
"let g:deoplete#sources = {}
"let g:deoplete#sources.scala = ['buffer', 'tags', 'omni']
"let g:deoplete#omni#input_patterns = {}
"let g:deoplete#omni#input_patterns.scala = ['[^. *\t0-9]\.\w*',': [A-Z]\w', '[\[\t\( ][A-Za-z]\w*']
" * Vim general/Unknown
let python_highlight_all = 1
let g:Tb_MaxSize=0
@ -327,6 +344,13 @@ let g:NERDTreeDirArrows=0
let g:NERDTreeMarkBookmarks = 0
let g:NERDTreeMinimalUI = 1
" * Signify
let g:signify_realtime = 0
let g:signify_vcs_list = ['git']
let g:signify_sign_change = '~'
let g:signify_sign_changedelete = g:signify_sign_change
let g:signify_sign_show_count = 0
" * VimFiler
let g:vimfiler_tree_indentation = 2
@ -436,11 +460,11 @@ let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15'
let g:go_fmt_command = "goimports"
"let g:go_auto_type_info = 1
let g:go_updatetime = 300
"let g:go_bin_path = "$HOME/.go/bin"
let g:go_bin_path = $HOME . "/.go/bin"
"let g:go_def_mode = 'gopls'
"let g:go_info_mode = 'gopls'
" ** STATUSLINE **
"
set laststatus=2
set statusline=%t "tail of the filename
"set statusline+=[%{&ff}] "file format