feat: add copilot and which key
This commit is contained in:
+4
-1
@@ -3,12 +3,14 @@
|
|||||||
"catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
|
"catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||||
|
"copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||||
"github-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
|
"github-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
|
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
|
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||||
|
"mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" },
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" },
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" },
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "af318216b744f2fe2d5afa6febb01f455ae61d6c" },
|
"none-ls.nvim": { "branch": "main", "commit": "af318216b744f2fe2d5afa6febb01f455ae61d6c" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
||||||
@@ -23,5 +25,6 @@
|
|||||||
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
|
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
|
||||||
"telescope-themes": { "branch": "main", "commit": "9b7c368b83b82b53c0a6e9e977f8329e5f1fe269" },
|
"telescope-themes": { "branch": "main", "commit": "9b7c368b83b82b53c0a6e9e977f8329e5f1fe269" },
|
||||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }
|
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||||
|
"which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
return { "github/copilot.vim" }
|
||||||
+132
-113
@@ -1,128 +1,147 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("mason").setup()
|
require("mason").setup()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"williamboman/mason-lspconfig.nvim",
|
"williamboman/mason-lspconfig.nvim",
|
||||||
lazy = false,
|
lazy = false,
|
||||||
opts = {
|
opts = {
|
||||||
auto_install = true,
|
auto_install = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
dependencies = { "hoffs/omnisharp-extended-lsp.nvim" },
|
dependencies = { "hoffs/omnisharp-extended-lsp.nvim" },
|
||||||
lazy = false,
|
lazy = false,
|
||||||
config = function()
|
config = function()
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||||
|
|
||||||
lspconfig.eslint.setup({
|
lspconfig.eslint.setup({
|
||||||
on_attach = function(_, bufnr)
|
on_attach = function(_, bufnr)
|
||||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||||
buffer = bufnr,
|
buffer = bufnr,
|
||||||
command = "EslintFixAll",
|
command = "EslintFixAll",
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
on_new_config = function(config, new_root_dir)
|
on_new_config = function(config, new_root_dir)
|
||||||
config.settings.workspaceFolder = {
|
config.settings.workspaceFolder = {
|
||||||
uri = vim.uri_from_fname(new_root_dir),
|
uri = vim.uri_from_fname(new_root_dir),
|
||||||
name = vim.fn.fnamemodify(new_root_dir, ":t"),
|
name = vim.fn.fnamemodify(new_root_dir, ":t"),
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
lspconfig.omnisharp.setup({
|
lspconfig.omnisharp.setup({
|
||||||
handlers = {
|
handlers = {
|
||||||
["textDocument/definition"] = require("omnisharp_extended").handler,
|
["textDocument/definition"] = require("omnisharp_extended").handler,
|
||||||
},
|
},
|
||||||
cmd = { "dotnet", "C:/Users/sfree/AppData/Local/nvim-data/omnisharp/OmniSharp.dll" },
|
cmd = { "dotnet", "C:/Users/sfree/AppData/Local/nvim-data/omnisharp/OmniSharp.dll" },
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
settings = {
|
settings = {
|
||||||
FormattingOptions = {
|
FormattingOptions = {
|
||||||
EnableEditorConfigSupport = true,
|
EnableEditorConfigSupport = true,
|
||||||
OrganizeImports = true,
|
OrganizeImports = true,
|
||||||
},
|
},
|
||||||
Sdk = {
|
Sdk = {
|
||||||
IncludePrereleases = true,
|
IncludePrereleases = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
lspconfig.lua_ls.setup({
|
lspconfig.lua_ls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
})
|
||||||
|
|
||||||
lspconfig.ts_ls.setup({
|
lspconfig.ts_ls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
})
|
||||||
|
|
||||||
lspconfig.html.setup({
|
lspconfig.html.setup({
|
||||||
filetypes = { "html", "ejs" },
|
filetypes = { "html", "ejs" },
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
})
|
||||||
|
|
||||||
lspconfig.cssls.setup({
|
lspconfig.cssls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("LspAttach", {
|
lspconfig.pyright.setup({
|
||||||
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
capabilities = capabilities,
|
||||||
callback = function(ev)
|
})
|
||||||
local client = vim.lsp.get_client_by_id(ev.data.client_id)
|
|
||||||
local omnisharp = require("omnisharp_extended")
|
|
||||||
|
|
||||||
if client.name == "omnisharp" then
|
vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
vim.keymap.set(
|
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
||||||
"n",
|
callback = function(ev)
|
||||||
"gd",
|
local client = vim.lsp.get_client_by_id(ev.data.client_id)
|
||||||
omnisharp.lsp_definition,
|
local omnisharp = require("omnisharp_extended")
|
||||||
{ desc = "Go to definition", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
if client.name == "omnisharp" then
|
||||||
"n",
|
vim.keymap.set(
|
||||||
"gi",
|
"n",
|
||||||
omnisharp.lsp_implementation,
|
"gd",
|
||||||
{ desc = "Go to implementation", buffer = ev.buf }
|
omnisharp.telescope_lsp_definition,
|
||||||
)
|
{ desc = "Go to definition", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
"n",
|
"n",
|
||||||
"<leader>D",
|
"gi",
|
||||||
omnisharp.lsp_type_definition,
|
omnisharp.telescope_lsp_implementation,
|
||||||
{ desc = "Go to type definition", buffer = ev.buf }
|
{ desc = "Go to implementation", buffer = ev.buf }
|
||||||
)
|
)
|
||||||
else
|
|
||||||
vim.keymap.set(
|
|
||||||
"n",
|
|
||||||
"gd",
|
|
||||||
vim.lsp.buf.definition,
|
|
||||||
{ desc = "Go to definition", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
"n",
|
"n",
|
||||||
"gD",
|
"gr",
|
||||||
vim.lsp.buf.declaration,
|
omnisharp.telescope_lsp_references,
|
||||||
{ desc = "Go to declaration", buffer = ev.buf }
|
{ desc = "Go to references", buffer = ev.buf }
|
||||||
)
|
)
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
"n",
|
"n",
|
||||||
"gi",
|
"<leader>D",
|
||||||
vim.lsp.buf.implementation,
|
omnisharp.telescope_lsp_type_definition,
|
||||||
{ desc = "Go to implementation", buffer = ev.buf }
|
{ desc = "Go to type definition", buffer = ev.buf }
|
||||||
)
|
)
|
||||||
end
|
else
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gd",
|
||||||
|
vim.lsp.buf.definition,
|
||||||
|
{ desc = "Go to definition", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Display errors" })
|
vim.keymap.set(
|
||||||
vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Display symbol info", buffer = ev.buf })
|
"n",
|
||||||
end,
|
"gD",
|
||||||
})
|
vim.lsp.buf.declaration,
|
||||||
end,
|
{ desc = "Go to declaration", buffer = ev.buf }
|
||||||
},
|
)
|
||||||
|
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gi",
|
||||||
|
vim.lsp.buf.implementation,
|
||||||
|
{ desc = "Go to implementation", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gr",
|
||||||
|
vim.lsp.buf.references,
|
||||||
|
{ desc = "Go to references", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "Rename", buffer = ev.buf })
|
||||||
|
vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Display errors" })
|
||||||
|
vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Display symbol info", buffer = ev.buf })
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
return {
|
||||||
|
"folke/which-key.nvim",
|
||||||
|
dependencies = { "echasnovski/mini.icons" },
|
||||||
|
config = function()
|
||||||
|
require("which-key").setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user