X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=7bb96e27e7398e5b2ebf9ac7c63e4b2b12331c42;hp=d743be717f83686b9ed92935f7260d87224116f9;hb=5080a18901c90727c7dd11cc43bdefbad53f42c7;hpb=85887d410140eb8dd603b20a5fe006fc79f30530 diff --git a/.vimrc b/.vimrc index d743be7..7bb96e2 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' @@ -79,7 +91,9 @@ set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ [%{$USER}@%{h " 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 @@ -175,15 +189,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 @@ -204,6 +219,8 @@ if has("gui_running") set toolbar=icons,text " how to show the toolbar endif + 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 @@ -222,7 +239,8 @@ if has("gui_running") " ---------- else - if (&term =~ "linux") || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark') + 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 @@ -268,29 +286,59 @@ else endif endif - " Automatically set paste mode in Vim when pasting in bracketed paste mode - " https://coderwall.com/p/if9mda/automatically-set-paste-mode-in-vim-when-pasting-in-insert-mode - function! WrapForTmux(s) - if !exists('$TMUX') - return a:s - endif + " Bracketed paste mode + " https://github.com/ConradIrwin/vim-bracketed-paste/blob/master/plugin/bracketed-paste.vim + let &t_ti .= "\[?2004h" + let &t_te = "\e[?2004l" . &t_te - let tmux_start = "\Ptmux;" - let tmux_end = "\\\" - - return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end + function! XTermPasteBegin(ret) + set pastetoggle= + set paste + return a:ret endfunction - let &t_SI .= WrapForTmux("\[?2004h") - let &t_EI .= WrapForTmux("\[?2004l") + execute "set =\[200~" + execute "set =\[201~" + map XTermPasteBegin("i") + imap XTermPasteBegin("") + vmap XTermPasteBegin("c") + cmap + cmap + + "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 - function! XTermPasteBegin() - set pastetoggle=[201~ - set paste - return "" + if exists('$TMUX') + let tmux_start = "\Ptmux;" + let tmux_end = "\\\" + + return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end + endif + + return a:s endfunction - inoremap [200~ XTermPasteBegin() + " 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 @@ -313,7 +361,8 @@ 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 && &buftype == "quickfix" | quit | endif +autocmd WinEnter * if winnr('$') == 1 && + \ index(["nofile", "quickfix"], &buftype) >= 0 | quit | endif endif " Syntax highlighting @@ -337,13 +386,13 @@ 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 - if len(expand('%')) + if !empty(expand('%')) execute "edit ++enc=" . a:encoding endif endfunction @@ -409,7 +458,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 @@ -561,6 +610,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 @@ -571,40 +623,49 @@ endif if has("python") -python << END_OF_PYTHON -import sys, os - -virtualenv_dir = os.environ.get('VIRTUAL_ENV') -if virtualenv_dir: - sys.path.insert(0, virtualenv_dir) - activate_this = os.path.join(virtualenv_dir, 'bin', 'activate_this.py') - execfile(activate_this, dict(__file__=activate_this)) -END_OF_PYTHON +pyfile ~/.vim/python/virtualenv.py +endif + +if has("python3") +py3file ~/.vim/python/virtualenv.py endif " From Tip 212: -" http://vim.wikia.com/wiki/Setting_file_attributes_without_reloading_a_buffer +" 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! SetExecutableBit(x) - if !executable('chmod') - return - endif - checktime - let fname = expand("%:p") - execute "au FileChangedShell " . fname . " :echo" - if a:x - silent !chmod a+x % - else - silent !chmod a-x % - endif - if v:shell_error - echoerr 'Error running chmod: ' . v:shell_error - endif - checktime - execute "au! FileChangedShell " . fname +function! Code() + setlocal expandtab tabstop=8 softtabstop=4 shiftwidth=4 endfunction -command! Xbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif +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 @@ -648,12 +709,10 @@ command! Xbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | c " Called automagically after every buffer read, enables fileencoding " setting from modeline (see Tip #911: -" http://vim.wikia.com/wiki/How_to_make_fileencoding_work_in_the_modeline) +" 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 @@ -718,6 +777,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 @@ -727,70 +795,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) @@ -807,10 +812,40 @@ 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 + " 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