X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=4a8453c2a933a4e2556258ec41bff049a290f2b2;hb=6edf846e3fd0060b3ab79da7535df36d1dca687a;hp=0f51857368e923e6984d869de6108727af0efcc3;hpb=9f600768a235bc0f4c2fe1e2e76582baec921130;p=dotfiles.git diff --git a/.vimrc b/.vimrc index 0f51857..4a8453c 100644 --- a/.vimrc +++ b/.vimrc @@ -44,7 +44,9 @@ set whichwrap=b,s,h,l,<,>,[,],~ " Wrap to the previous/next line on all keys and set display=lastline,uhex " Show the last line instead of '@'; show non-printable chars as 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 wrap " Visually wrap long lines " With 'set wrap' wrap long lines at a character in 'breakat' @@ -55,6 +57,7 @@ set sidescroll=1 " The minimal number of columns to scroll horizontally " 5 highlighting +colorscheme phd set nohlsearch " Stop the search highlighting " 6 multiple windows @@ -71,6 +74,10 @@ 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: +" 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} " 9 using the mouse @@ -111,7 +118,31 @@ 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 + set cryptmethod=blowfish " encryption method for file writing: zip or blowfish +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=~/tmp/vim//,$TEMP//,c:/tmp//,c:/temp// +else + 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 +" the file with all path separators substituted to percent '%' signs. +" This will ensure file name uniqueness in the preserve directory. " 21 command line editing @@ -121,6 +152,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") @@ -169,25 +206,12 @@ if has("gui_running") set toolbar=icons,text " how to show the toolbar endif - " set guicursor+=a:blinkon0 " Stop cursor blinking + 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 @@ -198,8 +222,8 @@ if has("gui_running") " The key should select from completion menu without adding a newline imap pumvisible() ? "" : "" " ---------- -else +else if (&term =~ "linux") || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark') \ || has("win32") " Background of the terminal is black or dark grey @@ -210,21 +234,11 @@ else if (&term =~ "linux") execute 'set t_kb=' . nr2char(127) - else - highlight MoreMsg cterm=bold ctermfg=NONE - highlight Question cterm=bold ctermfg=NONE endif 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 @@ -233,21 +247,53 @@ else set t_Sf="\e[3%dm" set t_Sb="\e[4%dm" endif + + " '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") - set ttymouse=xterm " Enable mouse codes under GNU screen + set ttymouse=xterm2 " Enable mouse codes under screen/tmux if empty(&t_ts) " Enable window title under screen/tmux let &t_ts = "\e]2;" 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 + " 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 + + let tmux_start = "\Ptmux;" + let tmux_end = "\\\" + + return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end + endfunction + + let &t_SI .= WrapForTmux("\[?2004h") + let &t_EI .= WrapForTmux("\[?2004l") + + function! XTermPasteBegin() + set pastetoggle=[201~ + set paste + return "" + endfunction + + inoremap [200~ XTermPasteBegin() +endif " Multiline comments often confuse vim syntax highlighting - these maps " allow to resynchronize; the first is faster, the second is more thorough @@ -260,12 +306,16 @@ nmap \ss :syntax sync fromstart " Enable filetype detection filetype plugin indent on +runtime macros/matchit.vim + " Reread me after editing 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 && &buftype == "quickfix" | quit | endif endif " Syntax highlighting @@ -274,14 +324,14 @@ autocmd BufReadPost * syntax on " Restore last known cursor position function! RestorePosition() - if exists('b:position_resored') + if exists('b:position_restored') return endif if line("'\"") > 0 call cursor(line("'\""), col("'\"")) endif - let b:position_resored = 1 + let b:position_restored = 1 endfunction " When editing a file, always jump to the last cursor position (if saved) @@ -289,19 +339,19 @@ autocmd BufReadPost * call RestorePosition() function! SetupEncoding(encoding) - if !has("iconv") || exists('b:encoding_set') + if !has("iconv") || exists('b:encoding_set') || strlen(a:encoding) == 0 return endif - if strlen(a:encoding) > 0 - call RestorePosition() - let b:encoding_set = 1 + call RestorePosition() + let b:encoding_set = 1 + if len(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. @@ -471,7 +521,7 @@ if version >= 700 function! W() " let encodings=filter(split(&fileencodings, ','), 'v:val != "ucs-bom"') let encodings = ['us-ascii'] - if $LC_CTYPE == 'ru_RU.UTF-8' + if $LC_CTYPE =~ 'UTF-8' " UTF-8 or en_US.UTF-8 or ru_RU.UTF-8 or such let encodings += ['utf-8'] elseif $LC_CTYPE == 'ru_RU.KOI8-R' let encodings += ['koi8-r', 'utf-8'] @@ -522,6 +572,45 @@ if exists("$SLOWTERM") 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 +endif + + +" From Tip 212: +" http://vim.wikia.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 + endfunction + function! _BufChangedCB() + autocmd! FileChangedShell + endfunction + command! ToggleXbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif +endif + + " ---------- " From http://slobin.pp.ru/vim/_vimrc.html @@ -563,19 +652,22 @@ endif " Called automagically after every buffer read, enables fileencoding -" setting from modeline (see Tip #911) +" setting from modeline (see Tip #911: +" http://vim.wikia.com/wiki/How_to_make_fileencoding_work_in_the_modeline) function! AutoEncoding() - if exists("b:justloaded") - unlet b:justloaded - if &modified && &fileencoding != "" - call SetupEncoding(&fileencoding) - endif + if &modified && &fileencoding != "" + call SetupEncoding(&fileencoding) + else + redraw endif + autocmd! auto-encoding + augroup! auto-encoding endfunction -" Magic autocommands installed here -autocmd BufReadPost * let b:justloaded = 1 +augroup auto-encoding +autocmd! autocmd BufWinEnter * call AutoEncoding() +augroup END let CONVERT=1 @@ -725,14 +817,5 @@ command! UName call Uname() endif " ---------- -augroup redraw-once -autocmd! -" Redraw screen after all macros in ~/.vimrc and ~/.vim/ -autocmd BufReadPost * redraw -" Remove the redraw autocommand (it's only needed once) and the autgroup -autocmd BufReadPost * autocmd! redraw-once -autocmd BufReadPost * augroup! redraw-once -augroup END - " 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