X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=1138c837bf5f7437096a23b0e4b4f537d25b0e0f;hp=f3d60e5d986f3e16d3eec60df80ec229fc884e9c;hb=HEAD;hpb=757315ac7f99dcc3b167471721ca90336e5e4d1a diff --git a/.vimrc b/.vimrc index f3d60e5..dfa434f 100644 --- a/.vimrc +++ b/.vimrc @@ -22,6 +22,10 @@ if exists("b:wrap") " Only do this on the second and subsequent :source's set nomodified endif unlet fenc ftype mod + +elseif filereadable($VIMRUNTIME . "/defaults.vim") + unlet! skip_defaults_vim + source $VIMRUNTIME/defaults.vim endif " No, it is not VI, it is VIM! It is important to set this first, because this @@ -34,6 +38,7 @@ behave xterm " 2 moving around, searching and patterns set ignorecase " Ignore case in search patterns +set noincsearch " No incremental searching set smartcase " Match 'word' case-insensitive and 'Word' case-sensitive set nostartofline " Keep cursor's column @@ -42,9 +47,16 @@ set whichwrap=b,s,h,l,<,>,[,],~ " Wrap to the previous/next line on all keys and " 4 displaying text set display=lastline,uhex " Show the last line instead of '@'; show non-printable chars as -set lazyredraw " Do not update screen while executing macros + +" Do not set it here, it breaks initial screen drawing and cursor positioning. +" See SetLazyRedraw at the end of the script. +" set lazyredraw " Do not update screen while executing macros + set list " listchars only works with 'list' -set listchars=tab:>_,trail:_,extends:+ " Show tabs, trailing spaces, long lines +" Show tabs, non-breaking/trailing spaces, long lines +set listchars=tab:>_,nbsp:_,trail:_,extends:+,precedes:+ +" Another usefull additions: eol:$,space:_ +set scrolloff=0 " number of screen lines to show around the cursor set wrap " Visually wrap long lines " With 'set wrap' wrap long lines at a character in 'breakat' @@ -55,12 +67,14 @@ set sidescroll=1 " The minimal number of columns to scroll horizontally " 5 highlighting +colorscheme phd set nohlsearch " Stop the search highlighting " 6 multiple windows set hidden " Don't unload a buffer when no longer shown in a window; allow to switch between buffers/windows when the buffer is modified set laststatus=2 " Always show status line +" set statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P " Default statusline set splitbelow " A new window is put below of the current one set splitright " A new window is put right of the current one @@ -71,19 +85,28 @@ set ttyfast " terminal connection is fast set title " Set title to the value of 'titlestring' or to 'filename - VIM' set titleold= " string to restore the title to when exiting Vim -" String to use for the Vim window title; with statusline printf items: +" String to use for the Vim window title; with statusline printf items. +" This is the default: +" display filename, modification flag, full path, and program name in uppercase. +" set titlestring=%t%(\ %M%)%(\ (%{substitute(expand(\"%:p:h\"),\ $HOME,\ \"~\",\ \"\")})%)%(\ %a%)\ -\ %{toupper(v:progname)} " display filename, modification flag, full path, argument list status, " the current user, host and program name (to distinguish vim/view/etc). -set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ [%{$USER}@%{hostname()}]\ %{v:progname} +set titlestring=%t%(\ %M%)%(\ (%{substitute(expand(\"%:p:h\"),\ $HOME,\ \"~\",\ \"\")})%)%(\ %a%)\ -\ %{v:progname}\ [%{$USER}@%{hostname()}] " 9 using the mouse -set mouse=ar " Use mouse in all modes, plus hit-return +if has('mouse') + set mouse=ar " Use mouse in all modes, plus hit-return +endif " 12 messages and info set ruler " Show cursor position below each window set showcmd " Show (partial) command keys in the status line +set visualbell " Use visual bell instead of beeping +if v:version >= 800 + set belloff=error,insertmode " Do not ring the bell for these reasons +endif " Short message for [Modified]; " overwrite message for writing a file with subsequent message; @@ -115,7 +138,7 @@ set noautoindent " Do not automatically set the indent of a new line " 18 mapping -set timeout timeoutlen=3000 " allow timing out up to 3 seconds halfway into a mapping +set timeout timeoutlen=3000 ttimeoutlen=100 " allow timing out up to 3 seconds halfway into a mapping; 100 ms to wait for a key code or mapped key sequence to complete " 19 reading and writing files if v:version >= 703 @@ -124,11 +147,17 @@ endif " 20 the swap file +let myUndoDir = expand('~/tmp/vim/undo') +if !isdirectory(myUndoDir) + " Create dirs + call mkdir(myUndoDir, 'p') +endif + " list of directories for the swap file; remove . (the current directory) if has("win32") - set directory=$TEMP//,c:/tmp//,c:/temp// + set directory=~/tmp/vim//,$TEMP//,c:/tmp//,c:/temp// else - set directory=~/tmp//,/var/tmp//,/tmp// + set directory=~/tmp/vim//,~/tmp//,/var/tmp//,/tmp// endif " if a directory ends in two path separators "//" " or "\\", the swap file name will be built from the complete path to @@ -143,6 +172,12 @@ set wildignore+=*.py[co] " Ignore these patterns when completing file names set wildmenu " command-line completion shows a list of matches set wildmode=longest,list:longest,full " Bash-vim completion behavior +" Keep undo history across sessions by storing it in a file +if has('persistent_undo') + let &undodir = myUndoDir + set undofile +endif + " 22 executing external commands if has("filterpipe") @@ -162,15 +197,16 @@ set fileencodings=ucs-bom,us-ascii,utf-8,koi8-r,cp1251,cp866,latin1 " ' - number of files for which the marks are remembered; " " and < - maximum number of lines saved for a register; " s - maximum size of an item in Kbytes. +set viminfo=!,h,'50 if version < 603 - set viminfo=!,h,'50,\"1000 + set viminfo+=\"1000 else - set viminfo=!,h,'50,<1000,s10 + set viminfo+=<1000,s10 endif " c - convert viminfo to the current encoding; if has("iconv") - set viminfo^=c + set viminfo+=c endif " Removable media paths @@ -186,30 +222,19 @@ if has("gui_running") if has("win32") "set guifont=Courier_New:h18:cRUSSIAN set guifont=Lucida_Console:h18:cRUSSIAN - else - set guifont=Monospace\ 16 + elseif has("x11") + set guifont=Monospace\ 18 set toolbar=icons,text " how to show the toolbar endif - " set guicursor+=a:blinkon0 " Stop cursor blinking + set guicursor+=n:block " Block cursor in normal mode + set guicursor+=i:ver10 " Solid vertical bar in insert mode + set guicursor+=a:blinkon0 " Stop cursor blinking " Make shift-insert work like in Xterm " map " map! - - " Set nice colors - " Background for normal text is light grey - " Cursor is green - " Text below the last line is darker grey - " Status line is bright white on blue - highlight Normal guibg=grey90 - highlight Cursor guibg=green guifg=NONE - highlight NonText guibg=grey80 - highlight Constant guibg=grey90 - highlight Special gui=NONE guibg=grey90 - highlight StatusLine gui=bold guifg=white guibg=blue - " ---------- " From http://slobin.pp.ru/vim/_vimrc.html @@ -220,19 +245,15 @@ if has("gui_running") " The key should select from completion menu without adding a newline imap pumvisible() ? "" : "" " ---------- -else - if (&term =~ "linux") || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark') +else + if (&term =~ "linux") || (&term =~ "cygwin") || (&term =~ "putty") + \ || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark') \ || has("win32") " Background of the terminal is black or dark grey set background=dark - highlight MoreMsg ctermfg=white - highlight ModeMsg ctermfg=white - highlight Question ctermfg=white else set background=light - highlight MoreMsg cterm=bold ctermfg=NONE - highlight Question cterm=bold ctermfg=NONE endif if (&term =~ "linux") @@ -242,13 +263,6 @@ else if (&term =~ "rxvt") || (&term =~ "screen") || (&term =~ "term") || (&term =~ "vt100") execute 'set t_kb=' . nr2char(127) - " 'autoselect' to always put selected text on the clipboard; - " 'unnamed' to use the * register like unnamed register '*' - " for all yank, delete and put operations; - " This allows to use mouse for copy/paste in local xterm, - " but prevents to save the unnamed register between sessions. - " set clipboard=autoselect,unnamed,exclude:cons\|linux - if has ("terminfo") " set t_Co=256 set t_Co=16 @@ -257,6 +271,38 @@ else set t_Sf="\e[3%dm" set t_Sb="\e[4%dm" endif + + " KP_Up -> Up + map Ox OA + map! Ox OA + " KP_Down -> Down + map Or OB + map! Or OB + " KP_Right -> Right + map Ov OC + map! Ov OC + " KP_Left -> Left + map Ot OD + map! Ot OD + " KP_Home -> Home + map Ow [7~ + map! Ow [7~ + " KP_End -> End + map Oq [8~ + map! Oq [8~ + " KP_Prev (PgDn) and KP_Next (PgUp) work fine, no mapping is required + + " 'autoselect' to always put selected text on the clipboard; + " 'unnamed' to use the * register like unnamed register '*' + " for all yank, delete and put operations; + " This allows to use mouse for copy/paste in local xterm, + " but prevents to save the unnamed register between sessions. + " set clipboard=autoselect,unnamed,exclude:cons\|linux + + " Use xclip to copy/paste to/from X clipboard at remote host + " vmap "+y :!xclip -i -sel clip + " map "+p :r!xclip -o -sel clip + " Enable X11Forwarding and use ssh -X or even -Y endif if (&term =~ "screen") @@ -267,11 +313,42 @@ else let &t_fs = "\007" endif endif -endif -highlight SpellBad term=underline cterm=NONE ctermfg=white ctermbg=red guifg=white guibg=red " gui=undercurl guisp=red -highlight StatusLine cterm=bold ctermfg=white ctermbg=blue gui=NONE guifg=white guibg=blue -highlight Visual cterm=NONE ctermfg=white ctermbg=blue gui=NONE guifg=white guibg=blue " Selection highlighting + " https://coderwall.com/p/if9mda/automatically-set-paste-mode-in-vim-when-pasting-in-insert-mode + " https://ttssh2.osdn.jp/manual/en/usage/tips/vim.html + function! WrapForScreenTmux(s) + if (&term =~ "screen") + let scr_start = "\P" + let scr_end = "\\\" + + return scr_start . a:s . scr_end + endif + + if exists('$TMUX') + let tmux_start = "\Ptmux;" + let tmux_end = "\\\" + + return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end + endif + + return a:s + endfunction + + " https://vim.fandom.com/wiki/Change_cursor_shape_in_different_modes + let &t_EI.=WrapForScreenTmux("\e[2 q") "EI = NORMAL mode (ELSE) + let &t_SI.=WrapForScreenTmux("\e[6 q") "SI = INSERT mode + if v:version >= 800 + let &t_SR.=WrapForScreenTmux("\e[4 q") "SR = REPLACE mode + endif + + "Cursor settings: + " 1 -> blinking block + " 2 -> solid block + " 3 -> blinking underscore + " 4 -> solid underscore + " 5 -> blinking vertical bar + " 6 -> solid vertical bar +endif " Multiline comments often confuse vim syntax highlighting - these maps " allow to resynchronize; the first is faster, the second is more thorough @@ -292,6 +369,9 @@ autocmd BufWritePost ~/.vimrc source ~/.vimrc | syntax on if version >= 700 " Save all files before running any quickfix command (grep, makeprg, etc.) autocmd QuickFixCmdPre * wall +" automatically close quickfix if it's the only window left +autocmd WinEnter * if winnr('$') == 1 && + \ index(["nofile", "quickfix"], &buftype) >= 0 | quit | endif endif " Syntax highlighting @@ -315,17 +395,19 @@ autocmd BufReadPost * call RestorePosition() function! SetupEncoding(encoding) - if !has("iconv") || exists('b:encoding_set') || strlen(a:encoding) == 0 + if !has("iconv") || exists('b:encoding_set') || empty(a:encoding) return endif call RestorePosition() let b:encoding_set = 1 - execute "edit ++enc=" . a:encoding + if !empty(expand('%')) + execute "edit ++enc=" . a:encoding + endif endfunction -" http://lwn.net/Articles/226514/ +" From http://lwn.net/Articles/226514/ augroup gpg " Remove ALL autocommands for the current group. @@ -385,7 +467,7 @@ function! ExtractURL() let line = getline('.') let parts = split(line, s:URL_re . '\zs') - if len(parts) == 0 + if empty(parts) throw 'ExtractURLCannotFindURL' " No URL found endif @@ -441,10 +523,12 @@ endfunction nmap \b :call ExtractOpenURL('') nmap \w :call ExtractOpenURL('-n') nmap \t :call ExtractOpenURL('-t') +nmap \p :call ExtractOpenURL('-p') " Send visual block to a browser vmap \b ""y:call OpenURL('"', '') vmap \w ""y:call OpenURL('"', '-n') vmap \t ""y:call OpenURL('"', '-t') +vmap \p ""y:call OpenURL('"', '-p') " Encode and send visual block to a browser vmap \B ""y:call EncodeOpenURL('"', '') vmap \W ""y:call EncodeOpenURL('"', '-n') @@ -508,13 +592,13 @@ function! W() execute 'set fileencoding=' . e w break - catch /E513: write error, conversion failed/ + catch /E513: [Ww]rite error, conversion failed/ continue endtry endfor if &modified - throw '"' . expand('%') . '" E513: write error, conversion failed; tried ' . join(encodings, ',') + throw '"' . expand('%') . '" E513: Write error, conversion failed; tried ' . join(encodings, ',') elseif has("spell") call SetupSpell() endif @@ -537,6 +621,9 @@ function! SlowTerm() set nowildmenu set wildmode=list:longest set viminfo=!,h,'10,<100,s5 + if has("iconv") + set viminfo+=c + endif syntax off highlight NonText cterm=NONE ctermfg=NONE endfunction @@ -546,6 +633,51 @@ if exists("$SLOWTERM") endif +if has("python") +pyfile ~/.vim/python/virtualenv.py +endif + +if has("python3") +py3file ~/.vim/python/virtualenv.py +endif + + +" From Tip 212: +" http://vim.fandom.com/wiki/Setting_file_attributes_without_reloading_a_buffer + +if executable('chmod') + function! SetExecutableBit(x) + checktime + " Avoid 'Reload Y/N?' question + autocmd FileChangedShell call _BufChangedCB() + let fx = executable(expand("%:p")) + if a:x && !fx + silent !chmod a+x % + elseif !a:x && fx + silent !chmod a-x % + endif + if v:shell_error + echoerr 'Error running chmod: ' . v:shell_error + endif + checktime + autocmd! FileChangedShell + endfunction + function! _BufChangedCB() + autocmd! FileChangedShell + endfunction + command! ToggleXbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif +endif + +function! Code() + setlocal expandtab tabstop=8 softtabstop=4 shiftwidth=4 +endfunction +command! Code call Code() + +function! Text() + setlocal expandtab tabstop=8 softtabstop=3 shiftwidth=3 +endfunction +command! Text call Text() + " ---------- " From http://slobin.pp.ru/vim/_vimrc.html @@ -587,12 +719,11 @@ endif " Called automagically after every buffer read, enables fileencoding -" setting from modeline (see Tip #911: http://vim.wikia.com/wiki/VimTip911) +" setting from modeline (see Tip #911: +" http://vim.fandom.com/wiki/How_to_make_fileencoding_work_in_the_modeline) function! AutoEncoding() if &modified && &fileencoding != "" call SetupEncoding(&fileencoding) - else - redraw endif autocmd! auto-encoding augroup! auto-encoding @@ -657,6 +788,15 @@ if has("spell") endif endfunction autocmd BufReadPost * call SetupSpell() + + function! SaveSpell() + if expand('%:p') == expand('~/.vim/spell/en.ascii.add') + mkspell! -ascii % + else + mkspell! % + endif + endfunction + autocmd BufWritePost ~/.vim/spell/*.add call SaveSpell() endif @@ -666,70 +806,7 @@ endfunction if has("python") - -python << END_OF_PYTHON - -import sys, rlcompleter, unicodedata, vim -from itertools import * -vim_complete = rlcompleter.Completer().complete - -def vim_comp_list(): - """Implementation of CompList() function""" - arglead = vim.eval("a:ArgLead") - fence = int(vim.eval("match(a:ArgLead, '\(\w\|\.\)*$')")) - left, right = arglead[:fence], arglead[fence:] - try: - completions = (vim_complete(right, i) for i in count()) - candidates = list(takewhile(bool, completions)) - except NameError: - candidates = [] - suggestions = [left + x for x in candidates] - vim.command("return " + repr(suggestions)) - -def vim_calc(command): - """Implementation of :Calc command""" - global _ - try: - result = eval(command) - except SyntaxError: - exec command in globals() - else: - if result != None: - print result - _ = result - xx = ''.join('\\x%02x' % ord(x) for x in str(_)) - vim.command('let @" = "%s"' % xx) - -def vim_pydo(command): - """Implementation of :Pydo command""" - codeobj = compile(command, "command", "eval") - line1 = vim.current.range.start - line2 = vim.current.range.end - delta = 0 - for numz in range(line1, line2+1): - line = vim.current.buffer[numz-delta] - uline = unicode(line, vim.eval('&fileencoding')) - num = numz + 1 - words = line.split() - result = eval(codeobj, globals(), locals()) - if result is None or result is False: - del vim.current.buffer[numz-delta] - delta += 1 - continue - if isinstance(result, list) or isinstance(result, tuple): - result = " ".join(map(str, result)) - else: - result = str(result) - vim.current.buffer[numz-delta] = result - -def vim_unicode_name(): - try: - char = vim.eval("matchstr(getline('.'), '.', col('.') - 1)") - print map(unicodedata.name, char.decode(vim.eval("&encoding"))) - except (AttributeError, ValueError), target: - print "%s: %s" % (target.__class__.__name__, target.message) - -END_OF_PYTHON +pyfile ~/.vim/python/completion.py " Custom completion for python expressions function! CompList(ArgLead, CmdLine, CursorPos) @@ -746,10 +823,42 @@ command! -nargs=+ -range -complete=customlist,CompList Pydo " Display unicode name for the character under cursor command! Uname python vim_unicode_name() -command! UName call Uname() +endif + +if has("python3") +py3file ~/.vim/python/completion.py + +" Custom completion for python expressions +function! CompList(ArgLead, CmdLine, CursorPos) + python3 vim_comp_list() +endfunction + +" Python command line calculator +command! -nargs=+ -range -complete=customlist,CompList Calc + \ , python3 vim_calc() +" Python text range filter +command! -nargs=+ -range -complete=customlist,CompList Pydo + \ , python3 vim_pydo() + +" Display unicode name for the character under cursor +command! Uname python3 vim_unicode_name() +endif + +if has("python") || has("python3") +command! UName Uname endif " ---------- +if v:version >= 800 + function! SetLazyRedraw(timer_id) + call timer_stop(a:timer_id) " One-time event + set lazyredraw + endfunction + call timer_start(500, 'SetLazyRedraw') +endif + +autocmd VimLeave * call writefile([getcwd()], expand('~/tmp/vim/cwd')) + " This has to go to the very end of ~/.vimrc to allow reading the .vimrc set secure " safer working with script files in the current directory