From 2ec4d34c9e2004dcb42e5270bb7cb749131aa64d Mon Sep 17 00:00:00 2001 From: eug-vs Date: Sat, 21 Aug 2021 17:50:42 +0300 Subject: feat(nvim): replace FZF with Telescope --- nvim/.config/nvim/coc.vim | 15 --------------- nvim/.config/nvim/fzf.vim | 4 ---- nvim/.config/nvim/init.vim | 5 ++++- nvim/.config/nvim/vim-plug/plugins.vim | 8 ++++---- 4 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 nvim/.config/nvim/coc.vim delete mode 100644 nvim/.config/nvim/fzf.vim diff --git a/nvim/.config/nvim/coc.vim b/nvim/.config/nvim/coc.vim deleted file mode 100644 index 7adde13..0000000 --- a/nvim/.config/nvim/coc.vim +++ /dev/null @@ -1,15 +0,0 @@ -" Coc.nvim configuration -nmap gd (coc-definition) -nnoremap t :call show_documentation() - -inoremap pumvisible() ? "\" : "\u\" - -autocmd BufNewFile,BufRead *.tsx set filetype=typescriptreact - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - else - call CocAction('doHover') - endif -endfunction diff --git a/nvim/.config/nvim/fzf.vim b/nvim/.config/nvim/fzf.vim deleted file mode 100644 index 2d64a69..0000000 --- a/nvim/.config/nvim/fzf.vim +++ /dev/null @@ -1,4 +0,0 @@ -" fzf.vim configuration -nnoremap r :Rg -nnoremap f :FZF -nnoremap g :GFiles diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 412e919..6d46a35 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -59,11 +59,14 @@ autocmd BufWritePre * %s/\s\+$//e nnoremap ev :vs $MYVIMRC nnoremap sv :source $MYVIMRC +" Telescope +nnoremap ff :Telescope find_files +nnoremap fr :Telescope live_grep + " Plugin-specific configuration source ~/.config/nvim/startify.vim source ~/.config/nvim/defx.vim source ~/.config/nvim/vimwiki.vim -source ~/.config/nvim/fzf.vim lua require('lsp-config') lua require('completion') diff --git a/nvim/.config/nvim/vim-plug/plugins.vim b/nvim/.config/nvim/vim-plug/plugins.vim index e0c7b93..caf9f50 100644 --- a/nvim/.config/nvim/vim-plug/plugins.vim +++ b/nvim/.config/nvim/vim-plug/plugins.vim @@ -1,5 +1,5 @@ call plug#begin('~/.config/nvim/autoload/plugged') - Plug 'mhinz/vim-startify', {'branch': 'center'} + Plug 'mhinz/vim-startify' Plug 'vimwiki/vimwiki' Plug 'tonchis/vim-to-github' " Dark-powered file explorer @@ -7,9 +7,6 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'kristijanhusak/defx-icons' Plug 'kristijanhusak/defx-git' Plug 't9md/vim-choosewin' - " FZF - Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } - Plug 'junegunn/fzf.vim' " Tmux navigator Plug 'christoomey/vim-tmux-navigator' " Color scheme @@ -28,4 +25,7 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Built-in LSP Plug 'neovim/nvim-lspconfig' Plug 'hrsh7th/nvim-compe' + " Telescope + Plug 'nvim-lua/plenary.nvim' + Plug 'nvim-telescope/telescope.nvim' call plug#end() -- cgit v1.2.3