From a4800814d624d92ed58fbfc09f8689b04f16c744 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 20 Oct 2022 08:20:28 -0700 Subject: [PATCH] [nvim] Changes to vimrc and vimrc.common from long ago --- vimrc | 14 +++++++------- vimrc.common | 16 +++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/vimrc b/vimrc index 5d72503..32c7e5e 100644 --- a/vimrc +++ b/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 diff --git a/vimrc.common b/vimrc.common index a533e1c..d94945e 100644 --- a/vimrc.common +++ b/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 fa :%s/\v nnoremap f :call SelectaCommand("find * -type f", "", ":e") -nnoremap cl :setlocal invcursorline -nnoremap cc :setlocal invcursorcolumn - " Text bubbling (these depend on tpope's unimpaired plugin) nnoremap [e nnoremap ]e -vnoremap [egv -vnoremap ]egv +vnoremap [egv +vnoremap ]egv " Select last edited text after cut and paste nnoremap gV `[v`]