From 8e7c66f125ec1303ee008fd3eba0df7c58528d2e Mon Sep 17 00:00:00 2001 From: vx-clutch Date: Fri, 27 Dec 2024 20:11:21 -0500 Subject: [PATCH] save --- .../nvim/lua/vxclutch/lazy/appearance.lua | 6 + nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua | 172 +++++++++--------- 2 files changed, 90 insertions(+), 88 deletions(-) diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua index 4578532..3dae824 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua @@ -49,6 +49,9 @@ return { "rose-pine", "tokyonight", "bluloco-dark", + "vesper", + "poimandres", + "oxocarbon", }, livePreview = true, } @@ -64,5 +67,8 @@ return { "rose-pine/neovim", "folke/tokyonight.nvim", "uloco/bluloco.nvim", + "gambhirsharma/vesper.nvim", + "olivercederborg/poimandres.nvim", + "nyoom-engineering/oxocarbon.nvim", }, } diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua index 930215d..6750972 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/lsp.lua @@ -1,95 +1,91 @@ return { - "neovim/nvim-lspconfig", - dependencies = { - "stevearc/conform.nvim", - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - "hrsh7th/nvim-cmp", - "L3MON4D3/LuaSnip", - "saadparwaiz1/cmp_luasnip", - "j-hui/fidget.nvim", - }, + "neovim/nvim-lspconfig", + dependencies = { + "stevearc/conform.nvim", + "williamboman/mason.nvim", + "williamboman/mason-lspconfig.nvim", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-cmdline", + "hrsh7th/nvim-cmp", + "L3MON4D3/LuaSnip", + "saadparwaiz1/cmp_luasnip", + "j-hui/fidget.nvim", + }, - config = function() - require("conform").setup({ - formatters_by_ft = {}, - }) - local cmp = require("cmp") - local cmp_lsp = require("cmp_nvim_lsp") - local capabilities = vim.tbl_deep_extend( - "force", - {}, - vim.lsp.protocol.make_client_capabilities(), - cmp_lsp.default_capabilities() - ) + config = function() + require("conform").setup { + formatters_by_ft = {}, + } + local cmp = require "cmp" + local cmp_lsp = require "cmp_nvim_lsp" + local capabilities = + vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities()) - require("fidget").setup({}) - require("mason").setup() - require("mason-lspconfig").setup({ - ensure_installed = { - "lua_ls", - "clangd", - "gopls", - }, - handlers = { - function(server_name) -- default handler (optional) - require("lspconfig")[server_name].setup({ - capabilities = capabilities, - }) - end, - ["lua_ls"] = function() - local lspconfig = require("lspconfig") - lspconfig.lua_ls.setup({ - capabilities = capabilities, - settings = { - Lua = { - runtime = { version = "Lua 5.1" }, - diagnostics = { - globals = { "bit", "vim", "it", "describe", "before_each", "after_each" }, - }, - }, - }, - }) - end, - }, - }) + require("fidget").setup {} + require("mason").setup() + require("mason-lspconfig").setup { + ensure_installed = { + "lua_ls", + "clangd", + "gopls", + }, + handlers = { + function(server_name) -- default handler (optional) + require("lspconfig")[server_name].setup { + capabilities = capabilities, + } + end, + ["lua_ls"] = function() + local lspconfig = require "lspconfig" + lspconfig.lua_ls.setup { + capabilities = capabilities, + settings = { + Lua = { + runtime = { version = "Lua 5.1" }, + diagnostics = { + globals = { "bit", "vim", "it", "describe", "before_each", "after_each" }, + }, + }, + }, + } + end, + }, + } - local cmp_select = { behavior = cmp.SelectBehavior.Select } + local cmp_select = { behavior = cmp.SelectBehavior.Select } - cmp.setup({ - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) -- For `luasnip` users. - end, - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_prev_item(cmp_select), - [""] = cmp.mapping.select_next_item(cmp_select), - [""] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping.complete(), - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, -- For luasnip users. - }, { - { name = "buffer" }, - }), - }) + cmp.setup { + snippet = { + expand = function(args) + require("luasnip").lsp_expand(args.body) -- For `luasnip` users. + end, + }, + mapping = cmp.mapping.preset.insert { + [""] = cmp.mapping.select_prev_item(cmp_select), + [""] = cmp.mapping.select_next_item(cmp_select), + [""] = cmp.mapping.confirm { select = true }, + [""] = cmp.mapping.complete(), + }, + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, -- For luasnip users. + }, { + { name = "buffer" }, + }), + } - vim.diagnostic.config({ - -- update_in_insert = true, - float = { - focusable = true, - style = "minimal", - border = "rounded", - source = "always", - header = "", - prefix = "", - }, - }) - end, + vim.diagnostic.config { + -- update_in_insert = true, + float = { + focusable = true, + style = "minimal", + border = "rounded", + source = "always", + header = "", + prefix = "", + }, + } + end, }