From f7a2fa01b51fac28bfb24e34bf5dbfecdddcc096 Mon Sep 17 00:00:00 2001 From: Pasi Bergman Date: Mon, 18 Jan 2021 21:24:03 +0200 Subject: [PATCH] Fix fzf-preview branch. Disable vim-rooter. --- themes/vim-code-dark.vim | 8 ++++---- vim-plug/plugins.vim | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/themes/vim-code-dark.vim b/themes/vim-code-dark.vim index 019c0a4..80ca153 100644 --- a/themes/vim-code-dark.vim +++ b/themes/vim-code-dark.vim @@ -23,10 +23,10 @@ hi CursorLine ctermbg=52 guibg=#333333 hi CursorColumn ctermbg=52 guibg=#1F1F1F " Transparency -highlight Normal ctermbg=none -highlight NonText ctermbg=none -highlight Normal guibg=none -highlight NonText guibg=none +" highlight Normal ctermbg=none +" highlight NonText ctermbg=none +" highlight Normal guibg=none +" highlight NonText guibg=none " Cursorline only visible in the current (active) window augroup CursorLine diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 37bd9d1..bcf518a 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -7,7 +7,6 @@ endif call plug#begin('~/.config/nvim/autoload/plugged') " Easier comments - " Plug 'tpope/vim-commentary' Plug 'tomtom/tcomment_vim' " Remap . so that plugins can tap into it Plug 'tpope/vim-repeat' @@ -19,13 +18,12 @@ call plug#begin('~/.config/nvim/autoload/plugged') else " Easymotion - " Plug 'easymotion/vim-easymotion' " Sneak - easymotion replacement Plug 'justinmk/vim-sneak' " Surround Plug 'tpope/vim-surround' " Nvim sets the project root path - Plug 'airblade/vim-rooter' + " Plug 'airblade/vim-rooter' " vim-sleuth plugin automatically adjusts 'shiftwidth' and 'expandtab' " heuristically based on the current file Plug 'tpope/vim-sleuth' @@ -54,8 +52,7 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'OmniSharp/omnisharp-vim' " Fzf Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } - Plug 'yuki-ycino/fzf-preview.vim', { 'branch': 'release', 'do': ':UpdateRemotePlugins' } - Plug 'junegunn/fzf.vim' + Plug 'yuki-ycino/fzf-preview.vim', { 'branch': 'release/rpc' } Plug 'stsewd/fzf-checkout.vim' " Git Plug 'tpope/vim-fugitive'