lib/config/gpg-agent-update-tty: Change gpg-connect-agent command line

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 88925276d9b817e00f52f7222470d70a860f8a5f..f59293420e8c60039afd64bc21176a647a3920aa 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -125,11 +125,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
@@ -144,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")
@@ -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,6 +267,30 @@ else
          let &t_fs = "\007"
       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
+
+     let tmux_start = "\<Esc>Ptmux;"
+     let tmux_end = "\<Esc>\\"
+
+     return tmux_start . substitute(a:s, "\<Esc>", "\<Esc>\<Esc>", 'g') . tmux_end
+   endfunction
+
+   let &t_SI .= WrapForTmux("\<Esc>[?2004h")
+   let &t_EI .= WrapForTmux("\<Esc>[?2004l")
+
+   function! XTermPasteBegin()
+     set pastetoggle=<Esc>[201~
+     set paste
+     return ""
+   endfunction
+
+   inoremap <special> <expr> <Esc>[200~ XTermPasteBegin()
 endif
 
 " Multiline comments often confuse vim syntax highlighting - these maps
@@ -272,7 +313,7 @@ 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" | q | endif
+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)