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..c5cb4b1 100644 --- a/vimrc +++ b/vimrc @@ -20,6 +20,10 @@ call plug#begin('~/.vim/plugged') " Запуск асинхронных команд " Plug 'skywind3000/asyncrun.vim' +" https://github.com/mhinz/vim-startify +" Стартовый экран +Plug 'mhinz/vim-startify' + " https://github.com/lyokha/vim-xkbswitch " Автоматическое переключение раскладки клавиатуры в режиме вставки " Plug 'lyokha/vim-xkbswitch' @@ -34,9 +38,9 @@ Plug 'srcery-colors/srcery-vim' " Строка с названиями буферов " Plug 'itchyny/lightline.vim' | Plug 'taohexxx/lightline-buffer' -" https://github.com/oblitum/rainbow +" https://github.com/Cheeto836/vim-rainbow " Разноцветные скобки " -Plug 'oblitum/rainbow' +Plug 'Cheeto836/vim-rainbow' " https://github.com/ntpeters/vim-better-whitespace " Подсветка лишних пробельных символов " @@ -62,6 +66,9 @@ Plug 'easymotion/vim-easymotion' " Поиск " Plug 'haya14busa/incsearch.vim' | Plug 'haya14busa/incsearch-easymotion.vim' +" https://github.com/mihaifm/bufstop +Plug 'mihaifm/bufstop' + " https://github.com/moll/vim-bbye " Удаление буферов с сохранением расположения окон " Plug 'moll/vim-bbye' @@ -129,6 +136,10 @@ Plug 'vhdirk/vim-cmake' Plug 'lervag/vimtex' Plug 'xuhdev/vim-latex-live-preview' +" https://github.com/jez/vim-superman +" MAN " +Plug 'jez/vim-superman' + " https://github.com/python-mode/python-mode " " Python " Plug 'python-mode/python-mode', { 'for': 'python', 'branch': 'develop' } @@ -282,6 +293,15 @@ set list set copyindent "}}} +map b :Bufstop " get a visual on the buffers +map w :BufstopPreview " switch files by moving inside the window +map a :BufstopModeFast " a command for quick switching +map :BufstopBack +map :BufstopForward +let g:BufstopAutoSpeedToggle = 1 " now I can press ,3,3,3 to cycle the last 3 buffers +let g:BufstopSorting = "none" + + "{{{ Раскладки клавиатуры let g:XkbSwitchEnabled = 1 let g:XkbSwitchNLayout = 'us'