indenting at braces, display current function in statusline

1 files changed, 33 insertions, 19 deletions

diff --git a/vimrc-full b/vimrc-full
index a93d841..d859001 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -138,6 +138,8 @@ if has("gui_running")
 
   " its possible to define alternative fonts (order matters)
   set guifont=
+  set guifont+=RobotoMono\ Nerd\ Font\ Medium\ 10
+  set guifont+=LiterationMono\ Nerd\ Font\ Mono\ 10
   set guifont+=Source\ Code\ Pro\ Semi-Bold\ 10
   set guifont+=Source\ Code\ Pro\ for\ Powerline\ SemiBold\ 10
   set guifont+=Droid\ Sans\ Mono\ for\ Powerline\ 10
@@ -213,7 +215,11 @@ set sessionoptions+=resize
 set sessionoptions+=unix
 set sessionoptions+=slash
 
-set nocindent smartindent     | " use smart indent rather then cindent
+" set nocindent smartindent     | " use smart indent rather then cindent
+set noautoindent
+set nosmartindent
+set cindent cinoptions+=(0    | " indent at parentheses
+
 set noshiftround              | " indent/unindent sna=ps to multiple of shiftwidths
 set equalalways               | " do not evenly size windows when opening new or closing old
 set nocursorline              | " turn visual cursor line off (improves performance)
@@ -253,7 +259,7 @@ if has("autocmd")
   augroup set_window_title " {
     " autocmd BufWinEnter quickfix setl statusline=%t
     " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]"
-    autocmd CursorHold * let &titlestring = "%y %t | ".$USER."@".hostname().":%{expand(\"%:~:.:h\")}"
+    autocmd CursorHold * let &titlestring = "%t %y ".$USER."@".hostname().":%{expand(\"%:~:.:h\")}"
     set title
     " autocmd CursorHold * let &titlestring = "Vim (".airline#extensions#tagbar#currenttag().")"
 
@@ -589,26 +595,32 @@ let g:lightline_buffer_minflen                  = 16
 let g:lightline_buffer_minfextlen               = 3
 let g:lightline_buffer_reservelen               = 20
 
+"     \                ['warnings', 'errors', 'syntastic']
 let g:lightline = {
     \   'colorscheme': 'Tomorrow_Night_Bright',
     \   'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
     \   'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" },
+    \   'inactive': {
+    \     'left': [['readonly', 'gitbranch', 'absolutepath']]},
     \   'active': {
     \     'left': [ [ 'mode', 'paste', 'readonly' ],
     \               [ 'gitbranch', 'absolutepath' ],
     \               [ 'tagbar' ] ],
-    \     'right': [ [ 'lineinfo', 'percent' ],
-    \                [ 'spell', 'fileencoding', 'fileformat', 'filetype' ] ],
+    \     'right': [ [ 'percent', 'lineinfo' ],
+    \                [ 'spell', 'fileencoding', 'fileformat', 'filetype' ]
+    \              ],
     \   },
     \   'tabline': {
     \     'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
-    \     'right': [ [ 'close' ] ],
+    \     'right': [ [], [ 'close' ] ],
     \   },
     \   'component': {
-    \           'tagbar': '%{tagbar#currenttag("%s", "", "fs")}',
+    \           'tagbar': '%{substitute(tagbar#currenttag("%s", "", "fs"), "\(.*\)", "", "")}',
+    \           'ycmparent': '%{substitute(execute("YcmComplete GetParent"), "\(.*\)", "", "")}'
     \   },
     \   'component_expand': {
     \     'buffercurrent': 'lightline#buffer#buffercurrent2',
+          \     'syntastic': 'SyntasticStatuslineFlag',
     \   },
     \   'component_type': {
     \     'buffercurrent': 'tabsel',
@@ -617,8 +629,10 @@ let g:lightline = {
     \     'bufferbefore': 'lightline#buffer#bufferbefore',
     \     'bufferafter': 'lightline#buffer#bufferafter',
     \     'bufferinfo': 'lightline#buffer#bufferinfo',
-    \     'getcwd': 'getcwd',
-    \     'gitbranch': 'fugitive#head'
+    \     'gitbranch': 'fugitive#head',
+    \     'foo': 'YcmComplete.GetType',
+    \     'warnings': 'youcompleteme#GetWarningCount',
+    \     'errors': 'youcompleteme#GetErrorCount'
     \   },
     \ }
 
@@ -785,20 +799,20 @@ endfunction
 autocmd! ColorScheme * call ExtendColorTheme()
 
 
-colorscheme PaperColor
+" colorscheme PaperColor
 set background=light
 " set background=dark | " critical: should be set by the colorscheme, but often is not or gets used by it
 " 
-" if filereadable(expand("~/.config/base16-shell/colortest"))
-"   let g:base16_shell_path="~/.config/base16-shell/scripts"
-" endif
-" 
-" let base16colorspace=256
-" if filereadable(expand("~/.vimrc_background"))
-"   source ~/.vimrc_background
-" else
-"   colorscheme base16-phd
-" endif
+if filereadable(expand("~/.config/base16-shell/colortest"))
+  let g:base16_shell_path="~/.config/base16-shell/scripts"
+endif
+
+let base16colorspace=256
+if filereadable(expand("~/.vimrc_background"))
+  source ~/.vimrc_background
+else
+  colorscheme base16-phd
+endif
 
 
 " ======================================================================================================================