This commit is contained in:
DavidOnTop 2024-04-18 19:17:22 +02:00
parent ac6ba45b85
commit b053b742ab
No known key found for this signature in database
GPG key ID: 5D05538A45D5149F
11 changed files with 195 additions and 178 deletions

View file

@ -4,11 +4,10 @@ vim.opt.relativenumber = true
vim.opt.cursorline = true
vim.opt.cursorcolumn = true
vim.cmd[[
highlight CursorColumn guibg=none ctermbg=none
highlight link CursorColumn CursorLine
]]
-- vim.cmd[[
-- highlight CursorColumn guibg=none ctermbg=none
-- highlight link CursorColumn CursorLine
-- ]]
-- fixmap
vim.cmd[[
@ -27,9 +26,3 @@ vim.opt.relativenumber = true
vim.opt.cursorline = true
vim.opt.cursorcolumn = true
vim.cmd[[
highlight CursorColumn guibg=none ctermbg=none
highlight link CursorColumn CursorLine
]]

View file

@ -85,17 +85,6 @@ local on_attach = function(client, bufnr)
end
local servers = {
clangd = {},
rust_analyzer = {
cargo = {
allFeatures = true,
},
inlayHints = {
closyreCaptureHints = {
enable = true,
},
},
},
-- sumneko_lua = {
-- Lua = {
-- workspace = { checkThirdParty = false },
@ -106,6 +95,7 @@ local servers = {
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
capabilities.offsetEncoding = { "utf-16" } -- fix copilot
require('mason').setup()
require("mason-nvim-dap").setup({automatic_installation = true, handlers = {
@ -127,27 +117,63 @@ mason_lspconfig.setup_handlers {
end,
}
require("lspconfig").zls.setup{
cmd = {"zls"},
require("lspconfig").rust_analyzer.setup{
capabilities = capabilities,
on_attach = on_attach,
settings = {
-- ["rust-analyzer"] = {
cargo = {
features = "all"
},
inlayHints = {
closyreCaptureHints = {
enable = true,
},
},
check = {
command = "clippy",
features = "all",
},
imports = {
preferPrelude = true,
}
-- },
},
}
require("lspconfig").sourcekit.setup{
--cmd = {"sourcekit-lsp"},
require("lspconfig").zls.setup{
cmd = {"zls"},
on_attach = on_attach,
}
require("lspconfig").tailwindcss.setup {
filetypes = {
"astro", "astro-markdown", "clojure", "django-html", "htmldjango", "edge", "eelixir", "elixir", "ejs", "erb", "eruby", "gohtml", "haml", "handlebars", "hbs", "html", "html-eex", "heex", "jade", "leaf", "liquid", "markdown", "mdx", "mustache", "njk", "nunjucks", "php", "razor", "slim", "twig", "css", "less", "postcss", "sass", "scss", "stylus", "sugarss", "javascript", "javascriptreact", "reason", "rescript", "typescript", "typescriptreact", "vue", "svelte",
"rust",
"rust", "fsharp",
},
init_options = {
userLanguages = {
rust = "html",
fsharp = "html",
},
},
root_dir = require("lspconfig").util.root_pattern("tailwind.config.js", "tailwind.config.ts"),
root_dir = require("lspconfig").util.root_pattern("tailwind.config.cjs", "tailwind.config.mjs", "tailwind.config.js", "tailwind.config.ts"),
settings = {
tailwindCSS = {
--files = {exclude = ""},
classAttributes = { "class", "className", "class:list", "classList", "ngClass", "classes" },
lint = {
cssConflict = "warning",
invalidApply = "error",
invalidConfigPath = "error",
invalidScreen = "error",
invalidTailwindDirective = "error",
invalidVariant = "error",
recommendedVariantOrder = "warning"
},
validate = true
}
}
}
-- lspinfo
@ -212,3 +238,7 @@ vim.diagnostic.config({
update_in_insert = true,
virtual_text = true,
})
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_snipmate").lazy_load()

View file

@ -3,4 +3,4 @@ require("neo-tree").setup({
winbar = true,
statusline = false,
},
})
})

14
after/plugin/none-ls.lua Normal file
View file

@ -0,0 +1,14 @@
local null_ls = require("null-ls")
null_ls.setup({
sources = {
null_ls.builtins.formatting.stylua,
null_ls.builtins.formatting.shfmt,
null_ls.builtins.formatting.prettier,
null_ls.builtins.code_actions.gitsigns,
--null_ls.builtins.completion.luasnip,
null_ls.builtins.diagnostics.buf,
null_ls.builtins.formatting.biome,
null_ls.builtins.formatting.buf,
null_ls.builtins.formatting.fantomas,
}
})