From 1bb0bbc165bfd0c4d4cea700a52bbee4a30b978e Mon Sep 17 00:00:00 2001
From: Adam Green <adam.green@adgefficiency.com>
Date: Wed, 18 Dec 2024 23:03:53 +1300
Subject: [PATCH] feat

---
 nvim/lazy-lock.json               |  2 +-
 nvim/lua/plugins/formatting.lua   | 21 +++++++++++++--------
 nvim/lua/plugins/lsp.lua          | 16 ++++++++--------
 nvim/lua/plugins/text-editing.lua |  1 +
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 52bb487..f1abb48 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -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" },
diff --git a/nvim/lua/plugins/formatting.lua b/nvim/lua/plugins/formatting.lua
index 05f4fb8..6342083 100644
--- a/nvim/lua/plugins/formatting.lua
+++ b/nvim/lua/plugins/formatting.lua
@@ -6,7 +6,7 @@ return {
 			require("conform").setup({
 				notify_on_error = false,
 				format_on_save = {
-					timeout_ms = 4000,
+					timeout_ms = 20000,
 					lsp_fallback = true,
 				},
 
@@ -23,11 +23,7 @@ return {
 					javascript = { "prettier" },
 					css = { "stylelint" },
 					yaml = { "yamlfix" },
-					sql = {
-						-- "sql_formatter",
-						"sqlfluff",
-						-- "sqlfmt",
-					},
+					sql = { "sqlfluff" },
 					["*"] = {
 						-- "codespell",
 						-- "trim_newlines",
@@ -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 = {
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 55314d3..8ff5644 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -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,
 			})
@@ -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", {
diff --git a/nvim/lua/plugins/text-editing.lua b/nvim/lua/plugins/text-editing.lua
index 5e0e768..88a1ad3 100644
--- a/nvim/lua/plugins/text-editing.lua
+++ b/nvim/lua/plugins/text-editing.lua
@@ -125,6 +125,7 @@ return {
 	},
 	{
 		"iamcco/markdown-preview.nvim",
+    enable=false,
 		cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
 		ft = { "markdown" },
 		build = function()