misc work fixes

This commit is contained in:
Barak Michener 2019-01-29 16:02:37 -08:00
parent b1f0fba89a
commit 9a13fa283d
11 changed files with 131 additions and 37 deletions

19
.vimrc
View file

@ -100,6 +100,7 @@ Plug 'Shougo/deoplete.nvim'
Plug 'zchee/deoplete-clang'
Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}}
Plug 'zchee/deoplete-jedi'
Plug 'davidhalter/jedi-vim'
Plug 'b4winckler/vim-angry'
Plug 'tristen/vim-sparkup'
Plug 'vim-airline/vim-airline'
@ -153,6 +154,7 @@ Plug 'autozimu/LanguageClient-neovim', {
Plug 'ambv/black'
Plug 'kana/vim-textobj-user'
Plug 'bps/vim-textobj-python'
Plug 'dhruvasagar/vim-zoom'
call plug#end()
@ -225,6 +227,9 @@ let g:Tb_MaxSize=0
let g:Tb_MapCTabSwitchBufs = 1
let g:UseGooglePythonSettings = 0
" * Jedi
let g:jedi#goto_command="gd"
" * Eclim
let g:EclimCompletionMethod = 'omnifunc'
@ -242,9 +247,9 @@ let g:airline#extensions#ale#enabled = 1
let g:ale_set_highlights = 0
" * LanguageServer
let g:LanguageClient_serverCommands = {
\ 'python': ['pyls'],
\ }
"let g:LanguageClient_serverCommands = {
"\ 'python': ['pyls'],
"\ }
let g:LanguageClient_diagnosticsDisplay = {
\1: {'name': 'Error', 'texthl': 'ALEError', 'signText': 'E>', 'signTexthl': 'ALEErrorSign',},
\2: {"name": "Warning", "texthl": "ALEWarning", "signText": "W>", "signTexthl": "ALEWarningSign",},
@ -383,7 +388,7 @@ let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15'
" * Vim-Go
let g:go_fmt_command = "goimports"
let g:go_auto_type_info = 1
"let g:go_auto_type_info = 1
let g:go_updatetime = 300
"let g:go_bin_path = "$HOME/.go/bin"
@ -403,6 +408,7 @@ set statusline+=%{fugitive#statusline()}\ \
set statusline+=%c, "cursor column
set statusline+=%l/%L "cursor line/total lines
set statusline+=\ %P "percent through file
set statusline+=%{zoom#statusline()}\
" ** SMALL FUNCTIONS THAT DON'T FIT AS PLUGINS ***
@ -607,7 +613,7 @@ nmap P o<Esc>p
" Line-based movement is cute, but it's tricky for files with lines that wrap.
" Attune more to what you see on the screen instead of where the lines actually
" are.
nnoremap j gj
nnoremap <silent> j gj
nnoremap k gk
xnoremap j gj
xnoremap k gk
@ -649,6 +655,9 @@ inoremap <C-e> <C-O>$
"tnoremap <C-h> <C-\><C-n><C-w>h
"endif
" Make it easier to clear highlighting, with no functionality penalty
nnoremap <CR> :noh<CR><CR>
" Better fold mappings
nnoremap <silent> <Space> @=(foldlevel('.')?'za':'l')<CR>
vnoremap <Space> zf