From b6b30b9d6a71bf1b820f92915ea94b49bd04feae Mon Sep 17 00:00:00 2001
From: Andrii Gladkyi <arg@arg.zone>
Date: Wed, 8 Sep 2021 13:17:48 +0200
Subject: [PATCH] NeoVim config improvements

* Removed auto-pairs plugin - it only causes difficulties
* Fixed OSC52 yank - no more crashing on "y" key press
* Added abbreviation for binding.pry that I use a lot

Also yet another attempt to fix OSC52 In mosh-tmux environment.
Unfortunately mosh project is abandoned, so there is no chance
https://github.com/mobile-shell/mosh/pull/1054 will be merged.
And those workarounds actually never work.
---
 home/.config/nvim/init.vim | 6 ++++--
 home/.tmux.conf            | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim
index 688b61e..453944c 100644
--- a/home/.config/nvim/init.vim
+++ b/home/.config/nvim/init.vim
@@ -6,7 +6,9 @@ endif
 
 autocmd StdinReadPre * let s:std_in=1
 autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'cd' argv()[0] | endif
-autocmd TextYankPost * silent! if v:event.operator ==# 'y' | call YankOSC52(join(v:event["regcontents"],"\n")) | endif
+" autocmd TextYankPost * if v:event.operator is 'y' && v:event.regname is '+' | execute 'OSCYankReg +' | endif
+autocmd TextYankPost * if v:event.operator is 'y' && v:event.regname is '' | execute 'OSCYankReg "' | endif
+" autocmd TextYankPost * silent! if v:event.operator ==# 'y' | call YankOSC52(join(v:event["regcontents"],"\n")) | endif
 autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics()
 autocmd User LspDiagnosticsChanged call lightline#update()
 augroup highlight_yank
@@ -14,6 +16,7 @@ augroup highlight_yank
   autocmd TextYankPost * silent! lua require'vim.highlight'.on_yank("IncSearch", 1000)
 augroup END
 autocmd FileType text,markdown,mail,gitcommit setlocal spell spelllang=en_us
+autocmd FileType ruby iabbrev <buffer> pry binding.pry
 " }}}
 
 " Plugins {{{
@@ -31,7 +34,6 @@ Plug 'junegunn/fzf', { 'dir': '~/.config/fzf', 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'scrooloose/nerdcommenter'
 Plug 'janko/vim-test'
-Plug 'tmsvg/pear-tree'
 Plug 'ojroques/vim-oscyank'
 Plug 'hrsh7th/nvim-compe'
 call plug#end()
diff --git a/home/.tmux.conf b/home/.tmux.conf
index 9a95dfb..e12861e 100644
--- a/home/.tmux.conf
+++ b/home/.tmux.conf
@@ -9,7 +9,8 @@ set -sg display-time 2000
 set -sg escape-time 0
 set -sg focus-events on
 set -g default-terminal "screen-256color"
-set -ga terminal-overrides ',screen-256color:Tc'
+set -ag terminal-overrides ",screen-256color:colors=256:Tc"
+set -ag terminal-overrides ",screen-256color:Ms=\\E]52;c;%p2%s\\7"
 # set -ga terminal-overrides ",xterm-256color*:Tc:kend=\E[F:khome=\E[H:smkx=\E=:rmkx=\E>"
 set -wg xterm-keys on
 set -g visual-activity off