aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftplugin/doxygen.vim1
-rw-r--r--vimrc-full27
2 files changed, 23 insertions, 5 deletions
diff --git a/ftplugin/doxygen.vim b/ftplugin/doxygen.vim
new file mode 100644
index 0000000..dd2cdf2
--- /dev/null
+++ b/ftplugin/doxygen.vim
@@ -0,0 +1 @@
let g:load_doxygen_syntax=1
diff --git a/vimrc-full b/vimrc-full
index d7eb363..bf04d5e 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -192,6 +192,11 @@ set nostartofline | " when scrolling: do not move the cursor to colu
192set nowrap | " but do not (by default) wrap long lines around 192set nowrap | " but do not (by default) wrap long lines around
193set nrformats+=alpha | " allows CTRL-A & CTRL-X to increment and decrement letters, not just numbers 193set nrformats+=alpha | " allows CTRL-A & CTRL-X to increment and decrement letters, not just numbers
194set incsearch | " highlight pattern while entering it (performance wise this isn't that good) 194set incsearch | " highlight pattern while entering it (performance wise this isn't that good)
195
196if has('nvim') " Neovim?
197set inccommand=nosplit | " preview substitute and such things in real time
198endif
199
195set pumheight=8 | " Determines the maximum number of items to show in the pop-up menu for 200set pumheight=8 | " Determines the maximum number of items to show in the pop-up menu for
196set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge 201set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge
197set scrolloff=0 | " keeps cursor centered 202set scrolloff=0 | " keeps cursor centered
@@ -647,8 +652,10 @@ vnoremap <s-up> k
647 652
648" close current buffer with <leader>q... 653" close current buffer with <leader>q...
649nnoremap <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>. 654nnoremap <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>.
655" google the word under the cursor
656nnoremap <leader>G :execute ":!xdg-open https://google.de/search?q=".expand("<cword>")
650 657
651nnoremap <silent> <F5> :make<CR> 658nnoremap <silent> <F5> :make!<CR>
652nnoremap <silent> <F6> :silent syntax sync fromstart<CR>:nohlsearch<CR>:silent match<CR>:silent 2match<CR>:silent 3match<CR> 659nnoremap <silent> <F6> :silent syntax sync fromstart<CR>:nohlsearch<CR>:silent match<CR>:silent 2match<CR>:silent 3match<CR>
653nnoremap <leader>r :syntax sync fromstart 660nnoremap <leader>r :syntax sync fromstart
654 661
@@ -871,10 +878,20 @@ if has("python")
871 878
872 if has('nvim') 879 if has('nvim')
873 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } 880 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
874 Plug 'tweekmonster/deoplete-clang2' 881 " Plug 'tweekmonster/deoplete-clang2'
875 " Use deoplete. 882 " Use deoplete.
876 let g:deoplete#enable_at_startup = 1 883 let g:deoplete#enable_at_startup = 1
884 inoremap <silent><expr> <C-Space> deoplete#mappings#manual_complete()
885
886 Plug 'Shougo/echodoc.vim'
887 let g:echodoc#enable_at_startup = 1
888
889 " Plug 'Rip-Rip/clang_complete'
890 Plug 'zchee/deoplete-clang'
891 Plug 'Shougo/neoinclude.vim'
892 Plug 'huawenyu/neogdb.vim'
877 else 893 else
894 Plug 'idanarye/vim-vebugger'
878 895
879 " YouCompleteMe: ===================================================================================================== 896 " YouCompleteMe: =====================================================================================================
880 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... 897 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/...
@@ -917,13 +934,13 @@ if has("python")
917 " SYNTASTIC: ========================================================================================================= 934 " SYNTASTIC: =========================================================================================================
918 if has('nvim') 935 if has('nvim')
919 Plug 'w0rp/ale' 936 Plug 'w0rp/ale'
937 let g:ale_set_highlights = 0
938 highlight! link ALEWarningSign FoldColumn
920 let g:ale_sign_error = '' 939 let g:ale_sign_error = ''
921 let g:ale_sign_style_error = '' 940 let g:ale_sign_style_error = ''
922 let g:ale_sign_info = '' 941 let g:ale_sign_info = ''
923 let ale_sign_warning = '' 942 let g:ale_sign_warning = ''
924 else 943 else
925
926
927 Plug 'scrooloose/syntastic' 944 Plug 'scrooloose/syntastic'
928 set statusline+=%#warningmsg# 945 set statusline+=%#warningmsg#
929 set statusline+=%{SyntasticStatuslineFlag()} 946 set statusline+=%{SyntasticStatuslineFlag()}
..