From 9fe0dece82da6e77f66d7480ee38dc2ae2ac6ca3 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Mon, 22 Jul 2024 08:47:45 -0400 Subject: [PATCH] nvim config changes --- .../config/lazyvim/lua/config/autocmds.lua | 143 ++++-------------- .../config/lazyvim/lua/plugins/core.lua | 42 ++--- 2 files changed, 52 insertions(+), 133 deletions(-) diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua index f043726..6b7c622 100644 --- a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua +++ b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua @@ -2,52 +2,15 @@ -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua -- Add any additional autocmds here -require("which-key").register({ - w = { - d = { - "bd | close", - "Delete window and buffer" - }, - D = { - "close", - "Delete window only", - }, - }, - t = { - ":new | setlocal nonumber norelativenumber | resize 10 | set winfixheight | terminal", - "Open Terminal", - }, -}, { - prefix = "", -}) - -require("notify").setup({ - background_colour = "#000000", +require("which-key").add({ + { "wd", "bd | close", mode = "n", desc = "Delete window & buffer" }, + { "wD", "close", mode = "n", desc = "Delete window" }, + { "t", ":new | setlocal nonumber norelativenumber | resize 10 | terminal", mode = "n", desc = "Open Terminal" } }) local lsp = require("lsp-zero").preset({}) - ---require("null-ls").setup({ --- -- you can reuse a shared lspconfig on_attach callback here --- on_attach = function(client, bufnr) --- if client.supports_method("textDocument/formatting") then --- vim.api.nvim_clear_autocmds({ group = vim.api.nvim_create_augroup("LspFormatting", {}), buffer = bufnr }) --- vim.api.nvim_create_autocmd("BufWritePre", { --- group = augroup, --- buffer = bufnr, --- callback = function() --- vim.lsp.buf.format({ --- bufnr = bufnr, --- filter = function(client) --- return client.name == "null-ls" --- end, --- }) --- vim.lsp.buf.formatting_sync() --- end, --- }) --- end --- end, ---}) +local cmp_nvim_lsp = require "cmp_nvim_lsp" +local cmp = require("cmp") -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md lsp.setup_servers({ @@ -65,48 +28,16 @@ lsp.setup_servers({ "vuels" --"arduino-language-server" }) - -require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls()) - lsp.setup() -local cmp_nvim_lsp = require "cmp_nvim_lsp" - ---require("lspconfig").clangd.setup { --- capabilities = cmp_nvim_lsp.default_capabilities(), --- cmd = { --- "clangd", --- "--offset-encoding=utf-16", --- }, ---} - -require("lspconfig").cssls.setup { - settings = { - css = { - validate = true, - lint = { - unknownAtRules = "ignore" - } - }, - scss = { - validate = true, - lint = { - unknownAtRules = "ignore" - } - }, - less = { - validate = true, - lint = { - unknownAtRules = "ignore" - } - }, - } +require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls()) +require("lspconfig").clangd.setup { + capabilities = cmp_nvim_lsp.default_capabilities(), + cmd = { + "clangd", + "--offset-encoding=utf-16", + }, } - ---require("lspconfig").volar.setup({ --- filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }, ---}) - require("lspconfig").nil_ls.setup { settings = { ["nil"] = { @@ -119,8 +50,17 @@ require("lspconfig").nil_ls.setup { } } -local cmp = require("cmp") cmp.setup({ + enabled = function() + -- disable completion in comments + local context = require("cmp.config.context") + -- keep command mode completion enabled when cursor is in a comment + if vim.api.nvim_get_mode().mode == "c" then + return true + else + return not context.in_treesitter_capture("comment") and not context.in_syntax_group("comment") + end + end, snippet = { expand = function(args) require("luasnip").lsp_expand(args.body) @@ -137,37 +77,14 @@ cmp.setup({ return vim_item end, }, - -- other configurations... -}) - -cmp.setup({ - enabled = function() - -- disable completion in comments - local context = require("cmp.config.context") - -- keep command mode completion enabled when cursor is in a comment - if vim.api.nvim_get_mode().mode == "c" then - return true - else - return not context.in_treesitter_capture("comment") and not context.in_syntax_group("comment") - end - end, mapping = { - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - - --[""] = cmp.mapping(function(fallback) - -- if cmp.visible() then - -- cmp.select_next_item() - -- elseif cmp.completed then - -- cmp.confirm({ select = true }) - -- else - -- fallback() - -- end - --end, { "i", "s" }), - --[""] = cmp.mapping.select_prev_item(), - + -- https://github.com/hrsh7th/nvim-cmp/wiki/Example-mappings + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm(), [""] = cmp.mapping(function(fallback) fallback() end, { "i", "s" }), diff --git a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/core.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/core.lua index 69edb85..c29962e 100644 --- a/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/core.lua +++ b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/core.lua @@ -45,23 +45,6 @@ return { }, }, - --[[ - { - "jackMort/ChatGPT.nvim", - event = "VeryLazy", - config = function() - require("chatgpt").setup({ - api_key_cmd = "pass show api/chatgpt-apikey", - }) - end, - dependencies = { - "MunifTanjim/nui.nvim", - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", - }, - }, -]] - { "nvim-treesitter/nvim-treesitter-context", config = function() @@ -94,10 +77,29 @@ return { end, }, - { - "NoahTheDuke/vim-just", - ft = { "just" }, + { "NoahTheDuke/vim-just", ft = { "just" }, }, + { "L3MON4D3/LuaSnip", + version = "v2.*", + build = "make install_jsregexp", + --dependencies = { "rafamadriz/friendly-snippets" }, }, + --{ "rafamadriz/friendly-snippets" }, + --[[ + { + "jackMort/ChatGPT.nvim", + event = "VeryLazy", + config = function() + require("chatgpt").setup({ + api_key_cmd = "pass show api/chatgpt-apikey", + }) + end, + dependencies = { + "MunifTanjim/nui.nvim", + "nvim-lua/plenary.nvim", + "nvim-telescope/telescope.nvim", + }, + }, + --]] { "williamboman/mason.nvim", enabled = false }, { "williamboman/mason-lspconfig.nvim", enabled = false },