From eb2e7959987ebc405c7a03060f259655e13f01d0 Mon Sep 17 00:00:00 2001 From: Max Christian Pohle Date: Mon, 29 Oct 2018 18:02:40 +0100 Subject: Further cleaning finally done --- experimental/list-commands.vim | 6 + experimental/vimrc-minimal | 16 ++ experimental/vimrc-minimal-statusline | 30 +++ experimental/vimrc-old | 303 +++++++++++++++++++++++++ favicon.ico | Bin 32038 -> 0 bytes ftplugin/c.vim | 8 + init.vim | 2 +- list-commands.vim | 6 - plugged/.info | 1 - plugin/max-fix-colorschemes.vim | 7 +- utils/applications/gvim-buffer.desktop | 10 + utils/applications/gvim.desktop | 10 + utils/applications/nvim.desktop | 10 + utils/applications/vim.desktop | 13 ++ utils/bashrc | 30 +++ utils/default-font.conf | 70 ++++++ utils/gtk-3.0.css | 119 ++++++++++ vimrc | 2 +- vimrc-common | 20 +- vimrc-medium | 108 --------- vimrc-minimal | 16 -- vimrc-minimal-statusline | 30 --- vimrc-old | 303 ------------------------- xdg-additions/applications/gvim-buffer.desktop | 10 - xdg-additions/applications/gvim.desktop | 10 - xdg-additions/applications/nvim.desktop | 10 - xdg-additions/applications/vim.desktop | 13 -- xdg-additions/bashrc | 30 --- xdg-additions/default-font.conf | 61 ----- xdg-additions/gtk-3.0.css | 117 ---------- ycm_extra_conf.pyc | Bin 2659 -> 0 bytes 31 files changed, 640 insertions(+), 731 deletions(-) create mode 100644 experimental/list-commands.vim create mode 100644 experimental/vimrc-minimal create mode 100644 experimental/vimrc-minimal-statusline create mode 100644 experimental/vimrc-old delete mode 100644 favicon.ico create mode 100644 ftplugin/c.vim delete mode 100644 list-commands.vim delete mode 100644 plugged/.info create mode 100644 utils/applications/gvim-buffer.desktop create mode 100644 utils/applications/gvim.desktop create mode 100644 utils/applications/nvim.desktop create mode 100644 utils/applications/vim.desktop create mode 100644 utils/bashrc create mode 100644 utils/default-font.conf create mode 100644 utils/gtk-3.0.css delete mode 100644 vimrc-medium delete mode 100644 vimrc-minimal delete mode 100644 vimrc-minimal-statusline delete mode 100644 vimrc-old delete mode 100644 xdg-additions/applications/gvim-buffer.desktop delete mode 100644 xdg-additions/applications/gvim.desktop delete mode 100644 xdg-additions/applications/nvim.desktop delete mode 100644 xdg-additions/applications/vim.desktop delete mode 100644 xdg-additions/bashrc delete mode 100644 xdg-additions/default-font.conf delete mode 100644 xdg-additions/gtk-3.0.css delete mode 100644 ycm_extra_conf.pyc diff --git a/experimental/list-commands.vim b/experimental/list-commands.vim new file mode 100644 index 0000000..0dd4bca --- /dev/null +++ b/experimental/list-commands.vim @@ -0,0 +1,6 @@ + + + +for s in sort(getcompletion('', 'function')) + echo getcompletion(s, 'function') +endfor diff --git a/experimental/vimrc-minimal b/experimental/vimrc-minimal new file mode 100644 index 0000000..96924f0 --- /dev/null +++ b/experimental/vimrc-minimal @@ -0,0 +1,16 @@ +set nocompatible + + +filetype plugin indent on + +set omnifunc=syntaxcomplete#Complete + +syntax on + + +set ts=2 sw=2 expandtab + +set ignorecase smartcase + +set hidden + diff --git a/experimental/vimrc-minimal-statusline b/experimental/vimrc-minimal-statusline new file mode 100644 index 0000000..8a8656e --- /dev/null +++ b/experimental/vimrc-minimal-statusline @@ -0,0 +1,30 @@ +set nocompatible + + +filetype plugin indent on + +set omnifunc=syntaxcomplete#Complete + +syntax on + + +set ts=2 sw=2 expandtab + +set ignorecase smartcase + +set hidden + +let g:status_fg="#ffffff" +let g:status_bg="#000000" +let g:status_sel='#ffff00' + +execute 'highlight! StatusLine' + \ .' guibg='.g:status_sel + \ .' guifg=NONE' + +execute 'highlight! User1 guibg='.g:status_bg +execute 'highlight! User1 guifg='.g:status_fg + +execute 'highlight! User2 guibg='.g:status_sel +execute 'highlight! User2 guifg='.g:status_bg +colorscheme coderonline diff --git a/experimental/vimrc-old b/experimental/vimrc-old new file mode 100644 index 0000000..c5bd4e6 --- /dev/null +++ b/experimental/vimrc-old @@ -0,0 +1,303 @@ +" vi:columns=160:list:ts=2:sts=2:sw=2 +"================================================================================ +" Vundle: plugin manager... +set nocompatible | " do not try to be vi, be vim (required by Vundle) +filetype off | " Vundle needs this +set rtp+=~/.vim/bundle/Vundle.vim | " set runtimepath (required by Vundle) +call vundle#begin('~/.vim/bundle/') | " location where Vundle searches&installs plugins + +" Plugin dependant configurations... +Plugin 'tpope/vim-sensible' | " a sane and modern default configuration +Plugin 'tpope/vim-fugitive' | " the most complete GIT integration plugin +Plugin 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with ' +Plugin 'tpope/vim-repeat' | " lets . (dot) repeat plugin macros as well, specifically vim-surround +Plugin 'tpope/vim-vinegar' | " Improves :Explore +Plugin 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values) + +Plugin 'tpope/vim-vividchalk' | " dark theme +Plugin 'nelstrom/vim-mac-classic-theme' | " light theme + +Plugin 'Valloric/YouCompleteMe' | " syntax checker and code completion +Plugin 'cscope_plus.vim' | " run cscope -R -b in project folder then use +Plugin 'autoload_cscope.vim' | " CTRL+\ s searches word under cursor, CTRL+T back +Plugin 'jeaye/color_coded' | " semantic highlighting with vim +Plugin 'terryma/vim-multiple-cursors' | " displays visual block mode as cursors +Plugin 'taglist-plus' | " quick code navigator +Plugin 'jdonaldson/vaxe' | " code completion for haxe +Plugin 'sheerun/vim-polyglot' | " better syntax highlighting/indentation for multiple languages +Plugin 'loremipsum' | " Sample text generator +Plugin 'vim-airline/vim-airline' | " beautification of the mode line +Plugin 'nathanaelkane/vim-indent-guides' | " shows indentation guidelines by pressing ig +Plugin 'gregsexton/matchtag' | " highlights closing ML tags like braces +Plugin 'indenthtml.vim' | " works better with mixed html/css/javascript +Plugin 'easymotion/vim-easymotion' | " speed up navigation: try \\w or \\f, then one of the highlighted chars +Plugin 'Shougo/vimproc.vim' +Plugin 'Shougo/vimshell.vim' +Plugin 'jeetsukumaran/vim-buffergator' | " switch buffers with \b or <\-Left> <\-Right> + +let g:airline_powerline_fonts = 1 + +let Tlist_Compact_Format = 1 | " +let Tlist_GainFocus_On_ToggleOpen = 1 | " +let Tlist_Close_On_Select = 1 | " + +Plugin 'VundleVim/Vundle.vim' | " Vundle itself (required) +let g:ycm_global_ycm_extra_conf = '~/.vim/ycm_extra_conf.py' | " fallback, right one should be in the applications path +let g:ycm_confirm_extra_conf = 0 | " disable 'do you really want to execute .py?' +let g:ycm_key_select_completion = '' | " key completion key +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_collect_identifiers_from_tags_files = 1 | " +let g:ycm_autoclose_preview_window_after_insertion=1 | " close the window when leaving insert mode +"let g:ycm_semantic_triggers = {'c' : ['(', ',']} | " add additional triggers (not recommend) + +let b:html_omni_flavor='xhtml' | " prever xhtml over html because that makes inline php code possible without hassle +let html_use_css = 1 | " when using :TOhtml no font-tags will be used, but proper css +let g:vim_markdown_folding_disabled=1 | " disable code folding with vimdiff (also see set nofoldenable) + +let g:netrw_liststyle=3 | " Explore mode: 3 shows a complete tree instead of the current directory +let g:netrw_list_hide='^\..*' | " Explore mode: hide files starting with dot + + +" speed up CTRL-P Menu... +let g:ctrlp_user_command = 'ag %s -i --nocolor --nogroup --hidden + \ --ignore .git + \ --ignore .svn + \ --ignore .hg + \ --ignore .DS_Store + \ --ignore "**/*.pyc" + \ -g ""' + +call vundle#end() | " required by Vundle +filetype plugin indent on | " required by Vundle +"================================================================================ +" custom config +colorscheme mac_classic +" colorscheme coderonline +syntax enable + +set noswapfile | " noundofile, nobackup, nowritebackup +set backupdir=~/.vim/temp | " using :set backup will copy current file to this directory +set directory=~/.vim/temp | " +set undodir=~/.vim/temp | " + +set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth) +set autoindent | " always set autoindenting on +set autochdir | " change to the current files working dir (might break some plugins!) +set copyindent | " copy the previous indentation on autoindenting +set scrolloff=2 | " always keeps at least two lines visible (when seeking) +" set selectmode=mouse | " avoid using select mode (only with mouse) +set mousemodel=popup_setpos | " display a default right click menu for the selection (that is c&p is possible) +set selection=exclusive | " includes last character of the selection into following command (like x or d) + +set whichwrap=b,s,<,>,[,] | " beyond beginning/end line causes cusor to wrap +set backspace=indent,eol,start| " allow backspacing over everything in insert mode, not needed with whichwrap +set diffopt+=vertical,iwhite,filler | " lets diff ignore white spaces +set spell spelllang=en,de | " enable spell checker +set virtualedit=onemore | " one character beyond the line length should be navigatable (options: all,insert,block,onemore) +set breakindent cpoptions+=n | " when wrapping lines indent wrapped line to align with the previews +set linebreak | " do not wrap in the middle of words +set display+=lastline | " do not show the @ symbol in the end of a long line +set showcmd | " displays status line messages while selecting (matrix size) +set nofoldenable | " do not fold code automatically +set tags+=~/.vim/systags | " ctags -R -f ~/.vim/systags /usr/include /usr/local/include +set wildmenu wildmode=full | " wildmenu code completion +set guifont="Droid Sans Mono for Powerline 10" + +" search... +set ignorecase smartcase | " if search pattern contains uppercase then search is case sensitive +set incsearch | " do incremental searching +set showmatch matchtime=4 | " blinks matching braces + +set novisualbell | " don't beep +set noerrorbells | " don't beep +set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well) +set number | " toggle line numbers +set formatprg=par | " set external formatting program to par, use gwip to format with this +set laststatus=2 | " this is required for airline +set cmdheight=1 | " controls how many lines the command line has +set relativenumber | " displays current lines line no as zero point from where relative numbers are getting counted +set timeoutlen=500 | " time between keys e.g. 80i= +set ttimeoutlen=10 | " set esc key timeout in ms + +set splitbelow | " open new windows below the current one (i find that more intuitive) + +if has("multi_byte") + set encoding=utf-8 | " we need default utf-8 encoding to use cool chars as line break and so on (see below) + scriptencoding utf-8 | " tell vim that we are using utf-8 here + set showbreak+=› | " symbol used in the beginning of a wrapped line + set listchars=eol:↲ | " symbols used when using :set list (which displays non-printable chars) + set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars) + set listchars+=precedes:« | " symbols used when using :set list (which displays non-printable chars) + set listchars+=extends:» | " symbols used when using :set list (which displays non-printable chars) + set listchars+=tab:▸\ | " symbols used when using :set list (which displays non-printable chars) +endif + +if has("autocmd") + set modeline | " set variables specific to a file, like indentation by adding a comment + set modelines=3 | " how many lines in the beginning and end of the file can be mode lines? + + augroup resCur | " make cursor appear in its previous position when reopening a file... + autocmd BufReadPost * call setpos(".", getpos("'\"")) + augroup END + + augroup PreviewOnBottom | " will open new windows below the current (only in insert mode, so that the preview window is drawn below) + autocmd InsertEnter * set splitbelow + autocmd InsertLeave * set splitbelow! + augroup END + + augroup OmniFunc | " this will enable omnicomplete just in case this configuration runs somewhere, where YouCompleteMe is not compiled + if exists("+omnifunc") + autocmd Filetype * + \ if &omnifunc == "" | + \ setlocal omnifunc=syntaxcomplete#Complete | + \ setlocal completeopt=longest,menuone | + \ endif + autocmd FileType html set omnifunc=htmlcomplete#CompleteTags + endif + augroup END + + autocmd FileType text setlocal textwidth=78 | " text files: set 'textwidth' to 78 + autocmd FileType gitcommit set tw=72 | " longer commit messages without auto line wrapping + autocmd FileType LaTeX let g:tex_flavor = "latex"| set conceallevel=1| set concealcursor= + autocmd BufNewFile,BufReadPost *.config set filetype=xml | " visual studio config file + autocmd BufNewFile,BufReadPost *.csproj set filetype=xml | " visual studio project file + autocmd BufNewFile,BufReadPost *.sln set filetype=xml | " visual studio solution file +endif + +"================================================================================ +" gui stuff and appearance +if &t_Co > 2 + set hlsearch | " highlight all search matches + set cursorline | " highlight currently selected line +endif + + +if has("gui_running") + set mouse=a | " use mouse in gui-mode (which is default) + set mouseshape+=n:beam,v:beam | " display a text input cursor even in normal and selection mode + set guicursor=n-v-c:ver20-Cursor-blinkon500-blinkoff500 | " how the caret looks like + set guitablabel=%t | " do not display full path as tabname + set guioptions+=m | " menu bar + set guioptions-=T | " toolbar + set guioptions+=r | " right-hand scroll bar + set guioptions-=c | " use console dialogs instead of popups + set guioptions+=a | " autoselect: copy&paste using middleclick + set guioptions+=e | " add tab pages + set guioptions+=p | " use gui pointer callback for x11 + set toolbariconsize=large | " make the icon toolbar as big as possible + "set columns=80 | " set initial window width (so that it fits the terminals) +else + if &term =~? 'mlterm\|xterm\|screen' + set t_Co=256 | " fixes incompatibilities with our color scheme + endif + set mouse=nh | " limits mouse usage to normal mode and help files, so that middle click text insertion works in insert mode + set title | " set the terminal caption + set icon | " sets the terminal icon to vim + set ttyfast | " modern terminals are all fast in a way + "set titleold="vim ended" | " set terminal title after closing vim + "set titlestring="VIM-CONSOLE" | " set window title + "if has('mouse') + "endif +endif + + +"================================================================================ +" custom commands... +" +" assign selection keys (these i missed a lot) +nmap vh| " shift-left selects to the left +xmap h| " ^^ +nmap vl| " shift-right selects to the right +xmap l| " ^^ +nmap vk| " shift-up selects like other text editors +xmap k| " ^^ +nmap vj| " shift down selects like other text editors +xmap j| " ^^ +nmap ^| " default homing in code editors is the first letter of a line +xmap 0| " go to the beginning of the line +xmap 0| " ^^ +xmap >gv| " indent lines (and retain selection) +xmap VH| " selects predessing paragraph +nmap VL| " selects following paragraph +nmap V{| " selects predessing paragraph +nmap V}| " selects following paragraph + +nmap :24vs.| " means the same as :vsplit. and opens the :Exlore -window with a width of 24 + + + + + +map h|map j| " window navigation shortcuts +map k|map l| " window navigation shortcuts + +cmap w!! w !sudo tee % >/dev/null| " write :w!! to execute :w as root user + +" custom hotkeys... +nnoremap :tabnext| " lets one use CTRL+Tab to switch between tabs +nnoremap :tabprevious| " use CTRL+Shift+Tab to switch to preview tab + +nnoremap j gj|nnoremap k gk| " do not jump over wrapped lines + +nnoremap $ g$| " and make the $ key position the cursor after the last char of that line, not before +nnoremap g$| " and make the key position the cursor after the last char of that line +" function ExtendedHome() +" let column = col('.') +" normal! ^ +" if column == col('.') +" normal! 0 +" endif +" endfunction +" noremap :call ExtendedHome() + +nnoremap u + + +"map el +"map hgel +"vnoremap e +"vnoremap b + + +" plugin hotkeys +map :TlistToggle| " bind TagList to Hotkey Ctrl+L +inoremap ( (| " when opening a bracket: call the OmniComplete function, display the menu, but deselect the first entry (C-p) + + +set makeprg=make\ test +nnoremap :!make| " classic key binding: press F5 to compile and execute (if you have a Makefile with make test doing that) + +"================================================================================ +" deactivated on-demand commands (just in case one needs them one day) +" +" code completion: http://vim.wikia.com/wiki/Make_Vim_completion_popup_menu_work_just_like_in_an_IDE +" reacts on CTRL+P, CTRL+Space +"inoremap pumvisible() ? "\" : "\u\" +"inoremap pumvisible() ? "\" : "\" +"inoremap pumvisible() ? "\" : "\" +"inoremap pumvisible() ? "\" : "\" +"inoremap pumvisible() ? "\\\" : "\" +"inoremap pumvisible() ? "\\\" : "\" +" set guiheadroom=0| " do not fill non-functional area of the empty editor with gtk background +" map shift-right to visually select and so on +"nnoremap El +"nnoremap vl +"nnoremap vj +"nnoremap vk +"nnoremap vj +" noremap % v% " jump between braces and highlight +"nnoremap ^ +"vmap ^ +"nnoremap $ +"vmap $ +"nnoremap +"nnoremap +":inoremap pumvisible() ? "\" : "\u\" +"inoremap pumvisible() ? "\" : "\" " breaks cursor keys! +" binding ESC can easily break cursor key movement on the console (tricky, because gvim works) +"inoremap +"inoremap +" +"map OA k|map OB j|map OC l|map OD h| " allow cursor keys in insert mode diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index ca0b3c3..0000000 Binary files a/favicon.ico and /dev/null differ diff --git a/ftplugin/c.vim b/ftplugin/c.vim new file mode 100644 index 0000000..e7dc155 --- /dev/null +++ b/ftplugin/c.vim @@ -0,0 +1,8 @@ +setlocal equalprg=clang-format +setlocal breakat-=- +setlocal keywordprg=man\ 3 + +map = :pyf /usr/share/clang/clang-format.py + + + diff --git a/init.vim b/init.vim index 67bdf65..8d22034 100644 --- a/init.vim +++ b/init.vim @@ -1,4 +1,4 @@ -exec ':source '.fnamemodify($MYVIMRC,':h').'/vimrc-common' +exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' set packpath+=pack/neovim diff --git a/list-commands.vim b/list-commands.vim deleted file mode 100644 index 0dd4bca..0000000 --- a/list-commands.vim +++ /dev/null @@ -1,6 +0,0 @@ - - - -for s in sort(getcompletion('', 'function')) - echo getcompletion(s, 'function') -endfor diff --git a/plugged/.info b/plugged/.info deleted file mode 100644 index 8057473..0000000 --- a/plugged/.info +++ /dev/null @@ -1 +0,0 @@ -This file must exist, because git does not allow empty directories to be commited. diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim index ac2af76..1624565 100644 --- a/plugin/max-fix-colorschemes.vim +++ b/plugin/max-fix-colorschemes.vim @@ -8,16 +8,20 @@ function! ExtendColorTheme() highlight! BoldUnderline cterm=bold,underline gui=bold,underline highlight! BoldItalic cterm=bold,Italic gui=Bold,Italic highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000 - highlight! Error ctermbg=NONE guibg=NONE + highlight! Error guibg=NONE highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red + highlight! link qfSeparator Normal | " reserve one space + highlight! link qfLineNr Normal | " informational line numbers should look different + highlight! link SpecialKey NonText | " makes tab stop (see listchars) less disturbing highlight! link EndOfBuffer Ignore highlight! link WildMenu Search highlight! link Convention Error highlight! link VertSplit NonText + highlight! link VertSplit LineNr highlight! link Folded LineNr highlight! link SignColumn LineNr highlight! link FoldColumn LineNr @@ -26,7 +30,6 @@ function! ExtendColorTheme() highlight! PmenuThumb cterm=inverse highlight! MoreMsg cterm=inverse - endfunction autocmd ColorScheme * call ExtendColorTheme() diff --git a/utils/applications/gvim-buffer.desktop b/utils/applications/gvim-buffer.desktop new file mode 100644 index 0000000..5cd2cbf --- /dev/null +++ b/utils/applications/gvim-buffer.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Gnome Vi IMproved Buffer +Icon=gvim +Comment=Open file in an existing instance of vi and in a new tab +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=gvim -f -N --remote-silent %F +Terminal=false +X-XClassHintResName=VIM +Categories=Utility;TextEditor; diff --git a/utils/applications/gvim.desktop b/utils/applications/gvim.desktop new file mode 100644 index 0000000..37c6e58 --- /dev/null +++ b/utils/applications/gvim.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Vi IMproved Tab +Comment=Open file in an existing instance of vi and in a new tab +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=gvim f -N --remote-tab %F +Icon=gvim +Type=Application +Terminal=false +X-XClassHintResName=VIM +Categories=Utility;TextEditor; diff --git a/utils/applications/nvim.desktop b/utils/applications/nvim.desktop new file mode 100644 index 0000000..21f0090 --- /dev/null +++ b/utils/applications/nvim.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Vim +Comment= +Exec=xfce4-terminal --icon /usr/share/icons/HighContrast/256x256/apps/vim.png -T 'nvim' -e '/bin/bash -i -c "env TERM=gnome-256color screen nvr ."' --fullscreen +Icon=/usr/share/icons/HighContrast/256x256/apps/vim.png +Path= +Terminal=false +StartupNotify=false diff --git a/utils/applications/vim.desktop b/utils/applications/vim.desktop new file mode 100644 index 0000000..f8efe76 --- /dev/null +++ b/utils/applications/vim.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +X-Desktop-File-Install-Version=0.23 +Type=Application +Name=Vi IMproved->buffer2 +Icon=gvim +Comment=Open file in an existing instance of vi and in a new tab +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +X-XClassHintResName=VIM +Categories=Application;Utility;TextEditor; +# Exec=vim --servername VIM --remote-silent %F +Exec=xfce4-terminal -e "bash -c '~/.bashrc ; vim --servername VIM --remote-silent %F'" +Terminal=true +StartupNotify=true diff --git a/utils/bashrc b/utils/bashrc new file mode 100644 index 0000000..24c51a0 --- /dev/null +++ b/utils/bashrc @@ -0,0 +1,30 @@ + +# gvim () { /bin/gvim $(if [[ "$#" > 0 && `/bin/gvim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } +# vim () { /bin/vim $(if [[ "$#" > 0 && `/bin/vim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } + +# man() +# { +# /bin/gvim \ +# $(if [[ `/bin/gvim --serverlist | wc -l` > 0 ]]; then echo --remote-send; fi) \ +# ":enew:0read !groffer --pager='cat' --tty $1 col -bx :set filetype=man buftype=nowrite readonlygg"; +# } + +# export MANPAGER='vim -c":set noswapfile|%!col -b" -c":file man|:setlocal filetype=man buftype=nowrite readonly nonumber nolist signcolumn=no" -' +export MANPAGER="vim -M +MANPAGER -" + +# man() { /bin/vim ":enew:0read !groffer --pager='cat' --tty $1 col -bx :set filetype=man buftype=nowrite readonlygg" -; } +# alias git='git -c color.ui=false' +# export GIT_DIFF_OPTS="--no-color" + + + +git config --global --replace-all color.pager 0 +git config --global --replace-all core.pager 'vim -c":set noswapfile filetype=git buftype=nowrite readonly nolist nonumber signcolumn=no|:file git" -' +# export GIT_PAGER='' + +# alias git="TERM=dumb git" + +# export EDITOR="gvim()" +# export PAGER="tee /tmp/output.txt /dev/stdout | /bin/vim -" + +# --remote-expr ":%!col -b" -c":set buftype=nowrite filetype=man readonly" -'A diff --git a/utils/default-font.conf b/utils/default-font.conf new file mode 100644 index 0000000..8c487c9 --- /dev/null +++ b/utils/default-font.conf @@ -0,0 +1,70 @@ + + + + + + NotoSans-Regular + + + serif + Noto Serif + + + sans-serif + Noto Sans Mono Bold + + + + monospace + + + FuraCode Nerd Font + + + Retina + + + 120 + + + true + + + false + + + true + + + hintmedium + + + + + diff --git a/utils/gtk-3.0.css b/utils/gtk-3.0.css new file mode 100644 index 0000000..b2adaf6 --- /dev/null +++ b/utils/gtk-3.0.css @@ -0,0 +1,119 @@ +/* name or link this file ~/.config/gtk-3.0/gtk.css */ + +/* +#vim-menubar, +#vim-menubar #menu, +#vim-toolbar, +#vim-gui-drawarea, +#vim-main-window { + color:#6060af; + color: #4e4e4e; + font-family: "Hasklug Nerd Font Mono", "Source Code Pro for Powerline", "Source Code Pro", "Roboto"; + font-weight:bold; + font-size:8pt; + border:0; + outline:0; +} + +* { + border-width:0px; + outline-width:0px; + padding:0; + margin:0; +} + +#vim-menubar +{ + padding-left:1em; + border-bottom:2px solid #ffffff; +} + +#vim-menubar>* +{ + padding-right:1em; + padding-top:.25em; + padding-bottom:.25em; +} + +#vim-menubar>*, +#vim-main-window { + background-color:#ffffff; + color: #4e4e4e; +} + +menu menuitem:backdrop, menu menuitem:backdrop:hover +{ + border:0px; +} +*/ + +window#vim-main-window > box +{ + background:#fff; + border:2px solid #fff; +} + +/* within window > box ... */ +menubar#vim-menubar { + font-family: "monospace", "Hasklug Nerd Font Mono", "Source Code Pro for Powerline", "Source Code Pro", "Roboto"; + font-weight:bold; + font-size:8pt; + background: #fff; + /* background: linear-gradient(180deg, white 85%, black); */ +} + +menubar#vim-menubar menuitem { + background:transparent; +} + +menubar#vim-menubar > menuitem { + padding:.25em; +} + +menubar#vim-menubar menuitem box { + padding:.1em .25em; +} + +menubar#vim-menubar menuitem window +{ + margin-top:1em; +} + +/* opened menu (after being clicked) */ +menubar#vim-menubar menuitem window menu { + padding:1px; + background:linear-gradient(90deg, #ccc, #fff); + +} + +menubar#vim-menubar menuitem window menu menuitem { + padding:0em; + margin:0px; +} + +menubar#vim-menubar menuitem window menu menuitem box { + background:rgba(255,255,255,.5); + padding:.25em; + padding-left:1em; + +} + +menubar#vim-menubar menuitem window menu separator { + margin:0; + background:#fff; + border-top:1px dotted #666; +} + + +menubar#vim-menubar menuitem:hover { + box-shadow:none; + background:rgba(0,0,0,.2); + color:#000; +} + + + +/* +toolbar button { +notebook tab { +*/ diff --git a/vimrc b/vimrc index 1b9f20b..cc4cae8 100644 --- a/vimrc +++ b/vimrc @@ -1,4 +1,4 @@ -exec ':source '.fnamemodify($MYVIMRC,':h').'/vimrc-common' +exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' set packpath+=pack/vim diff --git a/vimrc-common b/vimrc-common index 00c7996..7eb499f 100644 --- a/vimrc-common +++ b/vimrc-common @@ -119,8 +119,8 @@ if has('nvim') " Neovim? endif set pumheight=8 | " Determines the maximum number of items to show in the pop-up menu for -set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge -set scrolloff=0 | " keeps cursor centered +set scrolljump=4 | " how many lines get scrolled into view when cursor reaches the screens edge +set scrolloff=4 | " keeps cursor centered set shiftround | " indent/un-indent snaps to multiple of shiftwidths set writedelay=0 @@ -225,10 +225,6 @@ if has("autocmd") autocmd FileType python setlocal keywordprg=pydoc autocmd FileType vim setlocal keywordprg=:help |. autocmd FileType conf setlocal isfname-== - autocmd FileType c,cpp setlocal equalprg=clang-format - autocmd FileType c,cpp setlocal breakat-=- - autocmd FileType c,cpp setlocal keywordprg=man\ 3 - autocmd FileType c,cpp map = :pyf /usr/share/clang/clang-format.py autocmd Filetype css command! CSSsort :g/{/+1;/}/-1 sort autocmd Filetype html,markdown,xml iabbrev @@ -259,6 +255,7 @@ augroup CUSTOM_COMMANDS \ 'text': '='.printf('%*s, % 3d: %s [%s]', winwidth(0) / 2, '', v:val.bufnr, v:val.name, getbufvar(v:val.bufnr, '&buftype')), \ 'pattern': 'not loaded'} \ ")) + command! Qfls call setqflist([],'r',{ 'title':'listed buffers', 'items':map(getbufinfo({"buflisted":1}), '{"bufnr":get(v:val,"bufnr"),"lnum":get(v:val,"lnum"),"module":printf("%-*s",winwidth(0)-4,fnamemodify(get(v:val,"name"),":t"))}') }) command! Ctoggle \ if(get(getqflist({'winid':1}), 'winid') == win_getid())|cclose|else|botright copen|endif command! Ltoggle @@ -308,7 +305,8 @@ augroup KEYBOARD_MAPPING " exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s) nnoremap Q !!$SHELL " google the word under the cursor - nnoremap G :execute ":!xdg-open https://google.de/search?q=".expand("") + nnoremap g :execute ":!xdg-open https://google.de/search?q=".expand("") + nnoremap u :execute ":!xdg-open ".expand("") " display highlight group under the cursor nnoremap h :echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")') @@ -319,13 +317,11 @@ augroup KEYBOARD_MAPPING " inoremap " Bind CTRL+Backspace to vim's version (CTRL+W) in " insert mode (only works with gvim) - inoremap - \ - \ + inoremap " INDENTATION: allows un-indenting a selected block and keeps selection - vnoremap < >gv + vnoremap < >gv " make shift-home select to the beginning of the line nnoremap v^ diff --git a/vimrc-medium b/vimrc-medium deleted file mode 100644 index 8281ef1..0000000 --- a/vimrc-medium +++ /dev/null @@ -1,108 +0,0 @@ -set nocompatible " be iMproved, required -filetype off " required - - - -call plug#begin() - -" let Vundle manage Vundle, required -Plug 'VundleVim/Vundle.vim' - -Plug 'tpope/vim-sensible' | " a sane and modern default configuration -Plug 'tpope/vim-fugitive' | " the most complete GIT integration plugin -Plug 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with ' -Plug 'tpope/vim-repeat' | " lets . (dot) repeat plugin macros as well, specifically vim-surround -Plug 'tpope/vim-vinegar' | " Improves :Explore -Plug 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values) - -Plug 'gregsexton/matchtag' | " highlights closing ML tags like braces -Plug 'loremipsum' | " Sample text generator -Plug 'vim-airline/vim-airline' | " beautification of the mode line -Plug 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme -Plug 'sheerun/vim-polyglot' - -Plug 'f-breidenstein/icinga-vim' -Plug 'godlygeek/tabular' | " align code on a sign, like :Tab/= - -"# Plugin 'indenthtml.vim' | " works better with mixed html/css/javascript -"# Plugin 'evanmiller/nginx-vim-syntax' - - -" Plugin 'tpope/vim-vividchalk' | " dark theme -" Plugin 'nelstrom/vim-mac-classic-theme' | " light theme - - - -" All of your Plugins must be added before the following line -call plug#end() | " all plugins are getting loaded on this line, don't remove! - -filetype plugin indent on | " required - -" set term=xtermc | " required on solaris -set t_Co=256 -colorscheme industry -set background=light - -let g:airline_theme='luna' -let g:airline_powerline_fonts = 1 -" enable airline's fancy headline with all buffers and tabs -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#show_buffers = 1 -let g:airline#extensions#tabline#show_tabs = 1 - - -syntax on - - -set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth) - -set encoding=utf-8 | " set up vim's cosole encoding (not file encoding, for which there is fileencoding=) - -set ignorecase smartcase | " search with ignorecase by default, but use case sensitive search when one captical char is contained - -set lazyredraw -set ttyscroll=3 -set ttyfast -set mouse=a -set hidden -set viminfo+=% | " restore buffer list - - -" set title -" set t_ts=^[k -" set t_fs=^[\ -" auto BufEnter * :set title | let &titlestring = 'v:' . expand('%') -" auto VimLeave * :set t_ts=^[k^[\ -" To ignore plugin indent changes, instead use: -"filetype plugin on -" -" Brief help -" :PluginList - lists configured plugins -" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate -" :PluginSearch foo - searches for foo; append `!` to refresh local cache -" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal -" -" see :h vundle for more details or wiki for FAQ -" Put your non-Plugin stuff after this line -" -if has("autocmd") - set modeline | " set variables specific to a file, like indentation by adding a comment -endif - -" set window title for screen(3) -if &term == "screen" - set t_ts=k - set t_fs=\ -endif -if &term == "screen" || &term == "xterm" - let &titlestring = "%t|".$USER."@".hostname().":%{expand(\"%:~:.:h\")}%=%y" - set title -endif - -" let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" -" automatically remove trailing white spaces on save.. -autocmd BufWritePre * %s/\s\+$//e - -nnoremap :bn| " lets one use CTRL+Tab to switch between tabs -nnoremap :bp| " use CTRL+Shift+Tab to switch to preview tab - diff --git a/vimrc-minimal b/vimrc-minimal deleted file mode 100644 index 96924f0..0000000 --- a/vimrc-minimal +++ /dev/null @@ -1,16 +0,0 @@ -set nocompatible - - -filetype plugin indent on - -set omnifunc=syntaxcomplete#Complete - -syntax on - - -set ts=2 sw=2 expandtab - -set ignorecase smartcase - -set hidden - diff --git a/vimrc-minimal-statusline b/vimrc-minimal-statusline deleted file mode 100644 index 8a8656e..0000000 --- a/vimrc-minimal-statusline +++ /dev/null @@ -1,30 +0,0 @@ -set nocompatible - - -filetype plugin indent on - -set omnifunc=syntaxcomplete#Complete - -syntax on - - -set ts=2 sw=2 expandtab - -set ignorecase smartcase - -set hidden - -let g:status_fg="#ffffff" -let g:status_bg="#000000" -let g:status_sel='#ffff00' - -execute 'highlight! StatusLine' - \ .' guibg='.g:status_sel - \ .' guifg=NONE' - -execute 'highlight! User1 guibg='.g:status_bg -execute 'highlight! User1 guifg='.g:status_fg - -execute 'highlight! User2 guibg='.g:status_sel -execute 'highlight! User2 guifg='.g:status_bg -colorscheme coderonline diff --git a/vimrc-old b/vimrc-old deleted file mode 100644 index c5bd4e6..0000000 --- a/vimrc-old +++ /dev/null @@ -1,303 +0,0 @@ -" vi:columns=160:list:ts=2:sts=2:sw=2 -"================================================================================ -" Vundle: plugin manager... -set nocompatible | " do not try to be vi, be vim (required by Vundle) -filetype off | " Vundle needs this -set rtp+=~/.vim/bundle/Vundle.vim | " set runtimepath (required by Vundle) -call vundle#begin('~/.vim/bundle/') | " location where Vundle searches&installs plugins - -" Plugin dependant configurations... -Plugin 'tpope/vim-sensible' | " a sane and modern default configuration -Plugin 'tpope/vim-fugitive' | " the most complete GIT integration plugin -Plugin 'tpope/vim-surround' | " plugin makes cs"' inside a line replace " with ' -Plugin 'tpope/vim-repeat' | " lets . (dot) repeat plugin macros as well, specifically vim-surround -Plugin 'tpope/vim-vinegar' | " Improves :Explore -Plugin 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values) - -Plugin 'tpope/vim-vividchalk' | " dark theme -Plugin 'nelstrom/vim-mac-classic-theme' | " light theme - -Plugin 'Valloric/YouCompleteMe' | " syntax checker and code completion -Plugin 'cscope_plus.vim' | " run cscope -R -b in project folder then use -Plugin 'autoload_cscope.vim' | " CTRL+\ s searches word under cursor, CTRL+T back -Plugin 'jeaye/color_coded' | " semantic highlighting with vim -Plugin 'terryma/vim-multiple-cursors' | " displays visual block mode as cursors -Plugin 'taglist-plus' | " quick code navigator -Plugin 'jdonaldson/vaxe' | " code completion for haxe -Plugin 'sheerun/vim-polyglot' | " better syntax highlighting/indentation for multiple languages -Plugin 'loremipsum' | " Sample text generator -Plugin 'vim-airline/vim-airline' | " beautification of the mode line -Plugin 'nathanaelkane/vim-indent-guides' | " shows indentation guidelines by pressing ig -Plugin 'gregsexton/matchtag' | " highlights closing ML tags like braces -Plugin 'indenthtml.vim' | " works better with mixed html/css/javascript -Plugin 'easymotion/vim-easymotion' | " speed up navigation: try \\w or \\f, then one of the highlighted chars -Plugin 'Shougo/vimproc.vim' -Plugin 'Shougo/vimshell.vim' -Plugin 'jeetsukumaran/vim-buffergator' | " switch buffers with \b or <\-Left> <\-Right> - -let g:airline_powerline_fonts = 1 - -let Tlist_Compact_Format = 1 | " -let Tlist_GainFocus_On_ToggleOpen = 1 | " -let Tlist_Close_On_Select = 1 | " - -Plugin 'VundleVim/Vundle.vim' | " Vundle itself (required) -let g:ycm_global_ycm_extra_conf = '~/.vim/ycm_extra_conf.py' | " fallback, right one should be in the applications path -let g:ycm_confirm_extra_conf = 0 | " disable 'do you really want to execute .py?' -let g:ycm_key_select_completion = '' | " key completion key -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_collect_identifiers_from_tags_files = 1 | " -let g:ycm_autoclose_preview_window_after_insertion=1 | " close the window when leaving insert mode -"let g:ycm_semantic_triggers = {'c' : ['(', ',']} | " add additional triggers (not recommend) - -let b:html_omni_flavor='xhtml' | " prever xhtml over html because that makes inline php code possible without hassle -let html_use_css = 1 | " when using :TOhtml no font-tags will be used, but proper css -let g:vim_markdown_folding_disabled=1 | " disable code folding with vimdiff (also see set nofoldenable) - -let g:netrw_liststyle=3 | " Explore mode: 3 shows a complete tree instead of the current directory -let g:netrw_list_hide='^\..*' | " Explore mode: hide files starting with dot - - -" speed up CTRL-P Menu... -let g:ctrlp_user_command = 'ag %s -i --nocolor --nogroup --hidden - \ --ignore .git - \ --ignore .svn - \ --ignore .hg - \ --ignore .DS_Store - \ --ignore "**/*.pyc" - \ -g ""' - -call vundle#end() | " required by Vundle -filetype plugin indent on | " required by Vundle -"================================================================================ -" custom config -colorscheme mac_classic -" colorscheme coderonline -syntax enable - -set noswapfile | " noundofile, nobackup, nowritebackup -set backupdir=~/.vim/temp | " using :set backup will copy current file to this directory -set directory=~/.vim/temp | " -set undodir=~/.vim/temp | " - -set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softtabstop, shiftwidth) -set autoindent | " always set autoindenting on -set autochdir | " change to the current files working dir (might break some plugins!) -set copyindent | " copy the previous indentation on autoindenting -set scrolloff=2 | " always keeps at least two lines visible (when seeking) -" set selectmode=mouse | " avoid using select mode (only with mouse) -set mousemodel=popup_setpos | " display a default right click menu for the selection (that is c&p is possible) -set selection=exclusive | " includes last character of the selection into following command (like x or d) - -set whichwrap=b,s,<,>,[,] | " beyond beginning/end line causes cusor to wrap -set backspace=indent,eol,start| " allow backspacing over everything in insert mode, not needed with whichwrap -set diffopt+=vertical,iwhite,filler | " lets diff ignore white spaces -set spell spelllang=en,de | " enable spell checker -set virtualedit=onemore | " one character beyond the line length should be navigatable (options: all,insert,block,onemore) -set breakindent cpoptions+=n | " when wrapping lines indent wrapped line to align with the previews -set linebreak | " do not wrap in the middle of words -set display+=lastline | " do not show the @ symbol in the end of a long line -set showcmd | " displays status line messages while selecting (matrix size) -set nofoldenable | " do not fold code automatically -set tags+=~/.vim/systags | " ctags -R -f ~/.vim/systags /usr/include /usr/local/include -set wildmenu wildmode=full | " wildmenu code completion -set guifont="Droid Sans Mono for Powerline 10" - -" search... -set ignorecase smartcase | " if search pattern contains uppercase then search is case sensitive -set incsearch | " do incremental searching -set showmatch matchtime=4 | " blinks matching braces - -set novisualbell | " don't beep -set noerrorbells | " don't beep -set clipboard=unnamedplus | " makes copy and paste work (autoselectplus might work as well) -set number | " toggle line numbers -set formatprg=par | " set external formatting program to par, use gwip to format with this -set laststatus=2 | " this is required for airline -set cmdheight=1 | " controls how many lines the command line has -set relativenumber | " displays current lines line no as zero point from where relative numbers are getting counted -set timeoutlen=500 | " time between keys e.g. 80i= -set ttimeoutlen=10 | " set esc key timeout in ms - -set splitbelow | " open new windows below the current one (i find that more intuitive) - -if has("multi_byte") - set encoding=utf-8 | " we need default utf-8 encoding to use cool chars as line break and so on (see below) - scriptencoding utf-8 | " tell vim that we are using utf-8 here - set showbreak+=› | " symbol used in the beginning of a wrapped line - set listchars=eol:↲ | " symbols used when using :set list (which displays non-printable chars) - set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars) - set listchars+=precedes:« | " symbols used when using :set list (which displays non-printable chars) - set listchars+=extends:» | " symbols used when using :set list (which displays non-printable chars) - set listchars+=tab:▸\ | " symbols used when using :set list (which displays non-printable chars) -endif - -if has("autocmd") - set modeline | " set variables specific to a file, like indentation by adding a comment - set modelines=3 | " how many lines in the beginning and end of the file can be mode lines? - - augroup resCur | " make cursor appear in its previous position when reopening a file... - autocmd BufReadPost * call setpos(".", getpos("'\"")) - augroup END - - augroup PreviewOnBottom | " will open new windows below the current (only in insert mode, so that the preview window is drawn below) - autocmd InsertEnter * set splitbelow - autocmd InsertLeave * set splitbelow! - augroup END - - augroup OmniFunc | " this will enable omnicomplete just in case this configuration runs somewhere, where YouCompleteMe is not compiled - if exists("+omnifunc") - autocmd Filetype * - \ if &omnifunc == "" | - \ setlocal omnifunc=syntaxcomplete#Complete | - \ setlocal completeopt=longest,menuone | - \ endif - autocmd FileType html set omnifunc=htmlcomplete#CompleteTags - endif - augroup END - - autocmd FileType text setlocal textwidth=78 | " text files: set 'textwidth' to 78 - autocmd FileType gitcommit set tw=72 | " longer commit messages without auto line wrapping - autocmd FileType LaTeX let g:tex_flavor = "latex"| set conceallevel=1| set concealcursor= - autocmd BufNewFile,BufReadPost *.config set filetype=xml | " visual studio config file - autocmd BufNewFile,BufReadPost *.csproj set filetype=xml | " visual studio project file - autocmd BufNewFile,BufReadPost *.sln set filetype=xml | " visual studio solution file -endif - -"================================================================================ -" gui stuff and appearance -if &t_Co > 2 - set hlsearch | " highlight all search matches - set cursorline | " highlight currently selected line -endif - - -if has("gui_running") - set mouse=a | " use mouse in gui-mode (which is default) - set mouseshape+=n:beam,v:beam | " display a text input cursor even in normal and selection mode - set guicursor=n-v-c:ver20-Cursor-blinkon500-blinkoff500 | " how the caret looks like - set guitablabel=%t | " do not display full path as tabname - set guioptions+=m | " menu bar - set guioptions-=T | " toolbar - set guioptions+=r | " right-hand scroll bar - set guioptions-=c | " use console dialogs instead of popups - set guioptions+=a | " autoselect: copy&paste using middleclick - set guioptions+=e | " add tab pages - set guioptions+=p | " use gui pointer callback for x11 - set toolbariconsize=large | " make the icon toolbar as big as possible - "set columns=80 | " set initial window width (so that it fits the terminals) -else - if &term =~? 'mlterm\|xterm\|screen' - set t_Co=256 | " fixes incompatibilities with our color scheme - endif - set mouse=nh | " limits mouse usage to normal mode and help files, so that middle click text insertion works in insert mode - set title | " set the terminal caption - set icon | " sets the terminal icon to vim - set ttyfast | " modern terminals are all fast in a way - "set titleold="vim ended" | " set terminal title after closing vim - "set titlestring="VIM-CONSOLE" | " set window title - "if has('mouse') - "endif -endif - - -"================================================================================ -" custom commands... -" -" assign selection keys (these i missed a lot) -nmap vh| " shift-left selects to the left -xmap h| " ^^ -nmap vl| " shift-right selects to the right -xmap l| " ^^ -nmap vk| " shift-up selects like other text editors -xmap k| " ^^ -nmap vj| " shift down selects like other text editors -xmap j| " ^^ -nmap ^| " default homing in code editors is the first letter of a line -xmap 0| " go to the beginning of the line -xmap 0| " ^^ -xmap >gv| " indent lines (and retain selection) -xmap VH| " selects predessing paragraph -nmap VL| " selects following paragraph -nmap V{| " selects predessing paragraph -nmap V}| " selects following paragraph - -nmap :24vs.| " means the same as :vsplit. and opens the :Exlore -window with a width of 24 - - - - - -map h|map j| " window navigation shortcuts -map k|map l| " window navigation shortcuts - -cmap w!! w !sudo tee % >/dev/null| " write :w!! to execute :w as root user - -" custom hotkeys... -nnoremap :tabnext| " lets one use CTRL+Tab to switch between tabs -nnoremap :tabprevious| " use CTRL+Shift+Tab to switch to preview tab - -nnoremap j gj|nnoremap k gk| " do not jump over wrapped lines - -nnoremap $ g$| " and make the $ key position the cursor after the last char of that line, not before -nnoremap g$| " and make the key position the cursor after the last char of that line -" function ExtendedHome() -" let column = col('.') -" normal! ^ -" if column == col('.') -" normal! 0 -" endif -" endfunction -" noremap :call ExtendedHome() - -nnoremap u - - -"map el -"map hgel -"vnoremap e -"vnoremap b - - -" plugin hotkeys -map :TlistToggle| " bind TagList to Hotkey Ctrl+L -inoremap ( (| " when opening a bracket: call the OmniComplete function, display the menu, but deselect the first entry (C-p) - - -set makeprg=make\ test -nnoremap :!make| " classic key binding: press F5 to compile and execute (if you have a Makefile with make test doing that) - -"================================================================================ -" deactivated on-demand commands (just in case one needs them one day) -" -" code completion: http://vim.wikia.com/wiki/Make_Vim_completion_popup_menu_work_just_like_in_an_IDE -" reacts on CTRL+P, CTRL+Space -"inoremap pumvisible() ? "\" : "\u\" -"inoremap pumvisible() ? "\" : "\" -"inoremap pumvisible() ? "\" : "\" -"inoremap pumvisible() ? "\" : "\" -"inoremap pumvisible() ? "\\\" : "\" -"inoremap pumvisible() ? "\\\" : "\" -" set guiheadroom=0| " do not fill non-functional area of the empty editor with gtk background -" map shift-right to visually select and so on -"nnoremap El -"nnoremap vl -"nnoremap vj -"nnoremap vk -"nnoremap vj -" noremap % v% " jump between braces and highlight -"nnoremap ^ -"vmap ^ -"nnoremap $ -"vmap $ -"nnoremap -"nnoremap -":inoremap pumvisible() ? "\" : "\u\" -"inoremap pumvisible() ? "\" : "\" " breaks cursor keys! -" binding ESC can easily break cursor key movement on the console (tricky, because gvim works) -"inoremap -"inoremap -" -"map OA k|map OB j|map OC l|map OD h| " allow cursor keys in insert mode diff --git a/xdg-additions/applications/gvim-buffer.desktop b/xdg-additions/applications/gvim-buffer.desktop deleted file mode 100644 index 5cd2cbf..0000000 --- a/xdg-additions/applications/gvim-buffer.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Gnome Vi IMproved Buffer -Icon=gvim -Comment=Open file in an existing instance of vi and in a new tab -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gvim -f -N --remote-silent %F -Terminal=false -X-XClassHintResName=VIM -Categories=Utility;TextEditor; diff --git a/xdg-additions/applications/gvim.desktop b/xdg-additions/applications/gvim.desktop deleted file mode 100644 index 37c6e58..0000000 --- a/xdg-additions/applications/gvim.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Vi IMproved Tab -Comment=Open file in an existing instance of vi and in a new tab -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gvim f -N --remote-tab %F -Icon=gvim -Type=Application -Terminal=false -X-XClassHintResName=VIM -Categories=Utility;TextEditor; diff --git a/xdg-additions/applications/nvim.desktop b/xdg-additions/applications/nvim.desktop deleted file mode 100644 index 21f0090..0000000 --- a/xdg-additions/applications/nvim.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Vim -Comment= -Exec=xfce4-terminal --icon /usr/share/icons/HighContrast/256x256/apps/vim.png -T 'nvim' -e '/bin/bash -i -c "env TERM=gnome-256color screen nvr ."' --fullscreen -Icon=/usr/share/icons/HighContrast/256x256/apps/vim.png -Path= -Terminal=false -StartupNotify=false diff --git a/xdg-additions/applications/vim.desktop b/xdg-additions/applications/vim.desktop deleted file mode 100644 index f8efe76..0000000 --- a/xdg-additions/applications/vim.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -X-Desktop-File-Install-Version=0.23 -Type=Application -Name=Vi IMproved->buffer2 -Icon=gvim -Comment=Open file in an existing instance of vi and in a new tab -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -X-XClassHintResName=VIM -Categories=Application;Utility;TextEditor; -# Exec=vim --servername VIM --remote-silent %F -Exec=xfce4-terminal -e "bash -c '~/.bashrc ; vim --servername VIM --remote-silent %F'" -Terminal=true -StartupNotify=true diff --git a/xdg-additions/bashrc b/xdg-additions/bashrc deleted file mode 100644 index 24c51a0..0000000 --- a/xdg-additions/bashrc +++ /dev/null @@ -1,30 +0,0 @@ - -# gvim () { /bin/gvim $(if [[ "$#" > 0 && `/bin/gvim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } -# vim () { /bin/vim $(if [[ "$#" > 0 && `/bin/vim --serverlist | wc -l` ]]; then echo --remote; fi) $@; } - -# man() -# { -# /bin/gvim \ -# $(if [[ `/bin/gvim --serverlist | wc -l` > 0 ]]; then echo --remote-send; fi) \ -# ":enew:0read !groffer --pager='cat' --tty $1 col -bx :set filetype=man buftype=nowrite readonlygg"; -# } - -# export MANPAGER='vim -c":set noswapfile|%!col -b" -c":file man|:setlocal filetype=man buftype=nowrite readonly nonumber nolist signcolumn=no" -' -export MANPAGER="vim -M +MANPAGER -" - -# man() { /bin/vim ":enew:0read !groffer --pager='cat' --tty $1 col -bx :set filetype=man buftype=nowrite readonlygg" -; } -# alias git='git -c color.ui=false' -# export GIT_DIFF_OPTS="--no-color" - - - -git config --global --replace-all color.pager 0 -git config --global --replace-all core.pager 'vim -c":set noswapfile filetype=git buftype=nowrite readonly nolist nonumber signcolumn=no|:file git" -' -# export GIT_PAGER='' - -# alias git="TERM=dumb git" - -# export EDITOR="gvim()" -# export PAGER="tee /tmp/output.txt /dev/stdout | /bin/vim -" - -# --remote-expr ":%!col -b" -c":set buftype=nowrite filetype=man readonly" -'A diff --git a/xdg-additions/default-font.conf b/xdg-additions/default-font.conf deleted file mode 100644 index b1de279..0000000 --- a/xdg-additions/default-font.conf +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - NotoSans-Regular - - - serif - Noto Serif - - - sans-serif - Noto Sans Mono Bold - - - - monospace - - - SauceCodePro Nerd Font Mono - - - 100 - - - dz - - - 14 - - - - - diff --git a/xdg-additions/gtk-3.0.css b/xdg-additions/gtk-3.0.css deleted file mode 100644 index f347a83..0000000 --- a/xdg-additions/gtk-3.0.css +++ /dev/null @@ -1,117 +0,0 @@ -/* -#vim-menubar, -#vim-menubar #menu, -#vim-toolbar, -#vim-gui-drawarea, -#vim-main-window { - color:#6060af; - color: #4e4e4e; - font-family: "Hasklug Nerd Font Mono", "Source Code Pro for Powerline", "Source Code Pro", "Roboto"; - font-weight:bold; - font-size:8pt; - border:0; - outline:0; -} - -* { - border-width:0px; - outline-width:0px; - padding:0; - margin:0; -} - -#vim-menubar -{ - padding-left:1em; - border-bottom:2px solid #ffffff; -} - -#vim-menubar>* -{ - padding-right:1em; - padding-top:.25em; - padding-bottom:.25em; -} - -#vim-menubar>*, -#vim-main-window { - background-color:#ffffff; - color: #4e4e4e; -} - -menu menuitem:backdrop, menu menuitem:backdrop:hover -{ - border:0px; -} -*/ - -window#vim-main-window > box -{ - background:#fff; - border:2px solid #fff; -} - -/* within window > box ... */ -menubar#vim-menubar { - font-family: "monospace", "Hasklug Nerd Font Mono", "Source Code Pro for Powerline", "Source Code Pro", "Roboto"; - font-weight:bold; - font-size:8pt; - background: #fff; - /* background: linear-gradient(180deg, white 85%, black); */ -} - -menubar#vim-menubar menuitem { - background:transparent; -} - -menubar#vim-menubar > menuitem { - padding:.25em; -} - -menubar#vim-menubar menuitem box { - padding:.1em .25em; -} - -menubar#vim-menubar menuitem window -{ - margin-top:1em; -} - -/* opened menu (after being clicked) */ -menubar#vim-menubar menuitem window menu { - padding:1px; - background:linear-gradient(90deg, #ccc, #fff); - -} - -menubar#vim-menubar menuitem window menu menuitem { - padding:0em; - margin:0px; -} - -menubar#vim-menubar menuitem window menu menuitem box { - background:rgba(255,255,255,.5); - padding:.25em; - padding-left:1em; - -} - -menubar#vim-menubar menuitem window menu separator { - margin:0; - background:#fff; - border-top:1px dotted #666; -} - - -menubar#vim-menubar menuitem:hover { - box-shadow:none; - background:rgba(0,0,0,.2); - color:#000; -} - - - -/* -toolbar button { -notebook tab { -*/ diff --git a/ycm_extra_conf.pyc b/ycm_extra_conf.pyc deleted file mode 100644 index b1ae85c..0000000 Binary files a/ycm_extra_conf.pyc and /dev/null differ -- cgit v1.2.3