From 16d2c97ce8a0dddb63adb42594d737322c194a9f Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Thu, 19 Mar 2026 13:32:04 -0400 Subject: [PATCH] chore: add sqls config file ref --- .../programs/terminal/nvim/config/lua/lsp-config.lua | 12 ++++++++++-- modules/home/programs/terminal/nvim/default.nix | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua b/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua index 9dd7ded..a8643db 100755 --- a/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua +++ b/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua @@ -158,9 +158,11 @@ setup_lsp("lua_ls", { -- Unison LSP Configuration setup_lsp("unison") --- Lua LSP Configuration +-- SQL Configuration setup_lsp("sqls", { - cmd = { nix_vars.sqls }, + on_attach = on_attach_no_formatting, + cmd = { nix_vars.sqls, "-config", ".sqls.yml" }, + root_markers = { ".sqls.yml", ".git" }, }) -- Nix LSP Configuration @@ -225,6 +227,12 @@ none_ls.setup({ none_ls.builtins.formatting.prettier, none_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }), none_ls.builtins.formatting.nixpkgs_fmt, -- TODO: nixd native LSP? + none_ls.builtins.formatting.sql_formatter.with({ + extra_args = { + "--config", + '{"tabWidth":4,"keywordCase":"upper","language":"sql"}', + } + }), require("none-ls.formatting.autopep8").with({ filetypes = { "starlark", "python" }, extra_args = { "--max-line-length", "100" }, diff --git a/modules/home/programs/terminal/nvim/default.nix b/modules/home/programs/terminal/nvim/default.nix index ed56421..7dce6d9 100755 --- a/modules/home/programs/terminal/nvim/default.nix +++ b/modules/home/programs/terminal/nvim/default.nix @@ -148,6 +148,7 @@ in nixpkgs-fmt nodePackages.prettier stylua + sql-formatter # Tools ripgrep