[nvim] Changes to vimrc and vimrc.common from long ago

vimrc

@@ -3,16 +3,16 @@
 
 source ~/.vimrc.common
 
-" Set this first for Vundle
 set nocompatible        " use enhanced vim features
 
-set backupdir=$VIM/backup
-                        " save backup files here
-set undodir=$VIM/undo   " save undo files here
+let s:localdir=expand("~/.local/vim")
+if !isdirectory(s:localdir)
+    call mkdir(s:localdir, "p")
+endif
 
-" Shared data file. The vim and nvim formats are incompatible so this needs to 
-" be set differently for vim and nvim.
-set viminfofile=$VIM/vim_shared_data
+let &backupdir=expand(s:localdir . "/backup//" . ",.")
+let &undodir=expand(s:localdir . "/undo//")
+let &viminfofile=expand(s:localdir . "/viminfo")
 
 " Shada data. Parameters as follows: (see :help shada)
 "   %   number of buffers to save and restore when no file argument is given

vimrc.common

@@ -3,18 +3,11 @@
 
 " This file holds settings common to nvim and vim.
 
-" Set the location of my vim directory.
-let $VIM = $HOME."/.vim"
-
-" This will be enabled eventually, but it needs to be off for Vundle to work,
-" apparently?
-filetype off
-
 "
 " VUNDLE PLUGINS
 "
 
-set runtimepath+=$VIM/bundle/Vundle.vim
+set runtimepath+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
 Plugin 'gmarik/Vundle.vim'
@@ -289,14 +282,11 @@ nnoremap <leader>fa :%s/\v
 
 nnoremap <leader>f :call SelectaCommand("find * -type f", "", ":e")<cr>
 
-nnoremap <silent> <leader>cl :setlocal invcursorline<CR>
-nnoremap <silent> <leader>cc :setlocal invcursorcolumn<CR>
-
 " Text bubbling (these depend on tpope's unimpaired plugin)
 nnoremap <C-Up> [e
 nnoremap <C-Down> ]e
-vnoremap <C-Up> [egv
-vnoremap <C-Down> ]egv
+vnoremap <C-k> [egv
+vnoremap <C-j> ]egv
 
 " Select last edited text after cut and paste
 nnoremap gV `[v`]