diff options
author | Max Christian Pohle | 2017-08-03 23:13:46 +0200 |
---|---|---|
committer | Max Christian Pohle | 2017-08-03 23:13:46 +0200 |
commit | dc6c04568d9a9f4d4d9c66527f1d9e91b3bfd4b7 (patch) | |
tree | 3324338e704dcf8c4d2800c971760054d3429eef /vimrc-full | |
parent | 71c9159e83d0a721dcc069c89711ad8a48d4ac60 (diff) | |
download | vim-karlmarks-dc6c04568d9a9f4d4d9c66527f1d9e91b3bfd4b7.tar.bz2 vim-karlmarks-dc6c04568d9a9f4d4d9c66527f1d9e91b3bfd4b7.zip |
Performance improvements, GUI improvements
Diffstat (limited to 'vimrc-full')
-rw-r--r-- | vimrc-full | 51 |
1 files changed, 25 insertions, 26 deletions
@@ -91,7 +91,7 @@ let g:signify_update_on_focusgained = 1 | |||
91 | 91 | ||
92 | " Colorschemes: | 92 | " Colorschemes: |
93 | Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*) | 93 | Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*) |
94 | Plug 'ryanoasis/vim-devicons' | " eye candy icons | 94 | " Plug 'ryanoasis/vim-devicons' | " eye candy icons |
95 | 95 | ||
96 | " SCRATCH: | " Unobtrusive scratch window | 96 | " SCRATCH: | " Unobtrusive scratch window |
97 | Plug 'mtth/scratch.vim' | 97 | Plug 'mtth/scratch.vim' |
@@ -149,12 +149,12 @@ let g:javascript_conceal_arrow_function = "⇒" | |||
149 | Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more | 149 | Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more |
150 | let g:tagbar_autoclose = 0 | 150 | let g:tagbar_autoclose = 0 |
151 | let g:tagbar_autofocus = 1 | 151 | let g:tagbar_autofocus = 1 |
152 | let g:tagbar_autoshowtag = 1 | 152 | let g:tagbar_autoshowtag = 0 |
153 | let g:tagbar_compact = 1 | 153 | let g:tagbar_compact = 1 |
154 | let g:tagbar_indent = 0 | 154 | let g:tagbar_indent = 0 |
155 | let g:tagbar_foldlevel = 99 | 155 | let g:tagbar_foldlevel = 99 |
156 | nnoremap <leader>l :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L | 156 | nnoremap <leader>l :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L |
157 | nnoremap <F9> :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L | 157 | nnoremap <F9> :TagbarToggle<CR>| " also bind TagBar to Hotkey F9 |
158 | 158 | ||
159 | 159 | ||
160 | " AIRLINE: a fancy status line ========================================================================================= | 160 | " AIRLINE: a fancy status line ========================================================================================= |
@@ -188,23 +188,23 @@ let g:lightline_buffer_minflen = 16 | |||
188 | let g:lightline_buffer_minfextlen = 3 | 188 | let g:lightline_buffer_minfextlen = 3 |
189 | let g:lightline_buffer_reservelen = 20 | 189 | let g:lightline_buffer_reservelen = 20 |
190 | 190 | ||
191 | function! MyFiletype() | 191 | " function! MyFiletype() |
192 | if(exists('b:filetype')) | 192 | " if(exists('b:filetype')) |
193 | return b:filetype | 193 | " return b:filetype |
194 | else | 194 | " else |
195 | return &filetype | 195 | " return &filetype |
196 | endfunction | 196 | " endfunction |
197 | autocmd BufEnter * let b:filetype = winwidth(0) > 70 ? (strlen(&filetype) ? WebDevIconsGetFileTypeSymbol() . ':' . &filetype : 'no ft') : '' | 197 | " autocmd BufEnter * let b:filetype = winwidth(0) > 70 ? (strlen(&filetype) ? WebDevIconsGetFileTypeSymbol() . ':' . &filetype : 'no ft') : '' |
198 | 198 | " | |
199 | function! MyFileformat() | 199 | " function! MyFileformat() |
200 | return exists('b:fileformat') ? b:fileformat : &fileformat | 200 | " return exists('b:fileformat') ? b:fileformat : &fileformat |
201 | endfunction | 201 | " endfunction |
202 | autocmd BufEnter * let b:fileformat = winwidth(0) > 70 ? WebDevIconsGetFileFormatSymbol() . ':' . &fileformat : '' | 202 | " autocmd BufEnter * let b:fileformat = winwidth(0) > 70 ? WebDevIconsGetFileFormatSymbol() . ':' . &fileformat : '' |
203 | 203 | " | |
204 | function! MyBranchname() | 204 | " function! MyBranchname() |
205 | return exists('b:branchname') ? b:branchname : '' | 205 | " return exists('b:branchname') ? b:branchname : '' |
206 | endfunction | 206 | " endfunction |
207 | autocmd BufEnter * let b:branchname = winwidth(0) > 70 ? fugitive#statusline() : '' | 207 | " autocmd BufEnter * let b:branchname = winwidth(0) > 70 ? fugitive#statusline() : '' |
208 | 208 | ||
209 | let g:lightline = { | 209 | let g:lightline = { |
210 | \ 'colorscheme': 'Tomorrow_Night_Bright', | 210 | \ 'colorscheme': 'Tomorrow_Night_Bright', |
@@ -222,7 +222,7 @@ let g:lightline = { | |||
222 | \ 'right': [ [ 'close' ] ], | 222 | \ 'right': [ [ 'close' ] ], |
223 | \ }, | 223 | \ }, |
224 | \ 'component': { | 224 | \ 'component': { |
225 | \ 'tagbar': '%{tagbar#currenttag("%s", "", "f")}', | 225 | \ 'tagbar': '%{tagbar#currenttag("%s", "", "fs")}', |
226 | \ }, | 226 | \ }, |
227 | \ 'component_expand': { | 227 | \ 'component_expand': { |
228 | \ 'buffercurrent': 'lightline#buffer#buffercurrent2', | 228 | \ 'buffercurrent': 'lightline#buffer#buffercurrent2', |
@@ -234,8 +234,6 @@ let g:lightline = { | |||
234 | \ 'bufferbefore': 'lightline#buffer#bufferbefore', | 234 | \ 'bufferbefore': 'lightline#buffer#bufferbefore', |
235 | \ 'bufferafter': 'lightline#buffer#bufferafter', | 235 | \ 'bufferafter': 'lightline#buffer#bufferafter', |
236 | \ 'bufferinfo': 'lightline#buffer#bufferinfo', | 236 | \ 'bufferinfo': 'lightline#buffer#bufferinfo', |
237 | \ 'filetype': 'MyFiletype', | ||
238 | \ 'fileformat': 'MyFileformat', | ||
239 | \ 'getcwd': 'getcwd', | 237 | \ 'getcwd': 'getcwd', |
240 | \ 'gitbranch': 'fugitive#head' | 238 | \ 'gitbranch': 'fugitive#head' |
241 | \ }, | 239 | \ }, |
@@ -292,7 +290,7 @@ if has("python") | |||
292 | " YouCompleteMe: ===================================================================================================== | 290 | " YouCompleteMe: ===================================================================================================== |
293 | " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... | 291 | " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... |
294 | Plug 'Valloric/YouCompleteMe' | 292 | Plug 'Valloric/YouCompleteMe' |
295 | Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions | 293 | " Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions |
296 | let g:ycm_server_python_interpreter = "python3" | 294 | let g:ycm_server_python_interpreter = "python3" |
297 | let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window | 295 | let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window |
298 | let g:ycm_autoclose_preview_window_after_insertion = 1 | 296 | let g:ycm_autoclose_preview_window_after_insertion = 1 |
@@ -496,16 +494,17 @@ endif | |||
496 | if has("gui_running") | 494 | if has("gui_running") |
497 | set browsedir=buffer | 495 | set browsedir=buffer |
498 | set toolbar+=text | 496 | set toolbar+=text |
497 | set guiheadroom=0 | ||
499 | set guioptions+=eig | 498 | set guioptions+=eig |
500 | set guioptions-=T | " toolbar | 499 | set guioptions-=T | " toolbar |
501 | set guioptions+=c | " use console dialogs instead of popups | 500 | set guioptions+=c | " use console dialogs instead of popups |
502 | set guioptions+=a | " autoselect: copy&paste using middleclick | 501 | set guioptions+=a | " autoselect: copy&paste using middleclick |
503 | set guioptions-=m | " remove menu | 502 | set guioptions+=m | " remove menu |
504 | set guioptions-=e | " do not display tabs | 503 | set guioptions-=e | " do not display tabs |
505 | set guioptions-=L | " do not show left scrollbar | 504 | set guioptions-=L | " do not show left scrollbar |
506 | set guioptions-=r | " do not show right scrollbar | 505 | set guioptions-=r | " do not show right scrollbar |
507 | set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped) | 506 | set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped) |
508 | set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 12 | 507 | set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 10 |
509 | " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12 | 508 | " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12 |
510 | " set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END | 509 | " set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END |
511 | " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text | 510 | " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text |