.

2 files changed, 10 insertions, 4 deletions

diff --git a/vim/.vimrc b/vim/.vimrc
index 73ad80d..c3614fe 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -56,7 +56,7 @@ let g:indent_guides_guide_size = 1
 
 " show line numbers
 set number
-set relativenumber
+"set relativenumber
 
 " 80 character line length highlight
 set colorcolumn=80
@@ -77,7 +77,10 @@ autocmd FileType make set tabstop=4 shiftwidth=8 softtabstop=0 noexpandtab
 
 " gui settings
 set linespace=4
-set guifont=Droid\ Sans\ Mono:h14
+set guifont=Droid\ Sans\ Mono:h12
+let g:neovide_cursor_animation_length = 0.01
+let g:neovide_cursor_trail_length = 0.01
+let g:neovide_cursor_vfx_mode = "sonicboom"
 "if exists('g:GuiLoaded')
     "GuiTabline 0
 "endif
diff --git a/vim/plug.vim b/vim/plug.vim
index 6a958cb..8a195d3 100644
--- a/vim/plug.vim
+++ b/vim/plug.vim
@@ -242,6 +242,8 @@ function! plug#begin(...)
     let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
   elseif exists('g:plug_home')
     let home = s:path(g:plug_home)
+  elseif has('nvim')
+    let home = stdpath('data') . '/plugged'
   elseif !empty(&rtp)
     let home = s:path(split(&rtp, ',')[0]) . '/plugged'
   else
@@ -405,7 +407,7 @@ function! plug#end()
 
   for [map, names] in items(lod.map)
     for [mode, map_prefix, key_prefix] in
-          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
+          \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
       execute printf(
       \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
       \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
@@ -1208,7 +1210,8 @@ function! s:update_impl(pull, force, args) abort
   normal! 2G
   silent! redraw
 
-  let s:clone_opt = []
+  " Set remote name, overriding a possible user git config's clone.defaultRemoteName
+  let s:clone_opt = ['--origin', 'origin']
   if get(g:, 'plug_shallow', 1)
     call extend(s:clone_opt, ['--depth', '1'])
     if s:git_version_requirement(1, 7, 10)