aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftplugin/c.vim6
-rw-r--r--vimrc-full29
2 files changed, 26 insertions, 9 deletions
diff --git a/ftplugin/c.vim b/ftplugin/c.vim
index d4c9199..8b0f39a 100644
--- a/ftplugin/c.vim
+++ b/ftplugin/c.vim
@@ -1 +1,7 @@
1set number 1set number
2
3syntax match defines "\<[A-Z][A-Z0-9_]*\>"
4" syntax match cType "struct\s+[A-Za-z0-9_]+\>"
5" syn clear cStructure
6
7highlight! link defines Special
diff --git a/vimrc-full b/vimrc-full
index 7a0620e..2cd591c 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -662,6 +662,14 @@ endif
662call plug#begin() 662call plug#begin()
663" Colorschemes: 663" Colorschemes:
664Plug 'coderonline/vim-remote-menu' 664Plug 'coderonline/vim-remote-menu'
665" Plug 'bbchung/clighter8'
666" Plug 'octol/vim-cpp-enhanced-highlight'
667" Plug 'vim-scripts/TagHighlight'
668" if ! exists('g:TagHighlightSettings')
669" let g:TagHighlightSettings = {}
670" endif
671" let g:TagHighlightSettings['TagFileName'] = 'tags'
672" let g:TagHighlightSettings['CtagsExecutable'] = 'ctags'
665 673
666Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*) 674Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*)
667Plug 'NLKNguyen/papercolor-theme' | " the one I like the most 675Plug 'NLKNguyen/papercolor-theme' | " the one I like the most
@@ -765,7 +773,7 @@ let g:lightline = {
765 \ 'left': [ [ 'servername' ], ['gitbranch', 'absolutepath'] ], 773 \ 'left': [ [ 'servername' ], ['gitbranch', 'absolutepath'] ],
766 \ 'right': [ [], ['tabnumber'], ], 774 \ 'right': [ [], ['tabnumber'], ],
767 \ }, 775 \ },
768 \ 'colorscheme': 'Tomorrow_Night', 776 \ 'colorscheme': 'Tomorrow',
769 \ 'separator': { 'left': "\uE0B4", 'right': "\uE0B6" }, 777 \ 'separator': { 'left': "\uE0B4", 'right': "\uE0B6" },
770 \ 'subseparator': { 'left': "\uE0b1", 'right': "\uE0b3" }, 778 \ 'subseparator': { 'left': "\uE0b1", 'right': "\uE0b3" },
771 \ 'inactive': { 779 \ 'inactive': {
@@ -801,13 +809,13 @@ let g:lightline = {
801 \ } 809 \ }
802 810
803set noshowmode | " mode will be shown twice, in lightline and below, so we want to deactivate one 811set noshowmode | " mode will be shown twice, in lightline and below, so we want to deactivate one
804set statusline= 812" set statusline=
805set statusline+=%t%m 813" set statusline+=%t%m
806set statusline+=%{TagInStatusLine()} 814" set statusline+=%{TagInStatusLine()}
807set statusline+=%#warningmsg# 815" set statusline+=%#warningmsg#
808set statusline+=%{SyntasticStatuslineFlag()} 816" set statusline+=%{SyntasticStatuslineFlag()}
809set statusline+=%*%= 817" set statusline+=%*%=
810set statusline+=%l:%c(%p%%) 818" set statusline+=%l:%c(%p%%)
811 819
812" Autocompleter: ===================================== 820" Autocompleter: =====================================
813if has("python") 821if has("python")
@@ -836,7 +844,7 @@ if has("python")
836 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column 844 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column
837 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn 845 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
838 let g:ycm_auto_trigger = 1 846 let g:ycm_auto_trigger = 1
839 let g:ycm_autoclose_preview_window_after_insertion = 1 847 let g:ycm_autoclose_preview_window_after_insertion = 0
840 " Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions 848 " Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions
841 " let g:ycm_server_python_interpreter = 'python3' 849 " let g:ycm_server_python_interpreter = 'python3'
842 " let g:ycm_python_binary_path = '/usr/bin/python3' " the python interpreter of choice (for code checking) 850 " let g:ycm_python_binary_path = '/usr/bin/python3' " the python interpreter of choice (for code checking)
@@ -987,6 +995,9 @@ function! ExtendColorTheme()
987 " make tab stop (see listchars) less disturbing... 995 " make tab stop (see listchars) less disturbing...
988 highlight! link SpecialKey NonText 996 highlight! link SpecialKey NonText
989 997
998 " highlight! link LightlineMiddle_tabline ColorColumn
999 " highlight! link LightlineLeft_tabline_1 ColorColumn
1000 " highlight! link LightlineLeft_tabline_0_1 ColorColumn
990 1001
991 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective) 1002 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
992 autocmd InsertEnter * set list 1003 autocmd InsertEnter * set list
..