diff options
author | Max Christian Pohle | 2017-09-29 14:55:38 +0200 |
---|---|---|
committer | Max Christian Pohle | 2017-09-29 14:55:38 +0200 |
commit | 190feb06ff6474792626cc795488ddcebd76b1c6 (patch) | |
tree | 36aba752c6e63068102213f20a6b142b547e5766 | |
parent | 82ba52166c5c80340c3b4ce09a8381adf2a1049b (diff) | |
download | vim-karlmarks-190feb06ff6474792626cc795488ddcebd76b1c6.tar.bz2 vim-karlmarks-190feb06ff6474792626cc795488ddcebd76b1c6.zip |
indenting at braces, display current function in statusline
-rw-r--r-- | vimrc-full | 52 |
1 files changed, 33 insertions, 19 deletions
@@ -138,6 +138,8 @@ if has("gui_running") | |||
138 | 138 | ||
139 | " its possible to define alternative fonts (order matters) | 139 | " its possible to define alternative fonts (order matters) |
140 | set guifont= | 140 | set guifont= |
141 | set guifont+=RobotoMono\ Nerd\ Font\ Medium\ 10 | ||
142 | set guifont+=LiterationMono\ Nerd\ Font\ Mono\ 10 | ||
141 | set guifont+=Source\ Code\ Pro\ Semi-Bold\ 10 | 143 | set guifont+=Source\ Code\ Pro\ Semi-Bold\ 10 |
142 | set guifont+=Source\ Code\ Pro\ for\ Powerline\ SemiBold\ 10 | 144 | set guifont+=Source\ Code\ Pro\ for\ Powerline\ SemiBold\ 10 |
143 | set guifont+=Droid\ Sans\ Mono\ for\ Powerline\ 10 | 145 | set guifont+=Droid\ Sans\ Mono\ for\ Powerline\ 10 |
@@ -213,7 +215,11 @@ set sessionoptions+=resize | |||
213 | set sessionoptions+=unix | 215 | set sessionoptions+=unix |
214 | set sessionoptions+=slash | 216 | set sessionoptions+=slash |
215 | 217 | ||
216 | set nocindent smartindent | " use smart indent rather then cindent | 218 | " set nocindent smartindent | " use smart indent rather then cindent |
219 | set noautoindent | ||
220 | set nosmartindent | ||
221 | set cindent cinoptions+=(0 | " indent at parentheses | ||
222 | |||
217 | set noshiftround | " indent/unindent sna=ps to multiple of shiftwidths | 223 | set noshiftround | " indent/unindent sna=ps to multiple of shiftwidths |
218 | set equalalways | " do not evenly size windows when opening new or closing old | 224 | set equalalways | " do not evenly size windows when opening new or closing old |
219 | set nocursorline | " turn visual cursor line off (improves performance) | 225 | set nocursorline | " turn visual cursor line off (improves performance) |
@@ -253,7 +259,7 @@ if has("autocmd") | |||
253 | augroup set_window_title " { | 259 | augroup set_window_title " { |
254 | " autocmd BufWinEnter quickfix setl statusline=%t | 260 | " autocmd BufWinEnter quickfix setl statusline=%t |
255 | " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" | 261 | " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" |
256 | autocmd CursorHold * let &titlestring = "%y %t | ".$USER."@".hostname().":%{expand(\"%:~:.:h\")}" | 262 | autocmd CursorHold * let &titlestring = "%t %y ".$USER."@".hostname().":%{expand(\"%:~:.:h\")}" |
257 | set title | 263 | set title |
258 | " autocmd CursorHold * let &titlestring = "Vim (".airline#extensions#tagbar#currenttag().")" | 264 | " autocmd CursorHold * let &titlestring = "Vim (".airline#extensions#tagbar#currenttag().")" |
259 | 265 | ||
@@ -589,26 +595,32 @@ let g:lightline_buffer_minflen = 16 | |||
589 | let g:lightline_buffer_minfextlen = 3 | 595 | let g:lightline_buffer_minfextlen = 3 |
590 | let g:lightline_buffer_reservelen = 20 | 596 | let g:lightline_buffer_reservelen = 20 |
591 | 597 | ||
598 | " \ ['warnings', 'errors', 'syntastic'] | ||
592 | let g:lightline = { | 599 | let g:lightline = { |
593 | \ 'colorscheme': 'Tomorrow_Night_Bright', | 600 | \ 'colorscheme': 'Tomorrow_Night_Bright', |
594 | \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, | 601 | \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, |
595 | \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, | 602 | \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, |
603 | \ 'inactive': { | ||
604 | \ 'left': [['readonly', 'gitbranch', 'absolutepath']]}, | ||
596 | \ 'active': { | 605 | \ 'active': { |
597 | \ 'left': [ [ 'mode', 'paste', 'readonly' ], | 606 | \ 'left': [ [ 'mode', 'paste', 'readonly' ], |
598 | \ [ 'gitbranch', 'absolutepath' ], | 607 | \ [ 'gitbranch', 'absolutepath' ], |
599 | \ [ 'tagbar' ] ], | 608 | \ [ 'tagbar' ] ], |
600 | \ 'right': [ [ 'lineinfo', 'percent' ], | 609 | \ 'right': [ [ 'percent', 'lineinfo' ], |
601 | \ [ 'spell', 'fileencoding', 'fileformat', 'filetype' ] ], | 610 | \ [ 'spell', 'fileencoding', 'fileformat', 'filetype' ] |
611 | \ ], | ||
602 | \ }, | 612 | \ }, |
603 | \ 'tabline': { | 613 | \ 'tabline': { |
604 | \ 'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ], | 614 | \ 'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ], |
605 | \ 'right': [ [ 'close' ] ], | 615 | \ 'right': [ [], [ 'close' ] ], |
606 | \ }, | 616 | \ }, |
607 | \ 'component': { | 617 | \ 'component': { |
608 | \ 'tagbar': '%{tagbar#currenttag("%s", "", "fs")}', | 618 | \ 'tagbar': '%{substitute(tagbar#currenttag("%s", "", "fs"), "\(.*\)", "", "")}', |
619 | \ 'ycmparent': '%{substitute(execute("YcmComplete GetParent"), "\(.*\)", "", "")}' | ||
609 | \ }, | 620 | \ }, |
610 | \ 'component_expand': { | 621 | \ 'component_expand': { |
611 | \ 'buffercurrent': 'lightline#buffer#buffercurrent2', | 622 | \ 'buffercurrent': 'lightline#buffer#buffercurrent2', |
623 | \ 'syntastic': 'SyntasticStatuslineFlag', | ||
612 | \ }, | 624 | \ }, |
613 | \ 'component_type': { | 625 | \ 'component_type': { |
614 | \ 'buffercurrent': 'tabsel', | 626 | \ 'buffercurrent': 'tabsel', |
@@ -617,8 +629,10 @@ let g:lightline = { | |||
617 | \ 'bufferbefore': 'lightline#buffer#bufferbefore', | 629 | \ 'bufferbefore': 'lightline#buffer#bufferbefore', |
618 | \ 'bufferafter': 'lightline#buffer#bufferafter', | 630 | \ 'bufferafter': 'lightline#buffer#bufferafter', |
619 | \ 'bufferinfo': 'lightline#buffer#bufferinfo', | 631 | \ 'bufferinfo': 'lightline#buffer#bufferinfo', |
620 | \ 'getcwd': 'getcwd', | 632 | \ 'gitbranch': 'fugitive#head', |
621 | \ 'gitbranch': 'fugitive#head' | 633 | \ 'foo': 'YcmComplete.GetType', |
634 | \ 'warnings': 'youcompleteme#GetWarningCount', | ||
635 | \ 'errors': 'youcompleteme#GetErrorCount' | ||
622 | \ }, | 636 | \ }, |
623 | \ } | 637 | \ } |
624 | 638 | ||
@@ -785,20 +799,20 @@ endfunction | |||
785 | autocmd! ColorScheme * call ExtendColorTheme() | 799 | autocmd! ColorScheme * call ExtendColorTheme() |
786 | 800 | ||
787 | 801 | ||
788 | colorscheme PaperColor | 802 | " colorscheme PaperColor |
789 | set background=light | 803 | set background=light |
790 | " set background=dark | " critical: should be set by the colorscheme, but often is not or gets used by it | 804 | " set background=dark | " critical: should be set by the colorscheme, but often is not or gets used by it |
791 | " | 805 | " |
792 | " if filereadable(expand("~/.config/base16-shell/colortest")) | 806 | if filereadable(expand("~/.config/base16-shell/colortest")) |
793 | " let g:base16_shell_path="~/.config/base16-shell/scripts" | 807 | let g:base16_shell_path="~/.config/base16-shell/scripts" |
794 | " endif | 808 | endif |
795 | " | 809 | |
796 | " let base16colorspace=256 | 810 | let base16colorspace=256 |
797 | " if filereadable(expand("~/.vimrc_background")) | 811 | if filereadable(expand("~/.vimrc_background")) |
798 | " source ~/.vimrc_background | 812 | source ~/.vimrc_background |
799 | " else | 813 | else |
800 | " colorscheme base16-phd | 814 | colorscheme base16-phd |
801 | " endif | 815 | endif |
802 | 816 | ||
803 | 817 | ||
804 | " ====================================================================================================================== | 818 | " ====================================================================================================================== |