From c189ae8ae3bb0fe47d506cef0fda5eb2cdddf820 Mon Sep 17 00:00:00 2001
From: lara <lara@pixie>
Date: Fri, 20 Nov 2020 19:07:46 +0100
Subject: [PATCH] Use neovim if installed

---
 aliases              |  3 +++
 config/nvim/init.vim |  4 ++++
 vimrc                | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 config/nvim/init.vim

diff --git a/aliases b/aliases
index cb60d06..0f1f2d3 100644
--- a/aliases
+++ b/aliases
@@ -21,6 +21,9 @@ if which sl > /dev/null 2>&1; then
     alias l='sl'
     alias lll='sl'
 fi
+if which nvim > /dev/null 2>&1; then
+    alias vim='nvim'
+fi
 case $(uname -s) in
     Arch)
         alias redwm='cd ~/aur/dwm-git; updpkgsums; makepkg -fi --noconfirm; killall dwm'
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
new file mode 100644
index 0000000..a80e7b8
--- /dev/null
+++ b/config/nvim/init.vim
@@ -0,0 +1,4 @@
+" http://vimcasts.org/episodes/meet-neovim/
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath=&runtimepath
+source ~/.vimrc
diff --git a/vimrc b/vimrc
index c15dc20..0687e62 100644
--- a/vimrc
+++ b/vimrc
@@ -16,8 +16,10 @@ if has("unix") || has("mac")
     "[Run Plug-ins]"
     set runtimepath+=$HOME/.vim/bundle/Vundle.vim
     call vundle#begin()
+
     Plugin 'gmarik/Vundle.vim'
     map <F3> :VundleUpdate<CR>
+
     Plugin 'dag/vim-fish'
     if isdirectory(expand("$HOME/.vim/bundle/YouCompleteMe"))
         "[Workaround for YCM non-portability]"
@@ -33,6 +35,7 @@ if has("unix") || has("mac")
     else
         Plugin 'AutoComplPop'
     endif
+
     Plugin 'w0rp/ale'
     let g:ale_linters = {
         \ 'cpp': ['g++'],
@@ -41,16 +44,27 @@ if has("unix") || has("mac")
     let g:ale_c_gcc_options='-std=c99 -pedantic'
     let g:ale_sign_error = '●'
     let g:ale_sign_warning = '●'
+
     Plugin 'itchyny/lightline.vim'
     let g:lightline = {'colorscheme': 'base16_default_dark'}
+
     if executable('ctags')
         Plugin 'ludovicchabant/vim-gutentags'
     endif
+
     Plugin 'beyondmarc/opengl.vim'
     Plugin 'arrufat/vala.vim'
     let g:vala_syntax_folding_enabled = 0
+
     Plugin 'tikhomirov/vim-glsl'
     Plugin 'jamessan/vim-gnupg'
+    Plugin 'machakann/vim-highlightedyank'
+    let g:highlightedyank_highlight_duration = 200
+    "[Needed only with old vim versions]"
+    if !exists('##TextYankPost')
+        map y <Plug>(highlightedyank)
+    endif
+
     "[Autodetect indent style of a file]"
     Plugin 'tcbbd/detectindent'
     let g:detectindent_preferred_indent=4
@@ -141,6 +155,10 @@ set ignorecase
 set wrapscan
 "[When on, the ":substitute" flag 'g' is default on]"
 set nogdefault
+"[Enable realtime feedback for substitution]"
+if has("nvim")
+    set inccommand=nosplit
+endif
 
 
 "[Kitty doesn't support background color erase]"