diff --git a/autoload/plug.vim b/autoload/plug.vim index b6e4cbf..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', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] + \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] execute printf( \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) 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 c5cb4b1..f3ffe74 100644 --- a/vimrc +++ b/vimrc @@ -148,6 +148,7 @@ Plug 'python-mode/python-mode', { 'for': 'python', 'branch': 'develop' } " Shell " Plug 'itspriddle/vim-shellcheck' +Plug 'rhysd/vim-grammarous' " Перечисление плагинов заканчивается здесь " call plug#end() @@ -488,6 +489,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 "+x + vnoremap "+x + + " CTRL-C and CTRL-Insert are Copy + vnoremap "+y + vnoremap "+y + + " CTRL-V and SHIFT-Insert are Paste + map "+gP + map "+gP + + cmap + + cmap + +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