From 03c27be3c88f491c373152ebaa8d0d1052d8b6fd Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 22 Dec 2021 14:38:34 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autoload/plug.vim   |  5 ++--
 hosts/awesome.vimrc |  2 +-
 hosts/ptah.vimrc    |  2 +-
 hosts/tpl380.vimrc  |  2 +-
 vimrc               | 61 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/autoload/plug.vim b/autoload/plug.vim
index 6a958cb..ad95041 100644
--- a/autoload/plug.vim
+++ b/autoload/plug.vim
@@ -405,7 +405,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 +1208,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)
diff --git a/hosts/awesome.vimrc b/hosts/awesome.vimrc
index 8a3a1ce..3d33078 100644
--- a/hosts/awesome.vimrc
+++ b/hosts/awesome.vimrc
@@ -1 +1 @@
-set guifont=Iosevka\ Fixed\ SS08\ 18
+set guifont=Iosevka\ Prog\ 18
diff --git a/hosts/ptah.vimrc b/hosts/ptah.vimrc
index 8a3a1ce..3d33078 100644
--- a/hosts/ptah.vimrc
+++ b/hosts/ptah.vimrc
@@ -1 +1 @@
-set guifont=Iosevka\ Fixed\ SS08\ 18
+set guifont=Iosevka\ Prog\ 18
diff --git a/hosts/tpl380.vimrc b/hosts/tpl380.vimrc
index d4c86ea..14d3f18 100644
--- a/hosts/tpl380.vimrc
+++ b/hosts/tpl380.vimrc
@@ -1 +1 @@
-set guifont=Iosevka\ Fixed\ SS08\ 10
+set guifont=Iosevka\ Prog\ 10
diff --git a/vimrc b/vimrc
index 4df3aa6..32d7055 100644
--- a/vimrc
+++ b/vimrc
@@ -137,6 +137,7 @@ Plug 'python-mode/python-mode', { 'for': 'python', 'branch': 'develop' }
 " Shell "
 Plug 'itspriddle/vim-shellcheck'
 
+Plug 'rhysd/vim-grammarous'
 
 " Перечисление плагинов заканчивается здесь "
 call plug#end()
@@ -468,6 +469,66 @@ if executable('ag')
 	let g:ctrlp_use_caching = 0
 endif
 
+"""
+""" Settings from mswin.vim
+"""
+if has("clipboard")
+	" CTRL-X and SHIFT-Del are Cut
+	vnoremap <C-X> "+x
+	vnoremap <S-Del> "+x
+
+	" CTRL-C and CTRL-Insert are Copy
+	vnoremap <C-C> "+y
+	vnoremap <C-Insert> "+y
+
+	" CTRL-V and SHIFT-Insert are Paste
+	map <C-V>		"+gP
+	map <S-Insert>		"+gP
+
+	cmap <C-V>		<C-R>+
+	cmap <S-Insert>		<C-R>+
+endif
+
+" Pasting blockwise and linewise selections is not possible in Insert and
+" Visual mode without the +virtualedit feature.  They are pasted as if they
+" were characterwise instead.
+" Uses the paste.vim autoload script.
+" Use CTRL-G u to have CTRL-Z only undo the paste.
+
+if 1
+    exe 'inoremap <script> <C-V> <C-G>u' . paste#paste_cmd['i']
+    exe 'vnoremap <script> <C-V> ' . paste#paste_cmd['v']
+endif
+
+imap <S-Insert>		<C-V>
+vmap <S-Insert>		<C-V>
+
+" Use CTRL-Q to do what CTRL-V used to do
+noremap <C-Q>		<C-V>
+
+" Use CTRL-S for saving, also in Insert mode (<C-O> doesn't work well when
+" using completions).
+noremap <C-S>		:update<CR>
+vnoremap <C-S>		<C-C>:update<CR>
+inoremap <C-S>		<Esc>:update<CR>gi
+
+" For CTRL-V to work autoselect must be off.
+" On Unix we have two selections, autoselect can be used.
+if !has("unix")
+  set guioptions-=a
+endif
+
+" CTRL-Z is Undo; not in cmdline though
+noremap <C-Z> u
+inoremap <C-Z> <C-O>u
+
+" CTRL-Y is Redo (although not repeat); not in cmdline though
+noremap <C-Y> <C-R>
+inoremap <C-Y> <C-O><C-R>
+"""
+"""
+"""
+
 " Use a leader instead of the actual named binding
 nmap <leader>p :CtrlP<cr>
 

From 8397cc0c00733cc3cbc3482db609e6eaf33513b9 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 22 Dec 2021 14:40:54 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=90=D0=B4=D1=80=D0=B5=D1=81=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autoload/plug.vim | 3 ++-
 vimrc             | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/autoload/plug.vim b/autoload/plug.vim
index 6a958cb..b6e4cbf 100644
--- a/autoload/plug.vim
+++ b/autoload/plug.vim
@@ -1208,7 +1208,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)
diff --git a/vimrc b/vimrc
index 4df3aa6..241566f 100644
--- a/vimrc
+++ b/vimrc
@@ -34,9 +34,9 @@ Plug 'srcery-colors/srcery-vim'
 " Строка с названиями буферов "
 Plug 'itchyny/lightline.vim' | Plug 'taohexxx/lightline-buffer'
 
-" https://github.com/oblitum/rainbow
+" https://github.com/frazrepo/vim-rainbow
 " Разноцветные скобки "
-Plug 'oblitum/rainbow'
+Plug 'frazrepo/vim-rainbow'
 
 " https://github.com/ntpeters/vim-better-whitespace
 " Подсветка лишних пробельных символов "