Optical improvements (symbols and location of filename)

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 @@
 set number
 
-syntax match defines "\<[A-Z][A-Z0-9_]*\>"
+syntax match Define "\<[A-Z][A-Z0-9_]*\>"
+syntax match Todo "\/\/ @[A-Z]*\:.*$"
+
 " syntax match cType "struct\s+[A-Za-z0-9_]+\>"
 " syn clear cStructure
+" highlight! link defines Special
 
-highlight! 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
 "    \     'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
 let g:lightline = {
     \   'tabline': {
-    \     'left': [ [ 'servername' ], ['gitbranch', 'absolutepath'] ],
-    \     'right': [ [], ['tabnumber'],  ],
+    \     'left': [ [ 'servername', 'sessionname' ] ],
+    \     'right': [ [], ['gitbranch', 'tabnumber'] ],
     \   },
     \   'colorscheme': 'Tomorrow',
     \   'separator': { 'left': "\uE0B4", 'right': "\uE0B6" },
     \   'subseparator': { 'left': "\uE0b1", 'right': "\uE0b3" },
     \   'inactive': {
-    \     'left': [ ['filename'] ],
+    \     'left': [ ['absolutepath'] ],
     \     'right': []
     \   },
     \   'active': {
-    \     'left': [ [ 'mode', 'paste'  ], ['filetype'], [ 'tagbar' ] ],
-    \     'right': [ [ 'lineinfo', 'percent' ], [ 'readonly', 'spell', 'fileencoding', 'fileformat' ] ]
+    \     'left': [ [ 'mode', 'paste' ], ['readonly', 'filetype'], [ 'absolutepath' ]],
+    \     'right': [ [ 'lineinfo', 'percent' ], [ 'spell', 'fileencoding', 'fileformat' ] , ['tagbar'] ]
     \   },
     \   'component': {
     \     'tagbar': '%{substitute(tagbar#currenttag("%s", "", "fs"), "\(.*\)", "", "")}',
     \     'ycmparent': '%{substitute(execute("YcmComplete GetParent"), "\(.*\)", "", "")}',
     \     'filename': '%t',
     \     'buffer_alt': '%{expand("#:t")}',
-    \     'servername': ' %{v:servername} %{v:this_session}',
-    \     'tabnumber': '%{tabpagenr()}/%{tabpagenr("$")}'
+    \     'servername': ' %{v:servername}',
+    \     'sessionname': '%{v:this_session}',
+    \     'gitbranch': ' %{fugitive#head()}',
+    \     'tabnumber': '🗗 %{tabpagenr()}/%{tabpagenr("$")}',
+    \     'readonly': '%{&readonly ? "" : ""}'
     \   },
     \   'component_expand': {
     \     'buffercurrent': 'lightline#buffer#buffercurrent2',
     \     'syntastic': 'SyntasticStatuslineFlag',
     \   },
-    \   'component_type': {
-    \     'buffercurrent': 'tabsel',
-    \     'tagbar': 'tabsel',
-    \   },
     \   'component_function': {
     \     'bufferinfo': 'lightline#buffer#bufferinfo',
-    \     'gitbranch': 'fugitive#head',
     \     'warnings': 'youcompleteme#GetWarningCount',
     \     'errors': 'youcompleteme#GetErrorCount',
     \   },
@@ -843,25 +841,27 @@ if has("python")
   Plug 'Valloric/YouCompleteMe'
   let g:ycm_error_symbol                             = '✖' " insert this as an error symbol in the gutter bar/sign column
   let g:ycm_warning_symbol                           = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
-  let g:ycm_auto_trigger                             = 1
+
   let g:ycm_autoclose_preview_window_after_insertion = 0
+  let g:ycm_auto_trigger                             = 1
+  let g:ycm_collect_identifiers_from_tags_files      = 1   " Let YCM read tags from Ctags file
+  let g:ycm_confirm_extra_conf                       = 0   " security is overrated ;)
+
+  let g:ycm_key_list_previous_completion             = ['Up']
+  let g:ycm_key_list_select_completion               = ['Down']
+
   " Plug 'vim-scripts/dbext.vim'                       " dependency to allow db related completions
   " let g:ycm_server_python_interpreter                = 'python3'
   " let g:ycm_python_binary_path                       = '/usr/bin/python3' " the python interpreter of choice (for code checking)
   " let g:ycm_add_preview_to_completeopt               = 1   " reuse existing preview window
-  " let g:ycm_collect_identifiers_from_tags_files      = 0   " Let YCM read tags from Ctags file
   " let g:ycm_seed_identifiers_with_syntax             = 1   " Completion for programming language's keyword
   " let g:ycm_complete_in_comments                     = 1   " Completion in comments
   " let g:ycm_complete_in_strings                      = 1   " Completion in string
   " 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!)
   " let g:ycm_min_num_identifier_candidate_chars       = 4
-
   " let g:ycm_max_num_identifier_candidates            = 10
   " let g:ycm_max_num_candidates                       = 50
-
-
   " let g:ycm_use_ultisnips_completer                  = 1   " Default 1, just ensure
-  " let g:ycm_confirm_extra_conf                       = 0   " security is overrated
   " let g:ycm_key_list_select_completion               = ['<Down>']
   " let g:ycm_key_list_previous_completion             = ['<Up>']
   " let g:ycm_global_ycm_extra_conf                    = '.ycm_extra_conf.py'
@@ -869,8 +869,6 @@ if has("python")
   " " let g:ycm_disable_for_files_larger_than_kb         = 16384 " we have faaast computers, don't we?
   " let g:ycm_show_diagnostics_ui                      = 0
   " " disable <tab>-key for YCM so that it can be used with ultisnips
-  let g:ycm_key_list_select_completion=['<Down>']
-  let g:ycm_key_list_previous_completion=['Up']
   " let g:ycm_key_list_select_completion=[]
   " let g:ycm_key_list_previous_completion=[]
 
@@ -999,6 +997,10 @@ function! ExtendColorTheme()
   " highlight! link LightlineLeft_tabline_1 ColorColumn
   " highlight! link LightlineLeft_tabline_0_1 ColorColumn
 
+
+  highlight! Todo guibg=#ffffaa guifg=#000000 gui=bold term=bold
+  highlight! cStatement guifg=red gui=bold term=bold
+
   " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
   autocmd InsertEnter * set list
   autocmd InsertLeave * set nolist