From 5a9c1739eded6bd4715ccb4e1fab3576025b35ff Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 22 Oct 2022 09:40:06 -0700 Subject: [PATCH] telescope.nvim => fzf.nvim --- .gitmodules | 9 ++---- install.sh | 3 -- lua/plugins.lua | 32 +++----------------- pack/plugins/start/fzf.vim | 1 + pack/plugins/start/telescope-fzf-native.nvim | 1 - pack/plugins/start/telescope.nvim | 1 - 6 files changed, 9 insertions(+), 38 deletions(-) create mode 160000 pack/plugins/start/fzf.vim delete mode 160000 pack/plugins/start/telescope-fzf-native.nvim delete mode 160000 pack/plugins/start/telescope.nvim diff --git a/.gitmodules b/.gitmodules index f734b46..d53c2b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -82,12 +82,9 @@ [submodule "pack/plugins/opt/hflip.nvim"] path = pack/plugins/start/hflip.nvim url = https://github.com/FooSoft/hflip.nvim.git -[submodule "pack/plugins/opt/telescope.nvim"] - path = pack/plugins/start/telescope.nvim - url = https://github.com/nvim-telescope/telescope.nvim.git -[submodule "pack/plugins/opt/telescope-fzf-native.nvim"] - path = pack/plugins/start/telescope-fzf-native.nvim - url = https://github.com/nvim-telescope/telescope-fzf-native.nvim.git [submodule "pack/plugins/start/vim-rooter"] path = pack/plugins/start/vim-rooter url = https://github.com/airblade/vim-rooter.git +[submodule "pack/plugins/start/fzf.vim"] + path = pack/plugins/start/fzf.vim + url = https://github.com/junegunn/fzf.vim.git diff --git a/install.sh b/install.sh index ad7aee2..027e642 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,2 @@ #!/bin/bash git submodule update --init --recursive -pushd pack/plugins/start/telescope-fzf-native.nvim -make -popd diff --git a/lua/plugins.lua b/lua/plugins.lua index ba3d36e..9778d49 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,30 +1,8 @@ --- telescope.nvim -local telescope = require('telescope') -if telescope then - local telescope_builtin = require('telescope.builtin') - if telescope_builtin then - vim.keymap.set('n', 'fb', telescope_builtin.buffers, {}) - vim.keymap.set('n', 'fg', telescope_builtin.git_files, {}) - vim.keymap.set('n', 'fh', telescope_builtin.oldfiles, {}) - vim.keymap.set('n', 'fr', telescope_builtin.reloader, {}) - vim.keymap.set('n', 'fs', telescope_builtin.spell_suggest, {}) - end - - local telescope_actions = require('telescope.actions') - telescope.setup { - defaults = { - mappings = { - i = { - [''] = telescope_actions.move_selection_next, - [''] = telescope_actions.move_selection_previous, - [''] = telescope_actions.close, - }, - }, - } - } - - telescope.load_extension('fzf') -end +-- fzf.vim +vim.keymap.set('n', 'fg', vim.cmd.GFiles) +vim.keymap.set('n', 'fh', vim.cmd.History) +vim.keymap.set('n', 'fb', vim.cmd.Buffers) +vim.keymap.set('n', 'fl', vim.cmd.Lines) -- hflip.nvim vim.keymap.set('n', 'gfs', vim.cmd.HFlip) diff --git a/pack/plugins/start/fzf.vim b/pack/plugins/start/fzf.vim new file mode 160000 index 0000000..9ceac71 --- /dev/null +++ b/pack/plugins/start/fzf.vim @@ -0,0 +1 @@ +Subproject commit 9ceac718026fd39498d95ff04fa04d3e40c465d7 diff --git a/pack/plugins/start/telescope-fzf-native.nvim b/pack/plugins/start/telescope-fzf-native.nvim deleted file mode 160000 index 65c0ee3..0000000 --- a/pack/plugins/start/telescope-fzf-native.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 65c0ee3d4bb9cb696e262bca1ea5e9af3938fc90 diff --git a/pack/plugins/start/telescope.nvim b/pack/plugins/start/telescope.nvim deleted file mode 160000 index f174a03..0000000 --- a/pack/plugins/start/telescope.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f174a0367b4fc7cb17710d867e25ea792311c418