diff --git a/after/plugin/fzf.vim b/after/plugin/fzf.vim deleted file mode 100644 index 04caade..0000000 --- a/after/plugin/fzf.vim +++ /dev/null @@ -1,7 +0,0 @@ -map gf :GFiles -map gf :Files -map gb :Buffers -map gs :GFiles? -map ag :Ag - -imap (fzf-complete-file) diff --git a/init.vim b/init.vim index c740963..b5b93e2 100644 --- a/init.vim +++ b/init.vim @@ -194,5 +194,6 @@ lua require("conf.treesitter") set foldmethod=expr set foldexpr=nvim_treesitter#foldexpr() set nofoldenable " Disable folding at startup. +lua require("conf.telescope") lua require("conf.indent-blankline") " vi:foldmethod=marker sw=2 diff --git a/lua/conf/telescope.lua b/lua/conf/telescope.lua index 3b07fc0..82d2e47 100644 --- a/lua/conf/telescope.lua +++ b/lua/conf/telescope.lua @@ -1,3 +1,35 @@ +local map = vim.keymap.set telescope = require('telescope') -telescope.load_extension('fzf_native') +telescope.builtin = require('telescope.builtin') + +telescope.setup { + extensions = { + fzf = { + fuzzy = true, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" + -- the default case_mode is "smart_case" + }, + ["ui-select"] = { + require("telescope.themes").get_dropdown { + -- even more opts + } + } + } +} +telescope.load_extension('fzf') +telescope.load_extension("ui-select") + + --telescope.load_extension('lsp_handlers') +-- +map('n', 'gff', telescope.builtin.fd) +map('n', 'gfg', telescope.builtin.git_files) +map('n', 'gfs', telescope.builtin.git_status) +map('n', 'gs', telescope.builtin.git_status) +map('n', 'gs', telescope.builtin.lsp_dynamic_workspace_symbols) +map('n', 'g/', telescope.builtin.live_grep) +map('n', '', telescope.builtin.current_buffer_fuzzy_find) +map('n', '*', telescope.builtin.grep_string) +map('n', 'gb', telescope.builtin.buffers) diff --git a/packages.vim b/packages.vim index a8e8d94..7c65fc5 100644 --- a/packages.vim +++ b/packages.vim @@ -52,6 +52,7 @@ Plug 'nvim-lua/plenary.nvim' Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' } Plug 'gbrlsnchs/telescope-lsp-handlers.nvim' +Plug 'nvim-telescope/telescope-ui-select.nvim' Plug 'ray-x/lsp_signature.nvim' Plug 'mfussenegger/nvim-jdtls' @@ -64,7 +65,6 @@ Plug 'junegunn/vim-easy-align' " for stuff installed via disto package manager, e.g. fzf's bundled vim plugin Plug '/usr/share/vim/vimfiles' -Plug 'junegunn/fzf.vim' Plug 'vim-airline/vim-airline' Plug 'lambdalisue/suda.vim'