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
 
 " Colorschemes:
 Plug 'chriskempson/base16-vim'        | " not just one high quality color scheme (all named base16-*)
-Plug 'ryanoasis/vim-devicons'         | " eye candy icons
+" Plug 'ryanoasis/vim-devicons'         | " eye candy icons
 
 " SCRATCH:                            | " Unobtrusive scratch window
 Plug 'mtth/scratch.vim'
@@ -149,12 +149,12 @@ let g:javascript_conceal_arrow_function       = "⇒"
 Plug 'majutsushi/tagbar'                              " superseeds taglist-plus, which isn't maintained any more
 let g:tagbar_autoclose   = 0
 let g:tagbar_autofocus   = 1
-let g:tagbar_autoshowtag = 1
+let g:tagbar_autoshowtag = 0
 let g:tagbar_compact     = 1
 let g:tagbar_indent      = 0
 let g:tagbar_foldlevel   = 99
 nnoremap <leader>l :TagbarToggle<CR>|                 " bind TagBar to Hotkey Ctrl+L
-nnoremap <F9> :TagbarToggle<CR>|                      " bind TagBar to Hotkey Ctrl+L
+nnoremap <F9> :TagbarToggle<CR>|                      " also bind TagBar to Hotkey F9
 
 
 " AIRLINE: a fancy status line =========================================================================================
@@ -188,23 +188,23 @@ let g:lightline_buffer_minflen                  = 16
 let g:lightline_buffer_minfextlen               = 3
 let g:lightline_buffer_reservelen               = 20
 
-function! MyFiletype()
-  if(exists('b:filetype'))
-    return b:filetype
-  else
-    return &filetype
-endfunction
-autocmd BufEnter * let b:filetype = winwidth(0) > 70 ? (strlen(&filetype) ? WebDevIconsGetFileTypeSymbol() . ':' . &filetype : 'no ft') : ''
-
-function! MyFileformat()
-  return exists('b:fileformat') ? b:fileformat : &fileformat
-endfunction
-autocmd BufEnter * let b:fileformat = winwidth(0) > 70 ? WebDevIconsGetFileFormatSymbol() . ':' .  &fileformat : ''
-
-function! MyBranchname()
-  return exists('b:branchname') ? b:branchname : ''
-endfunction
-autocmd BufEnter * let b:branchname = winwidth(0) > 70 ? fugitive#statusline() : ''
+" function! MyFiletype()
+"   if(exists('b:filetype'))
+"     return b:filetype
+"   else
+"     return &filetype
+" endfunction
+" autocmd BufEnter * let b:filetype = winwidth(0) > 70 ? (strlen(&filetype) ? WebDevIconsGetFileTypeSymbol() . ':' . &filetype : 'no ft') : ''
+"
+" function! MyFileformat()
+"   return exists('b:fileformat') ? b:fileformat : &fileformat
+" endfunction
+" autocmd BufEnter * let b:fileformat = winwidth(0) > 70 ? WebDevIconsGetFileFormatSymbol() . ':' .  &fileformat : ''
+"
+" function! MyBranchname()
+"   return exists('b:branchname') ? b:branchname : ''
+" endfunction
+" autocmd BufEnter * let b:branchname = winwidth(0) > 70 ? fugitive#statusline() : ''
 
 let g:lightline = {
     \   'colorscheme': 'Tomorrow_Night_Bright',
@@ -222,7 +222,7 @@ let g:lightline = {
     \     'right': [ [ 'close' ] ],
     \   },
     \   'component': {
-    \           'tagbar': '%{tagbar#currenttag("%s", "", "f")}',
+    \           'tagbar': '%{tagbar#currenttag("%s", "", "fs")}',
     \   },
     \   'component_expand': {
     \     'buffercurrent': 'lightline#buffer#buffercurrent2',
@@ -234,8 +234,6 @@ let g:lightline = {
     \     'bufferbefore': 'lightline#buffer#bufferbefore',
     \     'bufferafter': 'lightline#buffer#bufferafter',
     \     'bufferinfo': 'lightline#buffer#bufferinfo',
-    \     'filetype': 'MyFiletype',
-    \     'fileformat': 'MyFileformat',
     \     'getcwd': 'getcwd',
     \     'gitbranch': 'fugitive#head'
     \   },
@@ -292,7 +290,7 @@ if has("python")
   " YouCompleteMe: =====================================================================================================
   " Plug 'Valloric/MatchTagAlways'                           " highlights the closing tag/brace/...
   Plug 'Valloric/YouCompleteMe'
-  Plug 'vim-scripts/dbext.vim'                       " dependency to allow db related completions
+  " Plug 'vim-scripts/dbext.vim'                       " dependency to allow db related completions
   let g:ycm_server_python_interpreter                = "python3"
   let g:ycm_add_preview_to_completeopt               = 1   " reuse existing preview window
   let g:ycm_autoclose_preview_window_after_insertion = 1
@@ -496,16 +494,17 @@ endif
 if has("gui_running")
   set browsedir=buffer
   set toolbar+=text
+  set guiheadroom=0
   set guioptions+=eig
   set guioptions-=T   | " toolbar
   set guioptions+=c   | " use console dialogs instead of popups
   set guioptions+=a   | " autoselect: copy&paste using middleclick
-  set guioptions-=m   | " remove menu
+  set guioptions+=m   | " remove menu
   set guioptions-=e   | " do not display tabs
   set guioptions-=L   | " do not show left scrollbar
   set guioptions-=r   | " do not show right scrollbar
   set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
-  set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 12
+  set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 10
   " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12
 " set selectmode=mouse,key,cmd  | " enters vim's select mode when pressing shift-left or shift-END
 " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text