Merge branch 'master' of git.246060.ru:f1x1t/vimrc

This commit is contained in:
Andrei Astafev 2021-12-22 14:41:13 +03:00
commit 2c607ce1e6
5 changed files with 65 additions and 4 deletions

View File

@ -405,7 +405,7 @@ function! plug#end()
for [map, names] in items(lod.map) for [map, names] in items(lod.map)
for [mode, map_prefix, key_prefix] in for [mode, map_prefix, key_prefix] in
\ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
execute printf( execute printf(
\ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>', \ '%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) \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)

View File

@ -1 +1 @@
set guifont=Iosevka\ Fixed\ SS08\ 18 set guifont=Iosevka\ Prog\ 18

View File

@ -1 +1 @@
set guifont=Iosevka\ Fixed\ SS08\ 18 set guifont=Iosevka\ Prog\ 18

View File

@ -1 +1 @@
set guifont=Iosevka\ Fixed\ SS08\ 10 set guifont=Iosevka\ Prog\ 10

61
vimrc
View File

@ -137,6 +137,7 @@ Plug 'python-mode/python-mode', { 'for': 'python', 'branch': 'develop' }
" Shell " " Shell "
Plug 'itspriddle/vim-shellcheck' Plug 'itspriddle/vim-shellcheck'
Plug 'rhysd/vim-grammarous'
" Перечисление плагинов заканчивается здесь " " Перечисление плагинов заканчивается здесь "
call plug#end() call plug#end()
@ -468,6 +469,66 @@ if executable('ag')
let g:ctrlp_use_caching = 0 let g:ctrlp_use_caching = 0
endif 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 " Use a leader instead of the actual named binding
nmap <leader>p :CtrlP<cr> nmap <leader>p :CtrlP<cr>