Refactoring: See 'convenience' section

1 files changed, 40 insertions, 58 deletions

diff --git a/vimrc-full b/vimrc-full
index 1a1b201..c6dc9d8 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -1,4 +1,4 @@
-" vim: noai:ts=2:sw=2:sts=2 iskeyword+=\:,\!,\<,\>,\-,\&
+" vim: noai:ts=2:sw=2:sts=2 iskeyword+=\:,\!,\<,\>,\-,\& number
 
 "=======================================================================================================================
 " GENERAL:
@@ -9,6 +9,7 @@ set ts=4 sts=4 sw=4 expandtab     | " better done with a modeline or local exrc
 set virtualedit=all               | " virtual edit should be default behaviour, because I don't see any reason against
 set nonumber norelativenumber     | " do not show numbers by default, because that causes a performance loss, instead activate them on a file type basis
 set ignorecase smartcase hlsearch | " search with ignore case by default, but use case sensitive search when one capital char is contained and highlight while typing (even though its slower)
+set cindent cinoptions+=(0        | " indent at parentheses
 
 
 set path+=**                      | " allow recursive searches for files
@@ -258,7 +259,6 @@ set sessionoptions+=winsize
 " set nocindent smartindent     | " use smart indent rather then cindent
 set noautoindent
 set nosmartindent
-set cindent cinoptions+=(0    | " indent at parentheses
 
 set noshiftround              | " indent/un-indent sna=ps to multiple of shiftwidths
 set noequalalways               | " do not evenly size windows when opening new or closing old
@@ -321,7 +321,6 @@ if has("autocmd")
   " set omnifunc=syntaxcomplete#Complete
 
   augroup set_window_title " {
-    " autocmd BufWinEnter quickfix setl statusline=%t
     " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]"
     autocmd CursorHold * let &titlestring = "%t %y ".$USER."@".hostname().":%{expand(\"%:~:.:h\")}"
     set title
@@ -413,35 +412,6 @@ if has("autocmd")
   " use the shada/viminfo file to return the cursor to where it was...
   autocmd BufReadPost * call setpos(".", getpos("'\""))
 
-
-  augroup ToggleQuickFix
-    function! ToggleQuickFix()
-      if exists("g:qwindow")
-        lclose
-        unlet g:qwindow
-      else
-        try
-          lopen 10
-          let g:qwindow = 1
-        catch
-          echo "No Errors found!"
-        endtry
-      endif
-    endfunction
-    function! QFixToggle(forced)
-      if exists("g:qfix_win") && a:forced == 0
-        cclose
-        unlet g:qfix_win
-      else
-        copen 10
-        let g:qfix_win = bufnr("$")
-      endif
-    endfunction
-
-    nmap <script> <silent> <F7> :call QFixToggle(0)<CR>
-    nmap <script> <silent> <F8> :call ToggleQuickFix()<CR>
-  augroup END
-
   augroup CurrentFileName
     " highlight the current files name inside the document...
     let @g = ":exe ':match SpellBad /'.escape(expand('%:t'), '.').'/'"
@@ -613,12 +583,6 @@ if has("autocmd")
               \ :ta
     endif
 
-
-
-
-    " exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s)
-    nnoremap Q !!$SHELL<CR>
-
     " autocmd BufEnter * @f
   augroup END
 
@@ -709,10 +673,6 @@ let g:signify_update_on_bufenter    = 0
 let g:signify_update_on_focusgained = 0
 let g:signify_sign_show_count = 1
 
-" BUFEXPLORER:                        | " a buffer to list all buffers has the advantage, that default /-searches work in there
-Plug 'jlanzarotta/bufexplorer'
-nnoremap <F12> :ToggleBufExplorer<CR>
-
 " NERDTree: replaces NetRW, as long as it has so many bugs
 Plug 'scrooloose/nerdtree'            | "
 let NERDTreeIgnore                = ['\.aux$', '\.o$']
@@ -819,8 +779,8 @@ let g:lightline = {
     \     'right': []
     \   },
     \   'active': {
-    \     'left': [ [ 'register', 'mode', 'paste' ], ['readonly', 'filetype'], [ 'absolutepath' ]],
-    \     'right': [ [ 'lineinfo', 'percent' ], [ 'spell', 'fileencoding', 'fileformat' ] , ['tagbar'] ]
+    \     'left': [ [ 'mode', 'register', 'paste' ], [ 'absolutepath', 'title' ] , ['tagbar']],
+    \     'right': [ [ 'lineinfo', 'percent' ], [ 'filetype', 'readonly', 'spell', 'fileencoding', 'fileformat'  ] ]
     \   },
     \   'component': {
     \     'tagbar': '%{substitute(tagbar#currenttag("%s", "", "fs"), "\(.*\)", "", "")}',
@@ -832,7 +792,8 @@ let g:lightline = {
     \     'gitbranch': ' %{fugitive#head()}',
     \     'tabnumber': " %{tabpagenr()}/%{tabpagenr('$')}",
     \     'readonly': '%{&readonly ? "" : ""}',
-    \     'register': '%{v:register}'
+    \     'register': '%{v:register}',
+    \     'title': '%{getwinvar(0, "quickfix_title")}'
     \   },
     \   'component_expand': {
     \     'buffercurrent': 'lightline#buffer#buffercurrent2',
@@ -889,9 +850,6 @@ if has("python")
     " Plug 'Rip-Rip/clang_complete'
     Plug 'zchee/deoplete-clang'
     Plug 'Shougo/neoinclude.vim'
-    Plug 'huawenyu/neogdb.vim'
-    let g:gdb_require_enter_after_toggling_breakpoint = 0
-    nmap <leader>v :call neobugger#gdb#Send("print " . expand('<cword>'))<CR>
   else
     Plug 'idanarye/vim-vebugger'
 
@@ -1123,6 +1081,40 @@ else
   colorscheme PaperColor
 endif
 
+" ======================================================================================================================
+" CONVENIENCE:
+" ======================================================================================================================
+if empty(argv())
+  " autocmd VimEnter * call setloclist(0, filter(map(copy(v:oldfiles), {_, p->{'filename': expand(get(split(p, "'"), 0))}}), { val -> echo val}))
+
+  " from the list of recent files: make absolute paths, filter out files not
+  " contained in cwd and finally filter out directories and non-files...
+  autocmd StdinReadPre * let s:std_in=1
+  autocmd VimEnter * if !exists("s:std_in") | call setqflist(map(filter(filter(
+    \ map(copy(v:oldfiles), {_, p->expand(p)}), 'v:val =~ "'.getcwd().'"'),
+    \ 'filereadable(v:val)'), {_, p->{'filename': fnamemodify(p, ':.')}})) | copen | only
+endif
+
+command Vimls
+      \ call setloclist(0, map(getbufinfo({'buflisted':1}),
+      \ "{'bufnr': v:val.bufnr,
+      \   'lnum': v:val.lnum,
+      \   'text': '='.printf('%*s, % 3d: %s [%s]', winwidth(0) / 2, '', v:val.bufnr, v:val.name, getbufvar(v:val.bufnr, '&buftype')),
+      \   'pattern': 'not loaded'}
+      \ "))
+
+command Ctoggle
+      \ if(get(getqflist({'winid':1}), 'winid') == win_getid())|cclose|else|copen|endif
+command Ltoggle
+      \ if(get(getloclist(0, {'winid':1}), 'winid') == win_getid())|lclose|else|lopen|endif
+
+nnoremap <silent> <F7> :Ltoggle<CR>
+nnoremap <silent> <F8> :Ctoggle<CR>
+nnoremap <silent> <F12> :Vimls<CR>:Ltoggle<CR>
+
+" exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s)
+nnoremap Q !!$SHELL<CR>
+
 
 " ======================================================================================================================
 " TESTING:
@@ -1137,13 +1129,3 @@ autocmd VimEnter,WinEnter * exec ':set scrolljump='.winheight(0)/2
 " display highlight group under the cursor
 map <leader>h :echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')<CR>
 
-if empty(argv())
-  " autocmd VimEnter * call setloclist(0, filter(map(copy(v:oldfiles), {_, p->{'filename': expand(get(split(p, "'"), 0))}}), { val -> echo val}))
-
-  " from the list of recent files: make absolute paths, filter out files not
-  " contained in cwd and finally filter out directories and non-files...
-  autocmd StdinReadPre * let s:std_in=1
-  autocmd VimEnter * if !exists("s:std_in") | call setqflist(map(filter(filter(
-    \ map(copy(v:oldfiles), {_, p->expand(p)}), 'v:val =~ "'.getcwd().'"'),
-    \ 'filereadable(v:val)'), {_, p->{'filename': fnamemodify(p, ':.')}})) | copen | only
-endif