docs/manual/release-notes/rl-0.9.md

@@ -22,8 +22,8 @@
 
   Some other settings and commands are now deprecated but are still supported.
 
-  - The `setupOpts.mappings` options were also removed. Use the built-in Neovim
-    settings (nvf's {option}`vim.keymaps`)
+  - The `setupOpts.mappings` options were also removed. Use the built-in
+    Neovim settings (nvf's {option}`vim.keymaps`)
 
 ## Changelog {#sec-release-0-9-changelog}
 
@@ -69,8 +69,7 @@
 
 [jtliang24](https://github.com/jtliang24):
 
-- Updated nix language plugin to use pkgs.nixfmt instead of
-  pkgs.nixfmt-rfc-style
+- Updated nix language plugin to use pkgs.nixfmt instead of pkgs.nixfmt-rfc-style
 
 [alfarel](https://github.com/alfarelcynthesis):
 
@@ -129,5 +128,3 @@
 [pyrox0](https://github.com/pyrox0):
 
 - Added [rumdl](https://github.com/rvben/rumdl) support to `languages.markdown`
-
-- Added [sqruff](https://github.com/quarylabs/sqruff) support to `languages.sql`

flake.nix

@@ -91,29 +91,18 @@
           # Check if codebase is properly formatted.
           # This can be initiated with `nix build .#checks.<system>.nix-fmt`
           # or with `nix flake check`
-          nix-fmt =
-            pkgs.runCommand "nix-fmt-check"
-            {
-              src = self;
-              nativeBuildInputs = [pkgs.alejandra pkgs.fd];
-            } ''
-              cd "$src"
-              fd -t f -e nix -x alejandra --check '{}'
-              touch $out
-            '';
+          nix-fmt = pkgs.runCommand "nix-fmt-check" {nativeBuildInputs = [pkgs.alejandra];} ''
+            alejandra --check ${self} < /dev/null
+            touch $out
+          '';
 
           # Check if Markdown sources are properly formatted
           # This can be initiated with `nix build .#checks.<system>.md-fmt`
           # or with `nix flake check`
-          md-fmt =
-            pkgs.runCommand "md-fmt-check" {
-              src = self;
-              nativeBuildInputs = [pkgs.deno pkgs.fd];
-            } ''
-              cd "$src"
-              fd -t f -e md -x deno fmt --check '{}'
-              touch $out
-            '';
+          md-fmt = pkgs.runCommand "md-fmt-check" {nativeBuildInputs = [pkgs.deno];} ''
+            deno fmt --check ${self} --ext md
+            touch $out
+          '';
         };
       };
     };

modules/plugins/languages/sql.nix

@@ -15,7 +15,6 @@
 
   cfg = config.vim.languages.sql;
   sqlfluffDefault = pkgs.sqlfluff;
-  sqruffDefault = pkgs.sqruff;
 
   defaultServers = ["sqls"];
   servers = {
@@ -40,10 +39,6 @@
       command = getExe sqlfluffDefault;
       append_args = ["--dialect=${cfg.dialect}"];
     };
-    sqruff = {
-      command = getExe sqruffDefault;
-      append_args = ["--dialect=${cfg.dialect}"];
-    };
   };
 
   defaultDiagnosticsProvider = ["sqlfluff"];
@@ -55,13 +50,6 @@
         args = ["lint" "--format=json" "--dialect=${cfg.dialect}"];
       };
     };
-    sqruff = {
-      package = sqruffDefault;
-      config = {
-        cmd = getExe sqruffDefault;
-        args = ["lint" "--format=json" "--dialect=${cfg.dialect}" "-"];
-      };
-    };
   };
 in {
   options.vim.languages.sql = {
@@ -70,7 +58,7 @@ in {
     dialect = mkOption {
       type = str;
       default = "ansi";
-      description = "SQL dialect for formatters and diagnostics (if used)";
+      description = "SQL dialect for sqlfluff (if used)";
     };
 
     treesitter = {