aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-11-10 01:23:11 +0100
committerMax Christian Pohle2017-11-10 01:23:11 +0100
commit3b3e7cb638668da10cdec8b2efc7e113f1ee9080 (patch)
treebc4dd245c31e60acd92e17fd16cf04968c9ae96a
parent51b038e5160d7a6774171c25e32a3cb31d48b798 (diff)
downloadvim-karlmarks-3b3e7cb638668da10cdec8b2efc7e113f1ee9080.tar.bz2
vim-karlmarks-3b3e7cb638668da10cdec8b2efc7e113f1ee9080.zip
Optical improvements (symbols and location of filename)
-rw-r--r--ftplugin/c.vim6
-rw-r--r--vimrc-full42
2 files changed, 26 insertions, 22 deletions
diff --git a/ftplugin/c.vim b/ftplugin/c.vim
index 8b0f39a..12ba001 100644
--- a/ftplugin/c.vim
+++ b/ftplugin/c.vim
@@ -1,7 +1,9 @@
1set number 1set number
2 2
3syntax match defines "\<[A-Z][A-Z0-9_]*\>" 3syntax match Define "\<[A-Z][A-Z0-9_]*\>"
4syntax match Todo "\/\/ @[A-Z]*\:.*$"
5
4" syntax match cType "struct\s+[A-Za-z0-9_]+\>" 6" syntax match cType "struct\s+[A-Za-z0-9_]+\>"
5" syn clear cStructure 7" syn clear cStructure
8" highlight! link defines Special
6 9
7highlight! link defines Special
diff --git a/vimrc-full b/vimrc-full
index 2cd591c..61827e3 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -770,39 +770,37 @@ let g:lightline_buffer_reservelen = 20
770" \ 'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ], 770" \ 'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
771let g:lightline = { 771let g:lightline = {
772 \ 'tabline': { 772 \ 'tabline': {
773 \ 'left': [ [ 'servername' ], ['gitbranch', 'absolutepath'] ], 773 \ 'left': [ [ 'servername', 'sessionname' ] ],
774 \ 'right': [ [], ['tabnumber'], ], 774 \ 'right': [ [], ['gitbranch', 'tabnumber'] ],
775 \ }, 775 \ },
776 \ 'colorscheme': 'Tomorrow', 776 \ 'colorscheme': 'Tomorrow',
777 \ 'separator': { 'left': "\uE0B4", 'right': "\uE0B6" }, 777 \ 'separator': { 'left': "\uE0B4", 'right': "\uE0B6" },
778 \ 'subseparator': { 'left': "\uE0b1", 'right': "\uE0b3" }, 778 \ 'subseparator': { 'left': "\uE0b1", 'right': "\uE0b3" },
779 \ 'inactive': { 779 \ 'inactive': {
780 \ 'left': [ ['filename'] ], 780 \ 'left': [ ['absolutepath'] ],
781 \ 'right': [] 781 \ 'right': []
782 \ }, 782 \ },
783 \ 'active': { 783 \ 'active': {
784 \ 'left': [ [ 'mode', 'paste' ], ['filetype'], [ 'tagbar' ] ], 784 \ 'left': [ [ 'mode', 'paste' ], ['readonly', 'filetype'], [ 'absolutepath' ]],
785 \ 'right': [ [ 'lineinfo', 'percent' ], [ 'readonly', 'spell', 'fileencoding', 'fileformat' ] ] 785 \ 'right': [ [ 'lineinfo', 'percent' ], [ 'spell', 'fileencoding', 'fileformat' ] , ['tagbar'] ]
786 \ }, 786 \ },
787 \ 'component': { 787 \ 'component': {
788 \ 'tagbar': '%{substitute(tagbar#currenttag("%s", "", "fs"), "\(.*\)", "", "")}', 788 \ 'tagbar': '%{substitute(tagbar#currenttag("%s", "", "fs"), "\(.*\)", "", "")}',
789 \ 'ycmparent': '%{substitute(execute("YcmComplete GetParent"), "\(.*\)", "", "")}', 789 \ 'ycmparent': '%{substitute(execute("YcmComplete GetParent"), "\(.*\)", "", "")}',
790 \ 'filename': '%t', 790 \ 'filename': '%t',
791 \ 'buffer_alt': '%{expand("#:t")}', 791 \ 'buffer_alt': '%{expand("#:t")}',
792 \ 'servername': ' %{v:servername} %{v:this_session}', 792 \ 'servername': ' %{v:servername}',
793 \ 'tabnumber': '%{tabpagenr()}/%{tabpagenr("$")}' 793 \ 'sessionname': '%{v:this_session}',
794 \ 'gitbranch': ' %{fugitive#head()}',
795 \ 'tabnumber': '🗗 %{tabpagenr()}/%{tabpagenr("$")}',
796 \ 'readonly': '%{&readonly ? "" : ""}'
794 \ }, 797 \ },
795 \ 'component_expand': { 798 \ 'component_expand': {
796 \ 'buffercurrent': 'lightline#buffer#buffercurrent2', 799 \ 'buffercurrent': 'lightline#buffer#buffercurrent2',
797 \ 'syntastic': 'SyntasticStatuslineFlag', 800 \ 'syntastic': 'SyntasticStatuslineFlag',
798 \ }, 801 \ },
799 \ 'component_type': {
800 \ 'buffercurrent': 'tabsel',
801 \ 'tagbar': 'tabsel',
802 \ },
803 \ 'component_function': { 802 \ 'component_function': {
804 \ 'bufferinfo': 'lightline#buffer#bufferinfo', 803 \ 'bufferinfo': 'lightline#buffer#bufferinfo',
805 \ 'gitbranch': 'fugitive#head',
806 \ 'warnings': 'youcompleteme#GetWarningCount', 804 \ 'warnings': 'youcompleteme#GetWarningCount',
807 \ 'errors': 'youcompleteme#GetErrorCount', 805 \ 'errors': 'youcompleteme#GetErrorCount',
808 \ }, 806 \ },
@@ -843,25 +841,27 @@ if has("python")
843 Plug 'Valloric/YouCompleteMe' 841 Plug 'Valloric/YouCompleteMe'
844 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column 842 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column
845 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn 843 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
846 let g:ycm_auto_trigger = 1 844
847 let g:ycm_autoclose_preview_window_after_insertion = 0 845 let g:ycm_autoclose_preview_window_after_insertion = 0
846 let g:ycm_auto_trigger = 1
847 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
848 let g:ycm_confirm_extra_conf = 0 " security is overrated ;)
849
850 let g:ycm_key_list_previous_completion = ['Up']
851 let g:ycm_key_list_select_completion = ['Down']
852
848 " Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions 853 " Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions
849 " let g:ycm_server_python_interpreter = 'python3' 854 " let g:ycm_server_python_interpreter = 'python3'
850 " let g:ycm_python_binary_path = '/usr/bin/python3' " the python interpreter of choice (for code checking) 855 " let g:ycm_python_binary_path = '/usr/bin/python3' " the python interpreter of choice (for code checking)
851 " let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window 856 " let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window
852 " let g:ycm_collect_identifiers_from_tags_files = 0 " Let YCM read tags from Ctags file
853 " let g:ycm_seed_identifiers_with_syntax = 1 " Completion for programming language's keyword 857 " let g:ycm_seed_identifiers_with_syntax = 1 " Completion for programming language's keyword
854 " let g:ycm_complete_in_comments = 1 " Completion in comments 858 " let g:ycm_complete_in_comments = 1 " Completion in comments
855 " let g:ycm_complete_in_strings = 1 " Completion in string 859 " let g:ycm_complete_in_strings = 1 " Completion in string
856 " let g:ycm_min_num_of_chars_for_completion = 6 " we normally avoid identifier based completion, it just helps with long words. Use semantic completions with <C-Space> instead (terrible idea, html snippets not working!) 860 " let g:ycm_min_num_of_chars_for_completion = 6 " we normally avoid identifier based completion, it just helps with long words. Use semantic completions with <C-Space> instead (terrible idea, html snippets not working!)
857 " let g:ycm_min_num_identifier_candidate_chars = 4 861 " let g:ycm_min_num_identifier_candidate_chars = 4
858
859 " let g:ycm_max_num_identifier_candidates = 10 862 " let g:ycm_max_num_identifier_candidates = 10
860 " let g:ycm_max_num_candidates = 50 863 " let g:ycm_max_num_candidates = 50
861
862
863 " let g:ycm_use_ultisnips_completer = 1 " Default 1, just ensure 864 " let g:ycm_use_ultisnips_completer = 1 " Default 1, just ensure
864 " let g:ycm_confirm_extra_conf = 0 " security is overrated
865 " let g:ycm_key_list_select_completion = ['<Down>'] 865 " let g:ycm_key_list_select_completion = ['<Down>']
866 " let g:ycm_key_list_previous_completion = ['<Up>'] 866 " let g:ycm_key_list_previous_completion = ['<Up>']
867 " let g:ycm_global_ycm_extra_conf = '.ycm_extra_conf.py' 867 " let g:ycm_global_ycm_extra_conf = '.ycm_extra_conf.py'
@@ -869,8 +869,6 @@ if has("python")
869 " " let g:ycm_disable_for_files_larger_than_kb = 16384 " we have faaast computers, don't we? 869 " " let g:ycm_disable_for_files_larger_than_kb = 16384 " we have faaast computers, don't we?
870 " let g:ycm_show_diagnostics_ui = 0 870 " let g:ycm_show_diagnostics_ui = 0
871 " " disable <tab>-key for YCM so that it can be used with ultisnips 871 " " disable <tab>-key for YCM so that it can be used with ultisnips
872 let g:ycm_key_list_select_completion=['<Down>']
873 let g:ycm_key_list_previous_completion=['Up']
874 " let g:ycm_key_list_select_completion=[] 872 " let g:ycm_key_list_select_completion=[]
875 " let g:ycm_key_list_previous_completion=[] 873 " let g:ycm_key_list_previous_completion=[]
876 874
@@ -999,6 +997,10 @@ function! ExtendColorTheme()
999 " highlight! link LightlineLeft_tabline_1 ColorColumn 997 " highlight! link LightlineLeft_tabline_1 ColorColumn
1000 " highlight! link LightlineLeft_tabline_0_1 ColorColumn 998 " highlight! link LightlineLeft_tabline_0_1 ColorColumn
1001 999
1000
1001 highlight! Todo guibg=#ffffaa guifg=#000000 gui=bold term=bold
1002 highlight! cStatement guifg=red gui=bold term=bold
1003
1002 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective) 1004 " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
1003 autocmd InsertEnter * set list 1005 autocmd InsertEnter * set list
1004 autocmd InsertLeave * set nolist 1006 autocmd InsertLeave * set nolist
..