1 files changed, 13 insertions, 3 deletions

diff --git a/dotfiles/vim-dev.lua b/dotfiles/vim-dev.lua
index 458f9ef..55ac142 100644
--- a/dotfiles/vim-dev.lua
+++ b/dotfiles/vim-dev.lua
@@ -13,10 +13,20 @@ local function on_attach(client, bufnr)
 
         buf_set_keymap('n', 'gr', '<cmd>Telescope lsp_references<CR>', opts)
 
-        buf_set_keymap('n', '<leader>sa', '<cmd>Telescope lsp_code_actions<CR>', opts)
+        -- TODO: replace these with vim.keymap.set once neovim 0.7 is out
+        local cursor_style = [[require("telescope.themes").get_dropdown()]]
+
+        local function telescope_builtin(builtin, style)
+                if not style then
+                        style = ""
+                end
+
+                return '<cmd>lua require("telescope.builtin").' .. builtin .. '(' .. cursor_style ..')<CR>'
+        end
+
+        buf_set_keymap('n', '<leader>sa', telescope_builtin('lsp_code_actions', cursor_style), opts)
         buf_set_keymap('n', '<leader>se', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
-        buf_set_keymap('n', '<leader>sE', '<cmd>Telescope lsp_document_diagnostics<CR>', opts)
-        buf_set_keymap('n', '<leader>swe', '<cmd>Telescope lsp_workspace_diagnostics<CR>', opts)
+        buf_set_keymap('n', '<leader>sE', '<cmd>Telescope diagnostics<CR>', opts)
         buf_set_keymap('n', '<leader>sl', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
         buf_set_keymap('n', '<leader>sq', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts)
         buf_set_keymap('n', '<leader>sr', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)