Commit b8d54e0b authored by Derecho's avatar Derecho
Browse files

Merge branch 'master' into work

parents c8336520 bac3c93e
......@@ -5,7 +5,7 @@ let g:ale_completion_enabled = 1
"" Load plugins
call plug#begin()
Plug 'Shougo/vimproc.vim', { 'do': 'make' }
"Plug 'Shougo/vimproc.vim', { 'do': 'make' } -> no longer needed (old dep)
Plug 'rking/ag.vim'
"Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'c++'] } -> ccls (LSP)
Plug 'nanotech/jellybeans.vim'
......@@ -85,7 +85,7 @@ set fdo-=search " stop search from opening folds
"let g:racer_cmd = "~/src/racer/target/release/racer"
"let $RUST_SRC_PATH = $HOME . "/src/rust/src"
set omnifunc=ale#completion#OmniFunc
let g:ale_completion_autoimport = 1
let g:ale_completion_autoimport=1
"" LaTeX
let LatexBox_latexmk_preview_continuously=1
......@@ -105,10 +105,10 @@ execute "set scrolloff=" . winheight(0)/4
au WinEnter,WinLeave,VimResized * execute "set scrolloff=" . winheight(0)/4
"" Syntax checking
" C++: Support for c++11
let g:syntastic_cpp_compiler_options=' -std=c++11'
" Rust: Support extern crates in local directory
let g:syntastic_rust_compiler_options=' -L . -L target/deps'
"" C++: Support for c++11
"let g:syntastic_cpp_compiler_options=' -std=c++11'
"" Rust: Support extern crates in local directory
"let g:syntastic_rust_compiler_options=' -L . -L target/deps'
" Extra style options
set diffopt=vertical,filler " split windows vertically and keep text synchronized
......@@ -146,11 +146,16 @@ command! Pa :w !curl -F 'paste=<-' http://s.drk.sc | sed 's/$/?guess/g'
" w!! - save as root
cmap w!! %!sudo tee 2> /dev/null %
"" Use shift + direction to change tabs
"" Custom keybinds
" ALE
nmap <Leader>h <Plug>(ale_hover)
nmap <Leader>r <Plug>(ale_find_references)
nmap <Leader>d <Plug>(ale_go_to_definition_in_tab)
nmap <Leader>R <Plug>(ale_rename)
" Use shift + direction to change tabs
noremap <S-l> gt
noremap <S-h> gT
"" Disable arrow keys (temporarily for educational purposes)
" Disable arrow keys (temporarily for educational purposes)
map <up> <nop>
map <down> <nop>
map <left> <nop>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment