From b4f8cbbf788092580d52bbc0d57f5929b6235225 Mon Sep 17 00:00:00 2001 From: Max Christian Pohle Date: Sun, 15 Oct 2017 22:03:37 +0200 Subject: Further improved the menu and fallback colorscheme --- vimrc-full | 135 +++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 104 insertions(+), 31 deletions(-) diff --git a/vimrc-full b/vimrc-full index bbfeafa..a21bd25 100644 --- a/vimrc-full +++ b/vimrc-full @@ -92,44 +92,44 @@ if has('cscope') " compiled with cscope support? endif if has('menu') - menu &:cscope.find.c\ symbol + 1001menu &Cscope.find.c\ symbol \s \ :cscope find s <:cR> - menu &:cscope.find.definition + 1001menu &Cscope.find.definition \g \ :cscope find g <:cR> - menu &:cscope.find.functions\ called\ by\ this + 1001menu &Cscope.find.functions\ called\ by\ this \d \ :cscope find d <:cR> - menu &:cscope.find.functions\ calling\ this + 1001menu &Cscope.find.functions\ calling\ this \c \ :cscope find c <:cR> - menu &:cscope.find.text\ string + 1001menu &Cscope.find.text\ string \t \ :cscope find t <:cR> - menu &:cscope.find.egrep\ pattern + 1001menu &Cscope.find.egrep\ pattern \e \ :cscope find e <:cR> - menu &:cscope.find.this\ file + 1001menu &Cscope.find.this\ file \f \ :cscope find f <:cR> - menu &:cscope.find.files\ including\ this\ file + 1001menu &Cscope.find.files\ including\ this\ file \i \ :cscope find i <:cR> - menu &:cscope.find.places\ where\ this\ symbol\ is\ assigned\ a\ value + 1001menu &Cscope.find.places\ where\ this\ symbol\ is\ assigned\ a\ value \a \ :cscope find a <:cR> - menu &:cscope.-Sep1- + 1001menu &Cscope.-Sep1- \ : - menu &:cscope.create\ and\ add\ database + 1001menu &Cscope.create\ and\ add\ database \ :cscope kill -1:execute '!find -regex ".*\.\(c\\|h\\|cpp\\|cxx\\|hh\\|hpp\\|hxx\)$" cscope -i- -b -q':cscope add . - menu &:cscope.-Sep2- + 1001menu &Cscope.-Sep2- \ : - menu &:cscope.add\ \. + 1001menu &Cscope.add\ \. \ :cscope add . - menu &:cscope.show + 1001menu &Cscope.show \ :cscope show - menu &:cscope.reset + 1001menu &Cscope.reset \ :cscope reset endif endif @@ -426,23 +426,76 @@ if has("autocmd") set wildmenu set cpo-=< set wcm= - map :emenu - menu &Directory.print\ current\ directory + 01menu &Functions.toggle\ file\ browser + \ + \ + 01menu &Functions.-Sep0- : + + 01menu &Functions.help + \ + \ + 01menu &Functions.copen\:\ show\ quickfix\ list + \ + \ + 01menu &Functions.lopen\:\ show\ location\ list + \ + \ + 01menu &Functions.unef4 + \ + \ + 01menu &Functions.-Sep1- : + + 01menu &Functions.make + \ + \ + 01menu &Functions.clear\ matches,\ update\ viewport + \ + \ + 01menu &Functions.undef7 + \ + \ + 01menu &Functions.undef8 + \ + \ + 01menu &Functions.-Sep2- : + + 01menu &Functions.toggle\ tagbar + \ + \ + + if has("gui_running") == 0 + " in the gui F10 already triggeres the menu, not in a terminal vim, so upgrade that... + map :emenu + endif + 01menu &Functions.activate\ menu\ (:emenu) + \ + \ + + 01menu &Functions.undef11 + \ + \ + 01menu &Functions.undef12 + \ + \ + 01menu &Functions.-Sep2- : + + + 09menu &Directory.print\ current\ directory \:pwd \ :pwd - menu &Directory.-Sep- : + 09menu &Directory.-Sep- : - menu &Directory.Change\ to\ GIT\ root + 09menu &Directory.Change\ to\ GIT\ root \:Gcd \ :Gcd:pwd - menu &Directory.Change\ to\ current\ buffers\ directory\ (global) + 09menu &Directory.Change\ to\ current\ buffers\ directory\ (global) \:cd\ %:p:h \ :cd %:h:pwd - menu &Directory.Change\ to\ current\ buffers\ directory\ (local\ window):lcd\ %:p:h + 09menu &Directory.Change\ to\ current\ buffers\ directory\ (local\ window):lcd\ %:p:h \ :lcd %:p:h:pwd menu &Git.&Display\ last\ changes @@ -467,11 +520,6 @@ if has("autocmd") menu &Window.-Sep- : - menu &Window.Quickfix\ List - \ :copen - - menu &Window.Location\ List - \ :lopen menu &Window.Scratch \ :Scratch @@ -512,6 +560,22 @@ if has("autocmd") \:clearjumps \ :clearjumps + 1000menu &Tag.list + \:tags + \ :tags + 1000menu &Tag.selection\ list + \:ts + \ :ts + + 1000menu &Tag.-Sep1- : + + 1000menu &Tag.stack.jump\ older + \ + \ :po + 1000menu &Tag.stack.jump\ + \:ta + \ :ta + menu &UI.&Open\ in\ Serversession \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.'):stopinsert:set readonly @@ -740,7 +804,7 @@ set statusline+=%*%= set statusline+=%l:%c(%p%%) " Autocompleter: ===================================== -" if has("python") +if has("python") " ULTISNIPS: code snippet ============================================================================================ Plug 'honza/vim-snippets' " dependency of ultisnips (see below) @@ -763,8 +827,8 @@ set statusline+=%l:%c(%p%%) " YouCompleteMe: ===================================================================================================== " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... Plug 'Valloric/YouCompleteMe' - let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar - let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar + let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column + let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn let g:ycm_auto_trigger = 1 let g:ycm_autoclose_preview_window_after_insertion = 1 " Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions @@ -825,7 +889,8 @@ set statusline+=%l:%c(%p%%) " autocmd FileType python jedi.preload_module('os', 'sys', 'math') " let g:pymode_options_max_line_length = 120 " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301' -" endif + +endif " has("python") "======================================================================================================================= " TESTING: | " plugins which I am currently trying... @@ -942,7 +1007,15 @@ let base16colorspace=256 if filereadable(expand("~/.vimrc_background")) source ~/.vimrc_background else - colorscheme base16-phd + let g:PaperColor_Theme_Options = { + \ 'theme': { + \ 'default': { + \ 'transparent_background': 1 + \ } + \ } + \ } + set background=dark + colorscheme PaperColor endif -- cgit v1.2.3