feat: modern neovim support

Author: mutewinter

README.md

@@ -11,8 +11,8 @@ Version 3! Now each plugin is included and managed in its
 
 ## Installation
 
-1. `git clone http://github.com/mutewinter/dot_vim.git ~/.vim`.
-1. `cd ~/.vim`.
+1. `git clone http://github.com/mutewinter/dot_vim.git ~/.config/nvim`.
+1. `cd ~/.config/nvim`.
 
 Now you have a choice. The automated script or the manual process.
 
@@ -21,7 +21,7 @@ Now you have a choice. The automated script or the manual process.
 **or**
 
 1. `rake vim:link` to make the `.vimrc` and `.nvimrc` symbolic links.
-2. Install [Vundle](https://github.com/VundleVim/Vundle.vim) with `git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim`
+2. Install [Vundle](https://github.com/VundleVim/Vundle.vim) with `git clone https://github.com/VundleVim/Vundle.vim.git ~/.config/nvim/bundle/Vundle.vim`
 3. `vim +PluginInstall +qall`
 
 Enjoy enhanced productivity, increased levitation, reduced watermelon-related

config.vim

@@ -15,13 +15,14 @@ endif
 " -----------------------------
 " File Locations
 " -----------------------------
-set backupdir=~/.vim/.backup// " Double // causes backups to use full file path
-set directory=~/.vim/.tmp//
-set spellfile=~/.vim/spell/custom.en.utf-8.add
+" Double // causes backups to use full file path
+exec 'set backupdir=' . g:vimdir . '/.backup//'
+exec 'set directory=' . g:vimdir . '/.tmp//'
+exec 'set spellfile=' . g:vimdir . '/spell/custom.en.utf-8.add'
 " Persistent Undo
 if has('persistent_undo')
   set undofile
-  set undodir=~/.vim/.undo
+  exec 'set undodir=' . g:vimdir . '/.undo'
 endif
 
 " ---------------

vimrc renamed to init.vim

@@ -4,23 +4,30 @@
 " Version: 3.0 - Now each plugin is included and managed in its own file!
 " =============================================================================
 
+
+if has('nvim')
+  let g:vimdir = "~/.config/nvim"
+else
+  let g:vimdir = "~/.vim"
+endif
+
 " All of the plugins are installed with Vundle from this file.
-source ~/.vim/vundle.vim
+exec "source " . g:vimdir . "/vundle.vim"
 
 " Automatically detect file types. (must turn on after Vundle)
 filetype plugin indent on
 
 " Platform (Windows, Mac, etc.) configuration.
-source ~/.vim/platforms.vim
+exec "source " . g:vimdir . "/platforms.vim"
 " All of the Vim configuration.
-source ~/.vim/config.vim
+exec "source " . g:vimdir . "/config.vim"
 " New commands
-source ~/.vim/commands.vim
+exec "source " . g:vimdir . "/commands.vim"
 " All hotkeys, not dependant on plugins, are mapped here.
-source ~/.vim/mappings.vim
+exec "source " . g:vimdir . "/mappings.vim"
 " Load plugin-specific configuration.
-source ~/.vim/plugins.vim
+exec "source " . g:vimdir . "/plugins.vim"
 " Small custom functions.
-source ~/.vim/functions.vim
+exec "source " . g:vimdir . "/functions.vim"
 " Auto commands.
-source ~/.vim/autocmds.vim
+exec "source " . g:vimdir . "/autocmds.vim"

nvimrc

@@ -34,7 +34,7 @@ elseif has('gui_macvim')
   set macmeta
 endif
 
-if has('macunix') || has('mac')
+if !has('nvim') && (has('macunix') || has('mac'))
   " Fix meta key for Mac
   let c='a'
   while c <= 'z'

platforms.vim

@@ -1,4 +1,4 @@
 " Source all the plugin files again, this time loading their configuration.
-for file in split(glob('~/.vim/vundle_plugins/*.vim'), '\n')
+for file in split(glob(g:vimdir . '/vundle_plugins/*.vim'), '\n')
   exe 'source' file
 endfor

plugins.vim

@@ -23,7 +23,7 @@ echo ''
 
 info 'Installing Vundle'
 info '-----------------'
-git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+git clone https://github.com/VundleVim/Vundle.vim.git ~/config/nvim/bundle/Vundle.vim
 
 
 info 'Setting up Symlinks'
@@ -37,15 +37,15 @@ fi
 
 info 'Installing plugins'
 info '-------------------------------------------------'
-if test $(which mvim)
+if test $(which nvim)
 then
-  mvim -v +PluginInstall +qall
+  nvim -v +PluginInstall +qall
 else
   if test $(which vim)
   then
     vim +PluginInstall +qall
   else
-    fail 'mvim or vim not found in path.'
+    fail 'nvim or vim not found in path.'
   fi
 fi
 

scripts/setup

@@ -5,19 +5,19 @@
 set nocompatible " be iMproved
 filetype off     " required!
 
-set runtimepath+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+exec "set runtimepath+=" . g:vimdir . "/bundle/Vundle.vim"
+call vundle#begin(g:vimdir . '/bundle')
 
 " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
 
 " Source all the plugins with a global variable set that ensures only the
 " Plugin 'name' code will be called.
 let g:vundle_installing_plugins = 1
-for file in split(glob('$HOME/.vim/vundle_plugins/*.vim'), '\n')
+for file in split(glob(g:vimdir . '/vundle_plugins/*.vim'), '\n')
   exe 'source' fnameescape(file)
 endfor
-for file in split(glob('$HOME/.vim/vundle_plugins/custom/*.vim'), '\n')
+for file in split(glob(g:vimdir . '/vundle_plugins/custom/*.vim'), '\n')
   exe 'source' fnameescape(file)
 endfor
 unlet g:vundle_installing_plugins

vundle.vim

@@ -2,7 +2,7 @@ if exists('g:vundle_installing_plugins')
   finish
 endif
 
-command! ReloadVundle source ~/.vim/vundle.vim
+command! ReloadVundle exec 'source ' . g:vimdir . '/vundle.vim'
 function PluginReloadAndRun(command)
   :ReloadVundle
   execute a:command