diff options
| -rw-r--r-- | lua/config.lua | 18 | ||||
| -rw-r--r-- | lua/lsp.lua | 10 |
2 files changed, 25 insertions, 3 deletions
diff --git a/lua/config.lua b/lua/config.lua index 03062cb..c5a42a8 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -30,7 +30,7 @@ vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "CursorHoldI", "FocusGai vim.o.cinoptions = "l1,g0,N-s,(s,U1,w1,Ws" vim.o.list = true -vim.o.listchars = "lead:·" +vim.o.listchars = "lead:·,tab:\\x20\\x20" require("ibl").setup { scope = { @@ -38,6 +38,7 @@ require("ibl").setup { }, indent = { char = "│", + tab_char = "│", }, } @@ -51,7 +52,20 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, { }) vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - command = "set filetype=glsl", pattern = { "*.frag", "*.vert" }, + command = "set filetype=glsl", +}) + +vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { + pattern = { "*.templ" }, + command = "set filetype=templ", +}) + +vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { + pattern = { "*.go" }, + callback = function() + local buf = vim.api.nvim_get_current_buf() + vim.api.nvim_buf_set_option(buf, "expandtab", false) + end, }) diff --git a/lua/lsp.lua b/lua/lsp.lua index 8f9e5f3..f07b788 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -1,7 +1,7 @@ require("mason").setup() require("mason-lspconfig").setup({ - ensure_installed = { "clangd", "tsserver" }, + ensure_installed = { "clangd", "tsserver", "gopls" }, }) local cmp = require("cmp") @@ -66,6 +66,7 @@ require("mason-lspconfig").setup_handlers({ on_attach = lsp_on_attach, capabilities = lsp_capabilities, filetypes = { "c", "cpp" }, + cmd = { "C:\\Program Files\\LLVM\\bin\\clangd.exe" }, }) end, ["tsserver"] = function() @@ -73,6 +74,13 @@ require("mason-lspconfig").setup_handlers({ on_attach = lsp_on_attach, capabilities = lsp_capabilities, }) + end, + ["gopls"] = function() + lspconfig.gopls.setup({ + on_attach = lsp_on_attach, + capabilities = lsp_capabilities, + cmd = { "gopls.exe" }, + }) end }) |