mirror of
https://github.com/pratiktri/dotfiles.git
synced 2026-02-04 08:41:43 +05:30
fix(neovim): LSP, Formatter, Linter all in their places
- Formatter: Don't need both prettier & prettierd. Only use prettierd - Formatter: markdown-toc is LSP not formatter - Formatter: shellharden isn't formatter - Formatter: Only shfmt for shell formatting - Formatter: Don't need prettier to format yaml - Linter: codespell on all buffers - Install script: Remove prettier & shellharden (its useless with bashls) - LSP: markdownlint, prettier, shellcheck, shellharden, shfmt aren't LSP
This commit is contained in:
@@ -1,4 +0,0 @@
|
||||
return {
|
||||
cmd = { "markdownlint-language-server", "--stdio" },
|
||||
filetypes = { "markdown" },
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
return {
|
||||
cmd = { "prettier", "--lsp" },
|
||||
filetypes = {
|
||||
"javascript",
|
||||
"typescript",
|
||||
"css",
|
||||
"scss",
|
||||
"html",
|
||||
"json",
|
||||
"yaml",
|
||||
},
|
||||
root_markers = { ".prettierrc", "package.json" },
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
return {
|
||||
cmd = { "shellcheck", "--format=json", "-" },
|
||||
filetypes = { "sh", "bash", "zsh" },
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
return {
|
||||
cmd = { "shellharden", "--suggest" },
|
||||
filetypes = { "sh", "bash", "zsh" },
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
return {
|
||||
cmd = { "shfmt", "-l", "-" },
|
||||
filetypes = { "sh", "bash", "zsh" },
|
||||
}
|
||||
@@ -4,6 +4,7 @@
|
||||
-- Step 2: Append the LSP server name in the below array ("newlsp")
|
||||
-- Step 3: Create file ("newlsp.lua") in ../../lsp/
|
||||
-- Step 4: Return a lua table containing required lsp config in it
|
||||
-- NOTE: Only LSPs here, NOT linters or formatter
|
||||
vim.lsp.enable({
|
||||
"bashls",
|
||||
"cssls",
|
||||
@@ -12,13 +13,8 @@ vim.lsp.enable({
|
||||
"html",
|
||||
"jsonls",
|
||||
"lua_ls",
|
||||
"markdownlint",
|
||||
"marksman",
|
||||
"prettier",
|
||||
"pylsp",
|
||||
"shellcheck",
|
||||
"shellharden",
|
||||
"shfmt",
|
||||
"taplo",
|
||||
"trivy",
|
||||
"ts_ls",
|
||||
|
||||
@@ -5,42 +5,33 @@ return {
|
||||
event = { "BufWritePre" },
|
||||
opts = {
|
||||
formatters_by_ft = {
|
||||
bash = { "shfmt", "shellharden", stop_after_first = true },
|
||||
css = { "prettierd", "prettier", stop_after_first = true },
|
||||
graphql = { "prettierd", "prettier", stop_after_first = true },
|
||||
html = { "prettierd", "prettier", stop_after_first = true },
|
||||
javascript = { "prettierd", "prettier", stop_after_first = true },
|
||||
javascriptreact = { "prettierd", "prettier", stop_after_first = true },
|
||||
json = { "prettierd", "prettier", stop_after_first = true },
|
||||
sh = { "shfmt" },
|
||||
bash = { "shfmt" },
|
||||
zsh = { "shfmt" },
|
||||
|
||||
graphql = { "prettierd" },
|
||||
css = { "prettierd" },
|
||||
html = { "prettierd" },
|
||||
javascript = { "prettierd" },
|
||||
javascriptreact = { "prettierd" },
|
||||
svelte = { "prettierd" },
|
||||
typescript = { "prettierd" },
|
||||
typescriptreact = { "prettierd" },
|
||||
json = { "prettierd" },
|
||||
|
||||
lua = { "stylua" },
|
||||
markdown = { "markdownlint", "markdown-toc" },
|
||||
markdown = { "markdownlint" },
|
||||
python = { "black" },
|
||||
rust = { "rustfmt" },
|
||||
sh = { "shfmt", "shellharden", stop_after_first = true },
|
||||
svelte = { "prettierd", "prettier", stop_after_first = true },
|
||||
typescript = { "prettierd", "prettier", stop_after_first = true },
|
||||
typescriptreact = { "prettierd", "prettier", stop_after_first = true },
|
||||
yaml = { "yamlfmt", "prettierd", stop_after_first = true },
|
||||
zsh = { "shfmt", "shellharden", stop_after_first = true },
|
||||
yaml = { "yamlfmt" },
|
||||
|
||||
["_"] = { "trim_whitespace" },
|
||||
},
|
||||
format_on_save = function(bufnr)
|
||||
-- Disable "format_on_save lsp_fallback" for languages that don't
|
||||
-- have a well standardized coding style. You can add additional
|
||||
-- languages here or re-enable it for the disabled ones.
|
||||
local disable_filetypes = { c = true, cpp = true }
|
||||
local lsp_format_opt
|
||||
if disable_filetypes[vim.bo[bufnr].filetype] then
|
||||
lsp_format_opt = "never"
|
||||
else
|
||||
lsp_format_opt = "fallback"
|
||||
end
|
||||
return {
|
||||
quiet = false,
|
||||
timeout_ms = 500,
|
||||
lsp_format = lsp_format_opt,
|
||||
}
|
||||
end,
|
||||
format_on_save = {
|
||||
lsp_fallback = true,
|
||||
async = false,
|
||||
timeout_ms = 500,
|
||||
},
|
||||
formatters = {
|
||||
injected = { options = { ignore_errors = true } },
|
||||
shfmt = { prepend_args = { "-i", "4" } },
|
||||
@@ -50,16 +41,6 @@ return {
|
||||
vim.loop.os_homedir() .. "/.config/templates/markdownlint.json",
|
||||
},
|
||||
},
|
||||
["markdown-toc"] = {
|
||||
-- Format only if TOC present in the file
|
||||
condition = function(_, ctx)
|
||||
for _, line in ipairs(vim.api.nvim_buf_get_lines(ctx.buf, 0, -1, false)) do
|
||||
if line:find("<!%-%- toc %-%->") then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end,
|
||||
},
|
||||
yamlfmt = {
|
||||
prepend_args = {
|
||||
"-formatter",
|
||||
|
||||
@@ -8,19 +8,12 @@ return {
|
||||
|
||||
-- Linters are only required for dynamically typed languages
|
||||
lint.linters_by_ft = {
|
||||
python = { "pylint", "codespell" },
|
||||
markdown = { "markdownlint", "codespell" },
|
||||
python = { "pylint" },
|
||||
markdown = { "markdownlint" },
|
||||
yaml = { "yamllint" },
|
||||
lua = { "codespell" },
|
||||
bash = { "codespell" },
|
||||
sh = { "codespell" },
|
||||
zsh = { "codespell" },
|
||||
typescript = { "codespell" },
|
||||
javascript = { "codespell" },
|
||||
typescriptreact = { "codespell" },
|
||||
javascriptreact = { "codespell" },
|
||||
dockerfile = { "hadolint" },
|
||||
html = { "codespell" },
|
||||
|
||||
["*"] = { "codespell" },
|
||||
}
|
||||
|
||||
local markdownlint = lint.linters.markdownlint
|
||||
|
||||
@@ -17,13 +17,11 @@ markdownlint-cli
|
||||
marksman
|
||||
n
|
||||
neovim
|
||||
prettier
|
||||
prettierd
|
||||
python-lsp-server
|
||||
python@3.12
|
||||
rclone
|
||||
sccache
|
||||
shellharden
|
||||
shodan
|
||||
speedtest-cli
|
||||
sqlite
|
||||
|
||||
Reference in New Issue
Block a user