From 5bf8718d15f4c41d0a0362bf20d7a8b41144391d Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 11 Jan 2026 12:10:24 -0500
Subject: [PATCH] [dishvim] use built-in sqruff support

---
 flake.lock               |  6 +++---
 neovim/languages/sql.nix | 28 ++++------------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index fd1c30d5..87c1d9bc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -638,11 +638,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1768095684,
-        "narHash": "sha256-cpwxSI7c5HdjlqjQUkHtUNsX/8fDdQ9jsPvaXL8sJQ0=",
+        "lastModified": 1768135144,
+        "narHash": "sha256-c9q5pGqfVEcxqXLmjug0skKdE4IT4zFKbQdEzXGHTVY=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "516007a475b3d50fb06acc66b57980e1c51042f6",
+        "rev": "c7fe3c1818d01f71f2e1a0ec9b8e1c6a7e5c171b",
         "type": "github"
       },
       "original": {
diff --git a/neovim/languages/sql.nix b/neovim/languages/sql.nix
index 8fd08372..8cbf042f 100644
--- a/neovim/languages/sql.nix
+++ b/neovim/languages/sql.nix
@@ -1,32 +1,12 @@
 { lib, pkgs, ... }:
 {
   config.vim = {
-    extraPackages = [
-      pkgs.sqruff
-    ];
-    diagnostics.nvim-lint = {
-      linters_by_ft.sql = [ "sqruff" ];
-      linters.sqruff = {
-        cmd = lib.meta.getExe pkgs.sqruff;
-        args = [
-          "lint"
-          "--format=json"
-          "-"
-        ];
-      };
-    };
-    formatter.conform-nvim = {
-      setupOpts = {
-        formatters_by_ft.sql = [ "sqruff" ];
-        formatters = {
-          rumdl.command = lib.meta.getExe pkgs.sqruff;
-        };
-      };
-    };
     languages.sql = {
       enable = true;
-      format.enable = false;
-      extraDiagnostics.enable = false;
+      extraDiagnostics.enable = true;
+      extraDiagnostics.types = [ "sqruff" ];
+      format.enable = true;
+      format.type = [ "sqruff" ];
     };
   };
 }
-- 
2.54.0