Update config

This commit is contained in:
Davlatov Shahzod 2025-07-27 20:13:17 +03:00
parent 133f32928b
commit b027a8b5fa
3 changed files with 56 additions and 51 deletions

View File

@ -38,7 +38,7 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
-- vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" }) -- vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" })
-- vim.keymap.set("n", "<C-S-k>", "<C-w>K", { desc = "Move window to the upper" }) -- vim.keymap.set("n", "<C-S-k>", "<C-w>K", { desc = "Move window to the upper" })
-- vim.keymap.set('n', '<leader>cf', '<cmd>EslintFixAll<CR> | <cmd>w<CR>', { desc = 'ESLint Fix All', silent = true }) -- vim.keymap.set('n', '<leader>cf', '<cmd>LspEslintFixAll<CR> | <cmd>w<CR>', { desc = 'ESLint Fix All', silent = true })
vim.keymap.set('n', '<leader>cf', 'mF:%!eslint_d --stdin --fix-to-stdout --stdin-filename %<CR>`F | <cmd>w<CR>', { desc = 'ESLint Fix All', silent = true }) vim.keymap.set('n', '<leader>cf', 'mF:%!eslint_d --stdin --fix-to-stdout --stdin-filename %<CR>`F | <cmd>w<CR>', { desc = 'ESLint Fix All', silent = true })
vim.keymap.set('n', '<leader>tg', '<cmd>Neogit<CR>', { silent = true, desc = 'Neogit' }) vim.keymap.set('n', '<leader>tg', '<cmd>Neogit<CR>', { silent = true, desc = 'Neogit' })

View File

@ -201,6 +201,42 @@ return {
local vue_language_server_path = vim.fn.expand '$MASON/packages' .. '/vue-language-server' .. '/node_modules/@vue/language-server' local vue_language_server_path = vim.fn.expand '$MASON/packages' .. '/vue-language-server' .. '/node_modules/@vue/language-server'
local vue_plugin = {
name = '@vue/typescript-plugin',
location = vue_language_server_path,
languages = { 'vue' },
configNamespace = 'typescript',
}
local vtsls_config = {
settings = {
typescript = {
tsserver = {
maxTsServerMemory = 8192,
},
},
vtsls = {
tsserver = {
globalPlugins = {
vue_plugin,
},
},
},
},
filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
}
local vue_ls_config = {
init_options = {
vue = {
suggest = {
componentNameCasing = 'autoPascal',
propNameCasing = 'autoCamel',
},
},
},
}
-- Enable the following language servers -- Enable the following language servers
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed. -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
-- --
@ -224,54 +260,32 @@ return {
-- ts_ls = {}, -- ts_ls = {},
-- --
-- ts_ls = { vtsls = vtsls_config,
-- init_options = { vue_ls = vue_ls_config,
-- plugins = { oxlint = {
-- { filetypes = {
-- name = '@vue/typescript-plugin', 'javascript',
-- location = vue_language_server_path, 'javascriptreact',
-- languages = { 'vue' }, 'javascript.jsx',
-- }, 'typescript',
-- }, 'typescriptreact',
-- }, 'typescript.tsx',
-- filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }, 'vue',
-- },
vtsls = {
filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
settings = {
vtsls = {
tsserver = {
globalPlugins = {
{
name = '@vue/typescript-plugin',
location = vue_language_server_path,
languages = { 'vue' },
configNamespace = 'typescript',
enableForWorkspaceTypeScriptVersions = true,
},
},
},
},
},
},
vue_ls = {
init_options = {
vue = {
complete = {
casing = {
tags = 'autoPascal',
props = 'autoCamel',
},
},
},
}, },
}, },
prettierd = {},
eslint_d = {},
stylelint = {},
tailwindcss = {}, tailwindcss = {},
jsonlint = {},
marksman = {},
markdownlint = {},
rust_analyzer = { rust_analyzer = {
checkOnSave = { checkOnSave = {
command = 'clippy', command = 'clippy',
}, },
}, },
stylua = {},
lua_ls = { lua_ls = {
-- cmd = { ... }, -- cmd = { ... },
-- filetypes = { ... }, -- filetypes = { ... },
@ -302,15 +316,6 @@ return {
-- You can add other tools here that you want Mason to install -- You can add other tools here that you want Mason to install
-- for you, so that they are available from within Neovim. -- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {}) local ensure_installed = vim.tbl_keys(servers or {})
vim.list_extend(ensure_installed, {
'stylua', -- Used to format Lua code,
'prettierd',
'stylelint',
'eslint_d',
'oxlint',
'jsonls',
'marksman',
})
for serverKey in pairs(servers or {}) do for serverKey in pairs(servers or {}) do
local server = servers[serverKey] local server = servers[serverKey]

View File

@ -55,7 +55,7 @@ require('lazy').setup({
require 'kickstart/plugins.mini', require 'kickstart/plugins.mini',
require 'kickstart/plugins.treesitter', require 'kickstart/plugins.treesitter',
require 'kickstart.plugins.debug', -- require 'kickstart.plugins.debug',
require 'kickstart.plugins.indent_line', require 'kickstart.plugins.indent_line',
require 'kickstart.plugins.lint', require 'kickstart.plugins.lint',
require 'kickstart.plugins.autopairs', require 'kickstart.plugins.autopairs',