summaryrefslogtreecommitdiffstats
path: root/dotfiles
diff options
context:
space:
mode:
Diffstat (limited to 'dotfiles')
-rw-r--r--dotfiles/vim-dev.lua16
-rw-r--r--dotfiles/vim.lua6
2 files changed, 19 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)
13 13
14 buf_set_keymap('n', 'gr', '<cmd>Telescope lsp_references<CR>', opts) 14 buf_set_keymap('n', 'gr', '<cmd>Telescope lsp_references<CR>', opts)
15 15
16 buf_set_keymap('n', '<leader>sa', '<cmd>Telescope lsp_code_actions<CR>', opts) 16 -- TODO: replace these with vim.keymap.set once neovim 0.7 is out
17 local cursor_style = [[require("telescope.themes").get_dropdown()]]
18
19 local function telescope_builtin(builtin, style)
20 if not style then
21 style = ""
22 end
23
24 return '<cmd>lua require("telescope.builtin").' .. builtin .. '(' .. cursor_style ..')<CR>'
25 end
26
27 buf_set_keymap('n', '<leader>sa', telescope_builtin('lsp_code_actions', cursor_style), opts)
17 buf_set_keymap('n', '<leader>se', '<cmd>lua vim.diagnostic.open_float()<CR>', opts) 28 buf_set_keymap('n', '<leader>se', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
18 buf_set_keymap('n', '<leader>sE', '<cmd>Telescope lsp_document_diagnostics<CR>', opts) 29 buf_set_keymap('n', '<leader>sE', '<cmd>Telescope diagnostics<CR>', opts)
19 buf_set_keymap('n', '<leader>swe', '<cmd>Telescope lsp_workspace_diagnostics<CR>', opts)
20 buf_set_keymap('n', '<leader>sl', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts) 30 buf_set_keymap('n', '<leader>sl', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
21 buf_set_keymap('n', '<leader>sq', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts) 31 buf_set_keymap('n', '<leader>sq', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts)
22 buf_set_keymap('n', '<leader>sr', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) 32 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 {
195 path = "%:p:h", 195 path = "%:p:h",
196 dir_icon = "D", 196 dir_icon = "D",
197 }, 197 },
198 ["ui-select"] = {
199 require("telescope.themes").get_dropdown {}
200 }
198 } 201 }
199} 202}
200 203
201require("telescope").load_extension "file_browser" 204require("telescope").load_extension "file_browser"
205require("telescope").load_extension "ui-select"
202 206
203map("n", "<leader>fb", "<cmd>Telescope buffers<cr>", mapopts) 207map("n", "<leader>fb", "<cmd>Telescope buffers<cr>", mapopts)
204map("n", "<leader>ff", "<cmd>Telescope find_files<cr>", mapopts) 208map("n", "<leader>ff", "<cmd>Telescope find_files<cr>", mapopts)
205map("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", mapopts) 209map("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", mapopts)
206map("n", "<leader>fh", "<cmd>Telescope help_tags<cr>", mapopts) 210map("n", "<leader>fh", "<cmd>Telescope help_tags<cr>", mapopts)
211map("n", "<leader>fo", "<cmd>Telescope oldfiles<cr>", mapopts)
212map("n", "<leader>fs", "<cmd>Telescope spell_suggest<cr>", mapopts)
207map("n", "<leader>ft", "<cmd>Telescope treesitter<cr>", mapopts) 213map("n", "<leader>ft", "<cmd>Telescope treesitter<cr>", mapopts)
208map("n", "-", "<cmd>lua require('telescope').extensions.file_browser.file_browser()<cr>", mapopts) 214map("n", "-", "<cmd>lua require('telescope').extensions.file_browser.file_browser()<cr>", mapopts)
209 215