X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=f59293420e8c60039afd64bc21176a647a3920aa;hb=44322e6673eb383ccd1e8eec1a0f5fdeaa9e3ce1;hp=9dd4900f4fdd72b0b1122e84a9c0b3c5b638c073;hpb=aae88912ca91f22ebec6645a796ee0e0779b0f06;p=dotfiles.git diff --git a/.vimrc b/.vimrc index 9dd4900..f592934 100644 --- a/.vimrc +++ b/.vimrc @@ -55,6 +55,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 +72,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,13 +116,32 @@ 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 set history=1000 " how many command lines are remembered @@ -126,6 +150,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") @@ -174,25 +204,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 @@ -203,19 +220,14 @@ 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 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") @@ -225,13 +237,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 @@ -240,6 +245,18 @@ 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") @@ -250,11 +267,31 @@ 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 + " 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 @@ -267,12 +304,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 @@ -302,11 +343,13 @@ function! SetupEncoding(encoding) call RestorePosition() let b:encoding_set = 1 - execute "edit ++enc=" . a:encoding + 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. @@ -527,6 +570,44 @@ 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 + +function! SetExecutableBit(x) + if !executable('chmod') + return + endif + checktime + let fname = expand("%:p") + let fx = executable(fname) + execute "au FileChangedShell " . fname . " :echo" + if a:x && !fx + !chmod a+x % + elseif !a:x && fx + !chmod a-x % + endif + if v:shell_error + echoerr 'Error running chmod: ' . v:shell_error + endif + checktime + execute "au! FileChangedShell " . fname +endfunction +command! Xbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif + + " ---------- " From http://slobin.pp.ru/vim/_vimrc.html @@ -568,7 +649,8 @@ 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.wikia.com/wiki/How_to_make_fileencoding_work_in_the_modeline) function! AutoEncoding() if &modified && &fileencoding != "" call SetupEncoding(&fileencoding)