Merge remote-tracking branch 'refs/remotes/origin/main'

12 files changed, 99 insertions, 0 deletions

diff --git a/config/essentials/nvim/lua/user/cmp/arduino.lua b/config/essentials/nvim/lua/user/cmp/arduino.lua
new file mode 100644
index 0000000..777df8d
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/arduino.lua
@@ -0,0 +1,3 @@
+require'lspconfig'.arduino_language_server.setup{
+	cmd = {"arduino-language-server", "-cli-config", "~/.arduinoIDE/arduino-cli.yaml"}
+}
diff --git a/config/essentials/nvim/lua/user/cmp/bash.lua b/config/essentials/nvim/lua/user/cmp/bash.lua
new file mode 100644
index 0000000..91b6fba
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/bash.lua
@@ -0,0 +1 @@
+require'lspconfig'.bashls.setup{}
diff --git a/config/essentials/nvim/lua/user/cmp/clangd.lua b/config/essentials/nvim/lua/user/cmp/clangd.lua
new file mode 100644
index 0000000..810aa42
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/clangd.lua
@@ -0,0 +1,2 @@
+-- c cpp
+require'lspconfig'.clangd.setup{}
diff --git a/config/essentials/nvim/lua/user/cmp/css.lua b/config/essentials/nvim/lua/user/cmp/css.lua
new file mode 100644
index 0000000..07cb8bc
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/css.lua
@@ -0,0 +1 @@
+require'lspconfig'.cssls.setup{}
diff --git a/config/essentials/nvim/lua/user/cmp/emmet.lua b/config/essentials/nvim/lua/user/cmp/emmet.lua
new file mode 100644
index 0000000..3193727
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/emmet.lua
@@ -0,0 +1 @@
+require'lspconfig'.emmet_ls.setup{}
diff --git a/config/essentials/nvim/lua/user/cmp/html.lua b/config/essentials/nvim/lua/user/cmp/html.lua
new file mode 100644
index 0000000..69ed29d
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/html.lua
@@ -0,0 +1,7 @@
+-- html
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
+
+require'lspconfig'.html.setup {
+  capabilities = capabilities,
+}
diff --git a/config/essentials/nvim/lua/user/cmp/init.lua b/config/essentials/nvim/lua/user/cmp/init.lua
new file mode 100644
index 0000000..a545f12
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/init.lua
@@ -0,0 +1,12 @@
+require("user.cmp.setup")
+
+require("user.cmp.arduino")
+require("user.cmp.bash")
+require("user.cmp.clangd")
+require("user.cmp.html")
+require("user.cmp.css")
+require("user.cmp.java")
+require("user.cmp.js")
+require("user.cmp.emmet")
+require("user.cmp.lua")
+require("user.cmp.python")
diff --git a/config/essentials/nvim/lua/user/cmp/java.lua b/config/essentials/nvim/lua/user/cmp/java.lua
new file mode 100644
index 0000000..1027588
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/java.lua
@@ -0,0 +1 @@
+-- require'lspconfig'.jdtls.setup{}
diff --git a/config/essentials/nvim/lua/user/cmp/js.lua b/config/essentials/nvim/lua/user/cmp/js.lua
new file mode 100644
index 0000000..7188a22
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/js.lua
@@ -0,0 +1 @@
+require'lspconfig'.tsserver.setup{}
diff --git a/config/essentials/nvim/lua/user/cmp/lua.lua b/config/essentials/nvim/lua/user/cmp/lua.lua
new file mode 100644
index 0000000..e594870
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/lua.lua
@@ -0,0 +1,20 @@
+-- lua
+require'lspconfig'.lua_ls.setup {
+  settings = {
+    Lua = {
+      runtime = {
+        version = 'LuaJIT',
+      },
+      diagnostics = {
+        globals = {'vim'},
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file("", true),
+		checkThirdParty = false, -- no prompt for luassert :)
+      },
+      telemetry = {
+        enable = false,
+      },
+    },
+  },
+}
diff --git a/config/essentials/nvim/lua/user/cmp/python.lua b/config/essentials/nvim/lua/user/cmp/python.lua
new file mode 100644
index 0000000..aec86bd
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/python.lua
@@ -0,0 +1 @@
+require'lspconfig'.jedi_language_server.setup{}
diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua
new file mode 100644
index 0000000..ed8a2d2
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/setup.lua
@@ -0,0 +1,49 @@
+local cmp = require'cmp'
+cmp.setup({
+	snippet = {
+		expand = function(args)
+			require('luasnip').lsp_expand(args.body)
+		end,
+	},
+	window = {
+		-- completion = cmp.config.window.bordered(),
+		-- documentation = cmp.config.window.bordered(),
+	},
+	mapping = cmp.mapping.preset.insert({
+		['<C-b>'] = cmp.mapping.scroll_docs(-4),
+		['<C-f>'] = cmp.mapping.scroll_docs(4),
+		['<C-Space>'] = cmp.mapping.complete(),
+		['<C-c>'] = cmp.mapping.abort(),
+		['<C-y>'] = cmp.mapping.confirm({ select = true }),
+	}),
+	sources = cmp.config.sources({
+		{ name = 'nvim_lua' },
+		{ name = 'nvim_lsp'},
+		{ name = 'path' },
+		{ name = 'luasnip' },
+		{ name = 'nvim_lsp_signature_help' },
+		{ name = 'buffer', keyword_length = 4 },
+	}),
+	preselect = cmp.PreselectMode.None,
+})
+
+cmp.setup.filetype('gitcommit', {
+	sources = cmp.config.sources({
+		{ name = 'cmp_git' },
+		{ name = 'buffer', keyword_length = 4 },
+	})
+})
+
+cmp.setup.cmdline({ '/', '?' }, {
+	mapping = cmp.mapping.preset.cmdline(),
+	sources = {
+		{ name = 'buffer', keyword_length = 4 }
+	},
+})
+cmp.setup.cmdline(':', {
+	mapping = cmp.mapping.preset.cmdline(),
+	sources = cmp.config.sources({
+		{ name = 'path' },
+		{ name = 'cmdline', keyword_length = 4 }
+	}),
+})