summaryrefslogtreecommitdiffstats
path: root/dotvimrc
diff options
context:
space:
mode:
Diffstat (limited to 'dotvimrc')
-rw-r--r--dotvimrc36
1 files changed, 24 insertions, 12 deletions
diff --git a/dotvimrc b/dotvimrc
index 8859d90..08d8413 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -66,9 +66,11 @@ NeoBundleFetch 'Shougo/neobundle.vim'
" After install, turn shell ~/.vim/bundle/vimproc, (n,g)make -f your_machines_makefile
"NeoBundle 'Shougo/vimproc'
-"NeoBundle 'https://github.com/CoatiSoftware/vim-coati'
-"nnoremap <leader>as :CoatiRefresh<CR>
-"nnoremap <leader>aa :CoatiActivateToken<CR>
+NeoBundle 'hashivim/vim-terraform'
+
+NeoBundle 'CoatiSoftware/vim-sourcetrail'
+nnoremap <leader>sr :SourcetrailRefresh<CR>
+nnoremap <leader>sa :SourcetrailActivateToken<CR>
"NeoBundle 'elixir-lang/vim-elixir'
@@ -105,6 +107,7 @@ NeoBundle 'git-time-lapse'
NeoBundle 'Valloric/YouCompleteMe.git'
let g:ycm_extra_conf_globlist = ['~/dab/*', '~/*']
let g:ycm_always_populate_location_list = 1
+let g:ycm_rust_src_path = '/home/bram/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src'
noremap <Leader>y :YcmDiags<CR>
noremap <Leader>Y :YcmRestartServer<CR>
noremap <Leader>F :YcmCompleter FixIt<CR>:ccl<CR>
@@ -112,12 +115,6 @@ noremap <Leader>F :YcmCompleter FixIt<CR>:ccl<CR>
let g:rust_recommended_style = 0
NeoBundle 'rust-lang/rust.vim'
-NeoBundle 'racer-rust/vim-racer.git'
-let g:racer_cmd = "/usr/bin/racer"
-let g:racer_experimental_completer = 1
-let $RUST_SRC_PATH='/home/bram/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src'
-au FileType rust nmap <Leader>gd <Plug>(rust-def)
-au FileType rust nmap <leader>gD <Plug>(rust-doc)
au FileType rust nmap <Leader>m :make build<CR>
NeoBundle 'tpope/vim-surround.git'
@@ -135,8 +132,6 @@ NeoBundle 'godlygeek/tabular'
let g:Powerline_symbols = 'unicode'
-NeoBundle 'Tag-Signature-Balloons'
-
function! ToggleFullScreen()
call system("wmctrl -i -r ".v:windowid." -b toggle,fullscreen")
redraw
@@ -147,6 +142,24 @@ colorscheme bramwombat
if has("nvim")
set termguicolors
set noincsearch
+
+ tnoremap <Esc> <C-\><C-n>
+ let g:terminal_color_0 = '#2e3436'
+ let g:terminal_color_1 = '#cc0000'
+ let g:terminal_color_2 = '#4e9a06'
+ let g:terminal_color_3 = '#c4a000'
+ let g:terminal_color_4 = '#4475b4'
+ let g:terminal_color_5 = '#75507b'
+ let g:terminal_color_6 = '#0b939b'
+ let g:terminal_color_7 = '#d3d7cf'
+ let g:terminal_color_8 = '#555753'
+ let g:terminal_color_9 = '#ef2929'
+ let g:terminal_color_10 = '#8ae234'
+ let g:terminal_color_11 = '#fce94f'
+ let g:terminal_color_12 = '#729fcf'
+ let g:terminal_color_13 = '#ad7fa8'
+ let g:terminal_color_14 = '#00f5e9'
+ let g:terminal_color_15 = '#eeeeec'
elseif has("gui_running")
set guifont="Source Code Pro Medium 15"
nnoremap <Leader><F11> :call ToggleFullScreen()<CR>
@@ -267,7 +280,6 @@ endpython
endfun
noremap <F3> :call MPB_Prepend_Time()<CR>
-
noremap <Leader>m :make -j4<CR>
"Show trailing whitespace