From 25a1a4d16eb731b35ed13350084ae9ad54bd3a7b Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Jun 2025 09:23:15 -0700 Subject: [PATCH] Include code completion and snippets --- .config/nvim/lua/plugins/chrome.lua | 77 +++++++++++++------- .config/nvim/lua/plugins/completions.lua | 45 ++++++++++++ .config/nvim/lua/plugins/language-server.lua | 22 +++--- 3 files changed, 107 insertions(+), 37 deletions(-) create mode 100644 .config/nvim/lua/plugins/completions.lua diff --git a/.config/nvim/lua/plugins/chrome.lua b/.config/nvim/lua/plugins/chrome.lua index c204064..82cc745 100644 --- a/.config/nvim/lua/plugins/chrome.lua +++ b/.config/nvim/lua/plugins/chrome.lua @@ -1,31 +1,52 @@ return { - { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("lualine").setup({ - options = { - --`theme=codedark, - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch", "diff", "diagnostics" }, - lualine_c = { "filename" }, - lualine_x = { "encoding", "filetype" }, - lualine_y = { "progress" }, - lualine_z = { "location" }, - }, - }) - end, - }, - { + { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("lualine").setup({ + options = { + --`theme=codedark, + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff", "diagnostics" }, + lualine_c = { "filename" }, + lualine_x = { "encoding", "filetype" }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, + }) + end, + }, + { - "romgrk/barbar.nvim", - tag = "v1.9.0", - --init = function() - -- vim.g.barbar_auto_setup = false - --end, - }, + "romgrk/barbar.nvim", + tag = "v1.9.0", + --init = function() + -- vim.g.barbar_auto_setup = false + --end, + }, + { + "goolord/alpha-nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + local alpha = require("alpha") + local dashboard = require("alpha.themes.startify") + + dashboard.section.header.val = { + " ", + " ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ", + " ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ", + " ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ", + " ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ", + " ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ", + " ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ", + " ", + } + + alpha.setup(dashboard.opts) + end, + }, } diff --git a/.config/nvim/lua/plugins/completions.lua b/.config/nvim/lua/plugins/completions.lua new file mode 100644 index 0000000..2770861 --- /dev/null +++ b/.config/nvim/lua/plugins/completions.lua @@ -0,0 +1,45 @@ +return { + { + "L3MON4D3/LuaSnip", + dependencies = { + "saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp + "rafamadriz/friendly-snippets", -- Collection of snippets + }, + }, + { + "hrsh7th/nvim-cmp", + config = function() + require("luasnip.loaders.from_vscode").lazy_load() -- Load snippets from friendly-snippets + local cmp = require("cmp") + + cmp.setup({ + snippet = { + -- REQUIRED - you must specify a snippet engine + expand = function(args) + require("luasnip").lsp_expand(args.body) -- For `luasnip` users. + end, + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }), + sources = cmp.config.sources({ + --{ name = "nvim_lsp" }, + { name = "luasnip" }, -- For luasnip users. + }, { + { name = "buffer" }, + }), + }) + end, + }, + { + "hrsh7th/cmp-nvim-lsp", + }, +} diff --git a/.config/nvim/lua/plugins/language-server.lua b/.config/nvim/lua/plugins/language-server.lua index 27d179f..cb77b2a 100644 --- a/.config/nvim/lua/plugins/language-server.lua +++ b/.config/nvim/lua/plugins/language-server.lua @@ -43,16 +43,20 @@ return { "neovim/nvim-lspconfig", tag = "v1.8.0", config = function() + local capabilities = require("cmp_nvim_lsp").default_capabilities() local lspconfig = require("lspconfig") - lspconfig.lua_ls.setup({}) - lspconfig.bashls.setup({}) - lspconfig.dockerls.setup({}) - lspconfig.helm_ls.setup({}) - lspconfig.jsonls.setup({}) - lspconfig.nginx_language_server.setup({}) - lspconfig.marksman.setup({}) - lspconfig.ruff.setup({}) - lspconfig.yamlls.setup({}) + lspconfig.ts_ls.setup({ + capabilities = capabilities, + }) + lspconfig.lua_ls.setup({ capabilities = capabilities }) + lspconfig.bashls.setup({ capabilities = capabilities }) + lspconfig.dockerls.setup({ capabilities = capabilities }) + lspconfig.helm_ls.setup({ capabilities = capabilities }) + lspconfig.jsonls.setup({ capabilities = capabilities }) + lspconfig.nginx_language_server.setup({ capabilities = capabilities }) + lspconfig.marksman.setup({ capabilities = capabilities }) + lspconfig.ruff.setup({ capabilities = capabilities }) + lspconfig.yamlls.setup({ capabilities = capabilities }) vim.keymap.set("n", "d", vim.lsp.buf.hover, { desc = "Show Docstring" }) vim.keymap.set("n", "gt", vim.lsp.buf.definition, { desc = "Go To Definition" }) vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" })