diff --git a/.sqlfluff b/.sqlfluff
new file mode 100644
index 0000000..6890dcc
--- /dev/null
+++ b/.sqlfluff
@@ -0,0 +1,6 @@
+[sqlfluff]
+dialect = postgres
+
+[sqlfluff:indentation]
+indent_unit = space
+tab_space_size = 2
diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
index dc47efe..e087331 100644
--- a/lua/plugins/conform.lua
+++ b/lua/plugins/conform.lua
@@ -12,7 +12,7 @@ return {
     formatters = {
       sqlfluff = {
         require_cwd = false,
-        args = { "format", "--dialect=postgres", "-" },
+        args = { "format", "--config", os.getenv("HOME") .. "/.config/nvim/.sqlfluff", "-" },
       },
       mojo = {
         inherit = false,
diff --git a/lua/plugins/nvim-lint.lua b/lua/plugins/nvim-lint.lua
index f332690..8c28632 100644
--- a/lua/plugins/nvim-lint.lua
+++ b/lua/plugins/nvim-lint.lua
@@ -1,3 +1,8 @@
+-- Markdown linting configuration
+-- Uses markdownlint-cli2 for linting markdown files
+-- SQL linting configuration
+-- Configures sqlfluff linter for SQL dialects
+
 return {
   "mfussenegger/nvim-lint",
   opts = {
@@ -10,7 +15,7 @@ return {
       ["markdownlint-cli2"] = {
         args = { "--config", os.getenv("HOME") .. "/.config/nvim/.markdownlint-cli2.yaml", "--" },
       },
-      sqlfluff = { prepend_args = { "--dialect", "postgres" } },
+      sqlfluff = { args = { "lint", "--format=json", "--config", os.getenv("HOME") .. "/.config/nvim/.sqlfluff", "-" } },
     },
   },
 }