aboutsummaryrefslogtreecommitdiff
path: root/nvim
diff options
context:
space:
mode:
authoreug-vs <eugene@eug-vs.xyz>2021-08-21 17:50:42 +0300
committereug-vs <eugene@eug-vs.xyz>2021-08-21 17:50:42 +0300
commit2ec4d34c9e2004dcb42e5270bb7cb749131aa64d (patch)
tree0d6d6fec040d220ed4e2a845e8d05e75ea9f99e7 /nvim
parentc84f27834c42b1a92b4571e93bbbf7f0a8c4aecc (diff)
downloaddotfiles-2ec4d34c9e2004dcb42e5270bb7cb749131aa64d.tar.gz
feat(nvim): replace FZF with Telescope
Diffstat (limited to 'nvim')
-rw-r--r--nvim/.config/nvim/coc.vim15
-rw-r--r--nvim/.config/nvim/fzf.vim4
-rw-r--r--nvim/.config/nvim/init.vim5
-rw-r--r--nvim/.config/nvim/vim-plug/plugins.vim8
4 files changed, 8 insertions, 24 deletions
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 <silent> gd <Plug>(coc-definition)
-nnoremap <silent> <Leader>t :call <SID>show_documentation()<CR>
-
-inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
-
-autocmd BufNewFile,BufRead *.tsx set filetype=typescriptreact
-
-function! s:show_documentation()
- if (index(['vim','help'], &filetype) >= 0)
- execute 'h '.expand('<cword>')
- 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 <leader>r :Rg<CR>
-nnoremap <leader>f :FZF<CR>
-nnoremap <leader>g :GFiles<CR>
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 <leader>ev :vs $MYVIMRC<CR>
nnoremap <leader>sv :source $MYVIMRC<CR>
+" Telescope
+nnoremap <Leader>ff :Telescope find_files<CR>
+nnoremap <Leader>fr :Telescope live_grep<CR>
+
" 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()