This commit is contained in:
LuKe Tidd 2023-05-17 00:06:32 -04:00
parent 008b353e29
commit 3700c179cb
Signed by: luke
GPG Key ID: 75D6600BEF4E8E8F
5 changed files with 97 additions and 3 deletions

View File

@ -2,4 +2,5 @@
local M = {}
M.ui = {theme = 'catppuccin'}
M.plugins = 'custom.plugins'
M.mappings = require "custom.mappings"
return M

View File

@ -3,6 +3,18 @@ local capabilities = require("plugins.configs.lspconfig").capabilities
local lspconfig = require("lspconfig")
local util = require "lspconfig/util"
lspconfig.gopls.setup {
on_attach = on_attach,
capabilities = capabilities,
cmd = {"gopls"},
filetypes = {"go", "gomod", "gowork", "gotmpl"},
root_dir = util.root_pattern("go.work", "go.mod", ".git"),
settings = {
gopls = {
completeUnimported = true,
},
},
}
--[[
lspconfig.rust_analyzer.setup({
on_attach = on_attach,

25
configs/null-ls.lua Normal file
View File

@ -0,0 +1,25 @@
local null_ls = require("null-ls")
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
local opts = {
sources = {
null_ls.builtins.formatting.gofumpt,
null_ls.builtins.formatting.goimports_reviser,
},
on_attach = function(client, bufnr)
if client.supports_method("textDocument/formatting") then
vim.api.nvim_clear_autocmds({
group = augroup,
buffer = bufnr,
})
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format({bufnr = bufnr})
end,
})
end
end,
}
return opts

View File

@ -1,5 +1,21 @@
local M = {}
M.dap = {
plugin = true,
n = {
["<leader>db"] = {
"<cmd> DapToggleBreakpoint <CR>",
"Add breakpoint at line"
},
["<leader>dus"] = {
function ()
local widgets = require('dap.ui.widgets');
local sidebar = widgets.sidebar(widgets.scopes);
sidebar.open();
end,
}
}
}
M.crates = {
n = {
["<leader>rcu"] = {
@ -11,4 +27,22 @@ M.crates = {
}
}
M.dap_go = {
plugin = true,
n = {
["<leader>gdt"] = {
function()
require('dap-go').debug_test()
end,
"Debug go test"
},
["<leader>gdl"] = {
function()
require('dap-go').debug_test()
end,
"Debug last go test"
},
}
}
return M

View File

@ -35,7 +35,10 @@ local plugins = {
{
"simrat39/rust-tools.nvim",
rf = "rust",
dependancies = "neovim/nvim-lspconfig",
dependancies = {
"neovim/nvim-lspconfig",
"mfussenegger/nvim-dap",
},
opts = function ()
return require "custom.configs.rust-tools"
end,
@ -46,8 +49,8 @@ local plugins = {
{
"mfussenegger/nvim-dap",
rf = "rust",
config = function()
require('nvim-dap').setup()
init = function()
require("core.utils").load_mappings("dap")
end
},
{
@ -66,6 +69,25 @@ local plugins = {
table.insert(M.sources, {name = "crates"})
return M
end,
},
{
"jose-elias-alvarez/null-ls.nvim",
ft = "go",
opts = function ()
return require "custom.configs.null-ls"
end,
},
{
"leoluz/nvim-dap-go",
ft = "go",
dependancies = "mfussenegger/nvim-dap",
config = function(_, opts)
require("dap-go").setup(opts)
require("core.utils").load_mappings("dap_go")
end
}
}