From b3e2490271cfe404f854a30f31a7cee63b15124f Mon Sep 17 00:00:00 2001
From: Bilal Syed Hussain <bh246@st-andrews.ac.uk>
Date: Tue, 14 Apr 2015 14:11:15 +0100
Subject: [PATCH] settings

---
 .nvimrc | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/.nvimrc b/.nvimrc
index 8a969ee..224d5fe 100644
--- a/.nvimrc
+++ b/.nvimrc
@@ -1,3 +1,11 @@
+
+" Install vim-plug if it does not exist
+if empty(glob('~/.nvim/autoload/plug.vim'))
+  silent !curl -fLo ~/.nvim/autoload/plug.vim --create-dirs
+    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+  autocmd VimEnter * PlugInstall
+endif
+
 " Plugins {{{
 call plug#begin('~/.nvim/plugged')
 
@@ -33,8 +41,10 @@ Plug 'rking/ag.vim'
 Plug 'rizzatti/dash.vim'
 " Essence syntax
 Plug '~/.vim/bundle/essence'
-
-Plug 'nathanaelkane/vim-indent-guides'
+" Indent guides
+Plug 'Yggdroot/indentLine'
+" json
+Plug 'elzr/vim-json'
 
 call plug#end()
 " }}}
@@ -92,6 +102,10 @@ vnoremap p <Esc>:let current_reg = @"<CR>gvdi<C-R>=current_reg<CR><Esc>"
 " yank to sys board
 vmap ,p "*y<CR>
 
+" Disable highlight when <leader><cr> is pressed
+" but preserve cursor coloring
+nmap <silent> <leader><cr> :noh\|hi Cursor guibg=red<cr>
+
 " }}}
 
 " Spacing {{{
@@ -128,6 +142,12 @@ set laststatus=2
 set listchars=tab:‣\ ,trail:¸
 set list
 
+" Line wraping
+set showbreak=↪
+
+let g:indentLine_enabled =0
+
+
 " Pressing ,ss will toggle and untoggle spell checking
 map <leader>ss :setlocal spell!<cr>
 
@@ -191,9 +211,6 @@ if has("autocmd")
 endif
 " }}}
 
-" Disable highlight when <leader><cr> is pressed
-" but preserve cursor coloring
-nmap <silent> <leader><cr> :noh\|hi Cursor guibg=red<cr>
 
 " Remember info about open buffers on close
 set viminfo^=%
@@ -239,6 +256,8 @@ nmap <silent> <leader>d <Plug>DashSearch
 " nnoremap <silent> <Leader><space> :Unite file_rec/neovim<CR>
 nnoremap <silent> <Leader><space> :FZF<CR>
 
+nnoremap <Leader>w :IndentLinesToggle<CR>
+
 " Airline {{{
 
 if !exists('g:airline_symbols')