From c15b962e9d44d6479e2b6aa496ba2d90dae0ecbe Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Thu, 7 Apr 2022 09:29:18 +0200
Subject: vim: add telescope ui-select + fix some telescope mappings

---
 common/vim.nix       |  1 +
 dotfiles/vim-dev.lua | 16 +++++++++++++---
 dotfiles/vim.lua     |  6 ++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/common/vim.nix b/common/vim.nix
index 8d53e3b..5ee48c7 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -81,6 +81,7 @@ let
 
           telescope-nvim
           telescope-file-browser-nvim
+          telescope-ui-select-nvim
 
           # Treesitter
           (nvim-treesitter.withPlugins (_: tree-sitter.allGrammars))
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)
diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua
index b0bead7..d3604e3 100644
--- a/dotfiles/vim.lua
+++ b/dotfiles/vim.lua
@@ -195,15 +195,21 @@ require("telescope").setup {
 			path = "%:p:h",
 			dir_icon = "D",
 		},
+		["ui-select"] = {
+			require("telescope.themes").get_dropdown {}
+		}
 	}
 }
 
 require("telescope").load_extension "file_browser"
+require("telescope").load_extension "ui-select"
 
 map("n", "<leader>fb", "<cmd>Telescope buffers<cr>", mapopts)
 map("n", "<leader>ff", "<cmd>Telescope find_files<cr>", mapopts)
 map("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", mapopts)
 map("n", "<leader>fh", "<cmd>Telescope help_tags<cr>", mapopts)
+map("n", "<leader>fo", "<cmd>Telescope oldfiles<cr>", mapopts)
+map("n", "<leader>fs", "<cmd>Telescope spell_suggest<cr>", mapopts)
 map("n", "<leader>ft", "<cmd>Telescope treesitter<cr>", mapopts)
 map("n", "-", "<cmd>lua require('telescope').extensions.file_browser.file_browser()<cr>", mapopts)
 
-- 
cgit v1.2.3