Switch completely to nvim

init.vim

@@ -3,17 +3,19 @@
 ""
 
 " Vim environment
-set directory=$XDG_CACHE_HOME/vim,~/,/tmp
+let cache   = $XDG_CACHE_HOME .'/nvim'
-set backupdir=$XDG_CACHE_HOME/vim,~/,/tmp
+let config  = $XDG_CONFIG_HOME.'/nvim'
-set viminfo+=n$XDG_CACHE_HOME/vim/viminfo
+let plugins = cache.'/plugins'
-set rtp=$XDG_CONFIG_HOME/vim,$VIM,$VIMRUNTIME
+
-let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
+let &directory = cache.',~/,/tmp'
+let &backupdir = cache.',~/,/tmp'
+let &viminfo   = cache.'/info'
 
 " Ctags data
-set tags=$XDG_CACHE_HOME/vim/tags
+let &tags = cache.'/tags'
 
 " Keep history
-set undodir=$XDG_CACHE_HOME/vim/undo
+let &undodir = cache.'/undo'
 set undofile
 
 
@@ -21,8 +23,8 @@ set undofile
 "" Plugins
 ""
 
-set rtp+=$XDG_CACHE_HOME/vim/plugins/Vundle.vim
+let &rtp .= ','.plugins.'/Vundle.vim'
-call vundle#begin('$XDG_CACHE_HOME/vim/plugins')
+call vundle#begin(plugins)
 
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'kien/ctrlp.vim'
@@ -43,17 +45,12 @@ call vundle#end()
 "" Options
 ""
 
-set nocompatible                        " Disable vi compatibility
-set backspace=2                         " Fix DEL in the terminal
 set hidden                              " Hide buffers
 set incsearch                           " Incremental search
-set hlsearch                            " Highlight search results
 
 set ignorecase                          " Case insensitive search...
 set smartcase                           " ...for lowercase terms
-set laststatus=2                        "
 
-set mouse=a                             " Enable mouse support
 set showcmd                             " Show command while writing it
 set ruler                               " Show line/column position
 set nowrap                              " Disable line wrap
@@ -64,15 +61,11 @@ set nobackup                            " Disable ~backup
 set noswapfile                          " Disable swap files
 set writebackup                         " Enable temp backups
 
-set wildmenu                            " Enable cmd autocompletion
-set encoding=utf-8                      " Default encoding
 set nomodeline                          " Security
 set tabpagemax=10                       " Limit number of tabs to 10
 set showmatch                           " Highlight matched parenthesis
 set ffs=unix                            " Use UNIX file format
-set clipboard=unnamed                   " Clipboard integration
+set clipboard=unnamedplus               " Clipboard integration
-set ttyfast                             " Improve redrawing in xterm
-filetype indent plugin on               " Identify file type
 set wildignore+=*/tmp/*,*.so,*.swp      " Files to ignore
 
 set shiftwidth=2                        " Tab
@@ -80,13 +73,12 @@ set tabstop=2                           "
 set expandtab                           "
 
 set number                              " Line numbering
-set autoindent                          " Indentation
+set smartindent                         " Indentation
-set smartindent                         "
 set noshowmode                          "
 
 syntax on                               " Syntax highlighting
-source $XDG_CONFIG_HOME/vim/colors.vim
+runtime colors.vim                      " Load color scheme
-
+filetype indent plugin on               " Identify file type
 
 " Titlebar without “-VIM”
 set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)
@@ -111,7 +103,7 @@ inoremap jj <ESC>
 ""
 
 " Lightline
-source $XDG_CONFIG_HOME/vim/lightline.vim
+runtime lightline.vim
 
 " Syntastic
 let g:syntastic_check_on_open     = 1