Updated config
This commit is contained in:
5
.config/nvim/lua/plugins/autopairs.lua
Normal file
5
.config/nvim/lua/plugins/autopairs.lua
Normal file
@ -0,0 +1,5 @@
|
||||
return {
|
||||
"windwp/nvim-autopairs",
|
||||
event = "InsertEnter",
|
||||
config = true
|
||||
}
|
@ -1,7 +1,9 @@
|
||||
return {
|
||||
"folke/flash.nvim",
|
||||
event = { "BufReadPost", "BufNewFile" },
|
||||
keys = {
|
||||
{ "s", function() require("flash").jump() end, mode = { "n", "x", "o" }, desc = "Flash" },
|
||||
{ "S", function() require("flash").treesitter() end, mode = { "n", "o", "x" }, desc = "Flash Treesitter" },
|
||||
{ "s", function() require("flash").jump() end, mode = { "n", "o", "x" }, desc = "Flash" },
|
||||
{ "S", function() require("flash").treesitter() end, mode = { "n", "o", "x" }, desc = "Flash Treesitter" },
|
||||
},
|
||||
config = true,
|
||||
}
|
||||
|
@ -1,9 +1,6 @@
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
"folke/neodev.nvim",
|
||||
},
|
||||
opts = {
|
||||
servers = {
|
||||
clangd = {},
|
||||
@ -12,8 +9,18 @@ return {
|
||||
lua_ls = {
|
||||
settings = {
|
||||
Lua = {
|
||||
completion = {
|
||||
callSnippet = "Replace",
|
||||
},
|
||||
runtime = {
|
||||
version = "LuaJIT",
|
||||
},
|
||||
workspace = {
|
||||
checkThirdParty = false,
|
||||
library = {
|
||||
"${3rd}/luv/library",
|
||||
unpack(vim.api.nvim_get_runtime_file("", true)),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -21,8 +28,6 @@ return {
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("neodev").setup()
|
||||
|
||||
-- Servers
|
||||
local servers = opts.servers
|
||||
|
||||
@ -42,5 +47,37 @@ return {
|
||||
name = "DiagnosticSign" .. name
|
||||
vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" })
|
||||
end
|
||||
|
||||
-- Runs when the LSP is attached
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
group = vim.api.nvim_create_augroup("lsp-attach", { clear = true }),
|
||||
callback = function(event)
|
||||
local function map(mode, lhs, rhs, info)
|
||||
vim.keymap.set(mode, lhs, rhs, { buffer = event.buf, desc = "LSP: " .. info })
|
||||
end
|
||||
|
||||
map("n", "gr", require("telescope.builtin").lsp_references, "References")
|
||||
map("n", "gd", require("telescope.builtin").lsp_definitions, "Definition")
|
||||
map({ "n", "i" }, "<f1>", vim.lsp.buf.hover, "Hover")
|
||||
map({ "n", "i" }, "<f2>", vim.lsp.buf.rename, "Rename")
|
||||
map({ "n", "i" }, "<C-f>", vim.lsp.buf.format, "Format")
|
||||
map("n", "<leader>ca", vim.lsp.buf.code_action, "Code action")
|
||||
|
||||
-- Highlight the word your cursor is on
|
||||
-- local client = vim.lsp.get_client_by_id(event.data.client_id)
|
||||
--
|
||||
-- if client and client.server_capabilities.documentHighlightProvider then
|
||||
-- vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
|
||||
-- buffer = event.buf,
|
||||
-- callback = vim.lsp.buf.document_highlight,
|
||||
-- })
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
|
||||
-- buffer = event.buf,
|
||||
-- callback = vim.lsp.buf.clear_references,
|
||||
-- })
|
||||
-- end
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
18
.config/nvim/lua/plugins/mini-surround.lua
Normal file
18
.config/nvim/lua/plugins/mini-surround.lua
Normal file
@ -0,0 +1,18 @@
|
||||
return {
|
||||
"echasnovski/mini.surround",
|
||||
event = { "BufReadPost", "BufNewFile" },
|
||||
opts = {
|
||||
mappings = {
|
||||
add = 'gsa',
|
||||
delete = 'gsd',
|
||||
find = 'gsf',
|
||||
find_left = 'gsF',
|
||||
highlight = 'gsh',
|
||||
replace = 'gsr',
|
||||
update_n_lines = 'gsn',
|
||||
suffix_last = '',
|
||||
suffix_next = '',
|
||||
},
|
||||
},
|
||||
config = true,
|
||||
}
|
@ -3,7 +3,6 @@ return {
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
"MunifTanjim/nui.nvim",
|
||||
"rcarriga/nvim-notify",
|
||||
},
|
||||
opts = {
|
||||
lsp = {
|
||||
|
@ -3,12 +3,17 @@ return {
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-telescope/telescope-project.nvim",
|
||||
-- "nvim-telescope/telescope-ui-select.nvim",
|
||||
},
|
||||
keys = {
|
||||
{"<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find files"},
|
||||
{"<leader>r", "<cmd>Telescope oldfiles<cr>", desc = "Recent files"},
|
||||
{"<leader>p", "<cmd>Telescope project<cr>", desc = "Projects"},
|
||||
{"<leader>b", "<cmd>Telescope buffers<cr>", desc = "Buffers"},
|
||||
{"<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find files"},
|
||||
{"<leader>h", "<cmd>Telescope help_tags<cr>", desc = "Help"},
|
||||
{"<leader>p", "<cmd>Telescope project<cr>", desc = "Projects"},
|
||||
{"<leader>r", "<cmd>Telescope oldfiles<cr>", desc = "Recent files"},
|
||||
{"<leader>w", "<cmd>Telescope grep_string<cr>", desc = "Word"},
|
||||
{"<leader>ds", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document symbols"},
|
||||
{"<leader>ws", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace symbols"},
|
||||
},
|
||||
config = function()
|
||||
require("telescope").setup({
|
||||
@ -30,8 +35,13 @@ return {
|
||||
sync_with_nvim_tree = true,
|
||||
theme = "dropdown",
|
||||
},
|
||||
-- ["ui-select"] = {
|
||||
-- require("telescope.themes").get_dropdown(),
|
||||
-- },
|
||||
},
|
||||
})
|
||||
|
||||
require("telescope").load_extension("project")
|
||||
-- require("telescope").load_extension("ui-select")
|
||||
end,
|
||||
}
|
||||
|
Reference in New Issue
Block a user