X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/77356398da5943e6b6fb4a88114a40526bf6039c..00cc79588b09872e703c1a572822de0c59a13a74:/vimrc?ds=sidebyside

diff --git a/vimrc b/vimrc
index 6a2047b..7269ee3 100644
--- a/vimrc
+++ b/vimrc
@@ -22,6 +22,28 @@ set wrap                       " wrap lines
 set linebreak                  " do not wrap in the middle of a word
 set showbreak=▒▒               " show these chars for wrapped lines
 
+" indent {{{1
+set expandtab           " expand <Tab> to spaces in Insert mode
+set smarttab            " a <Tab> in an indent inserts 'shiftwidth' spaces
+set softtabstop=4       " if non-zero, number of spaces to insert for a <Tab>
+set shiftwidth=4        " number of spaces used for each step of (auto)indent
+set shiftround          " round to 'shiftwidth' for "<<" and ">>"
+
+set cindent             " use smart C indenting (see :h C-indenting)
+set cinoptions=l1,c4,(0,U1,w1,m1,j1,J1
+
+:nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
+:nmap <Leader>B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4<CR>
+:nmap <Leader>M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4<CR>
+:nmap <Leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
+
+" backup/undo {{{1
+set backup      " keep a backup file
+set backupdir=$HOME/.vim/backupdir
+
+set undofile    " persistent undo history
+set undodir=$HOME/.vim/backupdir
+
 " NERDTree {{{1
 " open/close NERDTree with \e
 nmap <Leader>e :NERDTreeToggle<CR>
@@ -35,20 +57,6 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree
 " airline {{{1
 let g:airline#extensions#tabline#enabled = 1
 
-" tabbing {{{1
-:nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
-:nmap <Leader>B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4<CR>
-:nmap <Leader>M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4<CR>
-:nmap <Leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
-
-" backup {{{1
-if has("vms")
-  set nobackup          " do not keep a backup file, use versions instead
-else
-  set backup            " keep a backup file
-  set backupdir=$HOME/.vim/backupdir
-endif
-
 " appearance {{{1
 set background=dark            " Dark background, d'uh!
 set number                     " show some linenumbers
@@ -67,10 +75,6 @@ set scrolloff=5                " keep at least n lines above/below
 
 set viminfo='100,<50,s10,h,n~/.vim/viminfo " viminfo defaults but save file in .vim
 
-" tabs {{{1
-set softtabstop=4
-set shiftwidth=4
-set expandtab
 
 " misc bindings {{{1
 " Don't use Ex mode, use Q for formatting