aboutsummaryrefslogtreecommitdiff
path: root/vimrc-full
diff options
context:
space:
mode:
Diffstat (limited to 'vimrc-full')
-rw-r--r--vimrc-full51
1 files changed, 25 insertions, 26 deletions
diff --git a/vimrc-full b/vimrc-full
index fbe7a9d..07166cb 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -91,7 +91,7 @@ let g:signify_update_on_focusgained = 1
91 91
92" Colorschemes: 92" Colorschemes:
93Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*) 93Plug 'chriskempson/base16-vim' | " not just one high quality color scheme (all named base16-*)
94Plug '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
97Plug 'mtth/scratch.vim' 97Plug 'mtth/scratch.vim'
@@ -149,12 +149,12 @@ let g:javascript_conceal_arrow_function = "⇒"
149Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more 149Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more
150let g:tagbar_autoclose = 0 150let g:tagbar_autoclose = 0
151let g:tagbar_autofocus = 1 151let g:tagbar_autofocus = 1
152let g:tagbar_autoshowtag = 1 152let g:tagbar_autoshowtag = 0
153let g:tagbar_compact = 1 153let g:tagbar_compact = 1
154let g:tagbar_indent = 0 154let g:tagbar_indent = 0
155let g:tagbar_foldlevel = 99 155let g:tagbar_foldlevel = 99
156nnoremap <leader>l :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L 156nnoremap <leader>l :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L
157nnoremap <F9> :TagbarToggle<CR>| " bind TagBar to Hotkey Ctrl+L 157nnoremap <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
188let g:lightline_buffer_minfextlen = 3 188let g:lightline_buffer_minfextlen = 3
189let g:lightline_buffer_reservelen = 20 189let g:lightline_buffer_reservelen = 20
190 190
191function! 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
196endfunction 196" endfunction
197autocmd 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"
199function! MyFileformat() 199" function! MyFileformat()
200 return exists('b:fileformat') ? b:fileformat : &fileformat 200" return exists('b:fileformat') ? b:fileformat : &fileformat
201endfunction 201" endfunction
202autocmd BufEnter * let b:fileformat = winwidth(0) > 70 ? WebDevIconsGetFileFormatSymbol() . ':' . &fileformat : '' 202" autocmd BufEnter * let b:fileformat = winwidth(0) > 70 ? WebDevIconsGetFileFormatSymbol() . ':' . &fileformat : ''
203 203"
204function! MyBranchname() 204" function! MyBranchname()
205 return exists('b:branchname') ? b:branchname : '' 205" return exists('b:branchname') ? b:branchname : ''
206endfunction 206" endfunction
207autocmd BufEnter * let b:branchname = winwidth(0) > 70 ? fugitive#statusline() : '' 207" autocmd BufEnter * let b:branchname = winwidth(0) > 70 ? fugitive#statusline() : ''
208 208
209let g:lightline = { 209let 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
496if has("gui_running") 494if 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
..