This commit is contained in:
2024-12-27 20:11:21 -05:00
parent 4bc3ede0fc
commit 8e7c66f125
2 changed files with 90 additions and 88 deletions

View File

@@ -49,6 +49,9 @@ return {
"rose-pine", "rose-pine",
"tokyonight", "tokyonight",
"bluloco-dark", "bluloco-dark",
"vesper",
"poimandres",
"oxocarbon",
}, },
livePreview = true, livePreview = true,
} }
@@ -64,5 +67,8 @@ return {
"rose-pine/neovim", "rose-pine/neovim",
"folke/tokyonight.nvim", "folke/tokyonight.nvim",
"uloco/bluloco.nvim", "uloco/bluloco.nvim",
"gambhirsharma/vesper.nvim",
"olivercederborg/poimandres.nvim",
"nyoom-engineering/oxocarbon.nvim",
}, },
} }

View File

@@ -15,21 +15,17 @@ return {
}, },
config = function() config = function()
require("conform").setup({ require("conform").setup {
formatters_by_ft = {}, formatters_by_ft = {},
}) }
local cmp = require("cmp") local cmp = require "cmp"
local cmp_lsp = require("cmp_nvim_lsp") local cmp_lsp = require "cmp_nvim_lsp"
local capabilities = vim.tbl_deep_extend( local capabilities =
"force", vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities())
{},
vim.lsp.protocol.make_client_capabilities(),
cmp_lsp.default_capabilities()
)
require("fidget").setup({}) require("fidget").setup {}
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup {
ensure_installed = { ensure_installed = {
"lua_ls", "lua_ls",
"clangd", "clangd",
@@ -37,13 +33,13 @@ return {
}, },
handlers = { handlers = {
function(server_name) -- default handler (optional) function(server_name) -- default handler (optional)
require("lspconfig")[server_name].setup({ require("lspconfig")[server_name].setup {
capabilities = capabilities, capabilities = capabilities,
}) }
end, end,
["lua_ls"] = function() ["lua_ls"] = function()
local lspconfig = require("lspconfig") local lspconfig = require "lspconfig"
lspconfig.lua_ls.setup({ lspconfig.lua_ls.setup {
capabilities = capabilities, capabilities = capabilities,
settings = { settings = {
Lua = { Lua = {
@@ -53,34 +49,34 @@ return {
}, },
}, },
}, },
}) }
end, end,
}, },
}) }
local cmp_select = { behavior = cmp.SelectBehavior.Select } local cmp_select = { behavior = cmp.SelectBehavior.Select }
cmp.setup({ cmp.setup {
snippet = { snippet = {
expand = function(args) expand = function(args)
require("luasnip").lsp_expand(args.body) -- For `luasnip` users. require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
end, end,
}, },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert {
["<C-p>"] = cmp.mapping.select_prev_item(cmp_select), ["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
["<C-n>"] = cmp.mapping.select_next_item(cmp_select), ["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
["<C-y>"] = cmp.mapping.confirm({ select = true }), ["<C-y>"] = cmp.mapping.confirm { select = true },
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
}), },
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" }, -- For luasnip users. { name = "luasnip" }, -- For luasnip users.
}, { }, {
{ name = "buffer" }, { name = "buffer" },
}), }),
}) }
vim.diagnostic.config({ vim.diagnostic.config {
-- update_in_insert = true, -- update_in_insert = true,
float = { float = {
focusable = true, focusable = true,
@@ -90,6 +86,6 @@ return {
header = "", header = "",
prefix = "", prefix = "",
}, },
}) }
end, end,
} }