fixed plugins

This commit is contained in:
MasterGordon 2024-08-07 16:42:06 +02:00
parent 8a006681eb
commit 2c758c8ecb
3 changed files with 95 additions and 8 deletions

View File

@ -107,6 +107,28 @@ require("lazy").setup(
"jay-babu/mason-null-ls.nvim"
}
},
{
"luckasRanarison/tailwind-tools.nvim",
dependencies = {"nvim-treesitter/nvim-treesitter"},
opts = {
document_color = {
enabled = true, -- can be toggled by commands
kind = "inline", -- "inline" | "foreground" | "background"
inline_symbol = "󰝤 ", -- only used in inline mode
debounce = 200 -- in milliseconds, only applied in insert mode
},
conceal = {
enabled = false, -- can be toggled by commands
min_length = nil, -- only conceal classes exceeding the provided length
symbol = "󱏿", -- only a single character is allowed
highlight = {
-- extmark highlight options, see :h 'highlight'
fg = "#38BDF8"
}
},
custom_filetypes = {} -- see the extension section to learn how it works
} -- your configuration
},
{
"nvim-telescope/telescope.nvim",
config = function()
@ -131,7 +153,6 @@ require("lazy").setup(
mappings = {
i = {
["<Esc>"] = "close",
["n"] = {require("telescope.actions").move_selection_next, type = "action"},
["1"] = {selectX(1), type = "action"},
["2"] = {selectX(2), type = "action"},
["3"] = {selectX(3), type = "action"},
@ -214,12 +235,12 @@ require("lazy").setup(
-- require("plugins/copilot")
-- end
-- },
{
"supermaven-inc/supermaven-nvim",
config = function()
require("supermaven-nvim").setup({})
end
},
-- {
-- "supermaven-inc/supermaven-nvim",
-- config = function()
-- require("supermaven-nvim").setup({})
-- end
-- },
{
"ggandor/lightspeed.nvim",
dependencies = {"tpope/vim-repeat"}

View File

@ -95,3 +95,23 @@ vim.api.nvim_create_autocmd(
group = formatGrp
}
)
local function organize_imports()
local params = {
command = "typescript.organizeImports",
arguments = {vim.api.nvim_buf_get_name(0)},
title = ""
}
vim.lsp.buf.execute_command(params)
end
local organizeImportsGrp = vim.api.nvim_create_augroup("OrgImports", {clear = true})
vim.api.nvim_create_autocmd(
"BufWritePre",
{
pattern = "*.ts,*.tsx",
callback = function(ev)
organize_imports()
end,
group = formatGrp
}
)

View File

@ -33,7 +33,8 @@ local extra_servers = {
"eslint",
"jsonls",
"omnisharp",
"rust_analyzer"
"rust_analyzer",
"tailwindcss"
}
-- Ensure that required tools are installed
@ -172,6 +173,51 @@ for _, lsp in ipairs(common_servers) do
}
end
local path = vim.uv.cwd()
local config_path = path .. "/.vscode/settings.json"
local tailwindcss_settings = {}
if vim.uv.fs_stat(config_path) then
local file = vim.fn.readfile(config_path)
local vscode_settings = vim.fn.json_decode(file)
tailwindcss_settings =
vim.tbl_deep_extend(
"force",
tailwindcss_settings,
{
tailwindCSS = {
rootFontSize = vscode_settings["tailwindCSS.rootFontSize"]
}
}
)
end
nvim_lsp.tailwindcss.setup {
on_attach = on_attach,
flags = {
debounce_text_changes = 150
},
capabilities = capabilities,
-- on_init = function(client)
-- local path = client.workspace_folders and client.workspace_folders[1] and client.workspace_folders[1].name
-- local config_path = path .. "/.vscode/settings.json"
-- if vim.uv.fs_stat(config_path) then
-- local file = vim.fn.readfile(config_path)
-- local vscode_settings = vim.fn.json_decode(file)
-- client.config.settings =
-- vim.tbl_deep_extend(
-- "force",
-- client.config.settings,
-- {
-- tailwindCSS = {
-- rootFontSize = vscode_settings["tailwindCSS.rootFontSize"]
-- }
-- }
-- )
-- client.notify(vim.lsp.protocol.Methods.workspace_didChangeConfiguration, {settings = client.config.settings})
-- end
-- end,
settings = tailwindcss_settings
}
nvim_lsp.omnisharp.setup {
cmd = {"OmniSharp"},
enable_editorconfig_support = true,