Skip to content

Commit

Permalink
feat
Browse files Browse the repository at this point in the history
  • Loading branch information
ADGEfficiency committed Dec 18, 2024
1 parent 5ecbe91 commit 1bb0bbc
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
2 changes: 1 addition & 1 deletion nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
"gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
"indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
"lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
Expand Down
21 changes: 13 additions & 8 deletions nvim/lua/plugins/formatting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ return {
require("conform").setup({
notify_on_error = false,
format_on_save = {
timeout_ms = 4000,
timeout_ms = 20000,
lsp_fallback = true,
},

Expand All @@ -23,11 +23,7 @@ return {
javascript = { "prettier" },
css = { "stylelint" },
yaml = { "yamlfix" },
sql = {
-- "sql_formatter",
"sqlfluff",
-- "sqlfmt",
},
sql = { "sqlfluff" },
["*"] = {
-- "codespell",
-- "trim_newlines",
Expand All @@ -37,8 +33,17 @@ return {
},
})

require("conform").formatters.sql_formatter = {
command = "sql-formatter --dialect sqlite",
require("conform").formatters.sqlfluff = {
command = "sqlfluff",
inherit = false,
args = {
"fix",
"-t",
"dbt",
"$FILENAME",
},
stdin = false,
require_cwd = true,
}

require("conform").formatters.djlintJinja = {
Expand Down
16 changes: 8 additions & 8 deletions nvim/lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ return {
"lua_ls",
"html",
"docker_compose_language_service",
"ruff_lsp",
-- "ruff",
"bashls",
"dockerls",
"jsonls",
"prosemd_lsp",
-- "rnix",
"tsserver",
-- "tsserver",
"emmet_language_server",
"pyright",
"rust_analyzer",
"jedi_language_server",
"sqlls",
-- "sqlls",
},
automatic_installation = true,
})
Expand Down Expand Up @@ -227,11 +227,11 @@ return {
tailwindcss = {
cmd = { "tailwindcss-language-server", "--stdio" },
},
sqlls = {
root_dir = function(fname)
return vim.loop.cwd()
end,
},
-- sqlls = {
-- root_dir = function(fname)
-- return vim.loop.cwd()
-- end,
-- },
}
for server, config in pairs(servers) do
require("lspconfig")[server].setup(vim.tbl_deep_extend("force", {
Expand Down
1 change: 1 addition & 0 deletions nvim/lua/plugins/text-editing.lua
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ return {
},
{
"iamcco/markdown-preview.nvim",
enable=false,
cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
ft = { "markdown" },
build = function()
Expand Down

0 comments on commit 1bb0bbc

Please sign in to comment.