Revert "change termname"

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 77ebad01ba5d0caaa8dc147bb2bb5566a4d572cb..a9040f14a22a5ffc9dd265b040e395c0362e282f 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -18,6 +18,17 @@ set hlsearch                    " highlight all matches for the last used search
 nmap <silent> <Leader>n :silent nohl<CR>
 " use leader-# to display the number of matches for the last search
 nmap <Leader># :%s:<C-R>/::gn<CR>
 nmap <silent> <Leader>n :silent nohl<CR>
 " use leader-# to display the number of matches for the last search
 nmap <Leader># :%s:<C-R>/::gn<CR>

+" center cursor after search
+nnoremap n nzz
+" disable arrows
+inoremap <Up> <NOP>
+inoremap <Down> <NOP>
+inoremap <Left> <NOP>
+inoremap <Right> <NOP>
+noremap <Up> <NOP>
+noremap <Down> <NOP>
+noremap <Left> <NOP>
+noremap <Right> <NOP>

 
 set nostartofline       " don't  move the cursor to the first non-blank char of a line
 set path=.,**           " current + subdirectory search for :find, :grep:, ...
 
 set nostartofline       " don't  move the cursor to the first non-blank char of a line
 set path=.,**           " current + subdirectory search for :find, :grep:, ...


@@ -107,6 +118,18 @@ set nrformats=hex               " number formats recognized for CTRL-A and CTRL-
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 

+" Indent if we're at the beginning of a line. Else, do completion.
+function! InsertTabWrapper()
+  let col = col('.') - 1
+  if !col || getline('.')[col - 1] !~ '\k'
+    return "\<Tab>"
+  else
+    return "\<C-N>"
+endif
+endfunction
+inoremap <Tab> <C-R>=InsertTabWrapper()<CR>
+inoremap <S-Tab> <C-P>
+

 " fix legacy vi inconsistency
 map Y y$
 
 " fix legacy vi inconsistency
 map Y y$
 


@@ -159,7 +182,7 @@ set writebackup                 " write a backup file before overwriting a file
 set backup                      " keep a backup after owerwriting a file
 set backupdir=$HOME/.vim/backupdir
 
 set backup                      " keep a backup after owerwriting a file
 set backupdir=$HOME/.vim/backupdir
 

-set undofile    " persistent undo history
+set undofile                    " persistent undo history

 set undodir=$HOME/.vim/backupdir
 
 set autowrite                   " automatically write a file when leaving a modified buffer
 set undodir=$HOME/.vim/backupdir
 
 set autowrite                   " automatically write a file when leaving a modified buffer


@@ -219,6 +242,9 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 

+" YouCompleteMe {{{2
+let g:ycm_extra_conf_globlist = ['/mnt/data/src/*']
+

 " functions {{{1
 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.
 " functions {{{1
 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.


@@ -227,4 +253,3 @@ if !exists(":DiffOrig")
   command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
                   \ | wincmd p | diffthis
 endif
   command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
                   \ | wincmd p | diffthis
 endif

-