diff --git a/flake.lock b/flake.lock index 80777c4..cba6c2a 100644 --- a/flake.lock +++ b/flake.lock @@ -263,11 +263,11 @@ }, "nixpkgs2": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { diff --git a/nixos/packages.nix b/nixos/packages.nix index fb6a609..f67464c 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -198,7 +198,6 @@ # SQL sqls # SQL LSP postgres-lsp # Postgres SQL - sqlfluff # SQL linter # sql-formatter # SQL formatter sqlite dbeaver-bin diff --git a/nvim/lua/kickstart/plugins/autoformat.lua b/nvim/lua/kickstart/plugins/autoformat.lua index a94e5ef..2f0a516 100644 --- a/nvim/lua/kickstart/plugins/autoformat.lua +++ b/nvim/lua/kickstart/plugins/autoformat.lua @@ -39,7 +39,6 @@ return { formatters_by_ft = { lua = { 'stylua' }, go = { 'gofmt', 'injected' }, - sql = { 'sqlfluff' }, -- ['*'] = { 'injected' }, -- enables injected-lang formatting for all filetypes -- Conform can also run multiple formatters sequentially @@ -48,36 +47,7 @@ return { -- You can use 'stop_after_first' to run the first available formatter from the list -- javascript = { "prettierd", "prettier", stop_after_first = true }, }, - formatters = { - -- sql_formatter = { - -- -- prepend_args = { "-c", vim.fn.expand("~/.config/sql_formatter.json"), - -- args = function() - -- -- Создаём временный JSON-файл конфигурации - -- local config_path = vim.fn.tempname() .. ".json" - -- local config_content = vim.fn.json_encode({ - -- tabWidth = 4, - -- }) - -- local file = io.open(config_path, "w") - -- file:write(config_content) - -- file:close() - -- -- Возвращаем аргументы для форматтера с указанием конфигурационного файла - -- return { "-c", config_path } - -- end, - -- stdin = true, - -- }, - sqlfluff = { - command = 'sqlfluff', - args = { - 'format', - -- 'fix', - -- '--dialect', - -- 'postgres', - -- '--disable-progress-bar', - '-', - }, - stdin = true, - }, - }, + formatters = {}, }, }, } diff --git a/nvim/lua/kickstart/plugins/lint.lua b/nvim/lua/kickstart/plugins/lint.lua index 8fef678..a46d852 100644 --- a/nvim/lua/kickstart/plugins/lint.lua +++ b/nvim/lua/kickstart/plugins/lint.lua @@ -6,7 +6,6 @@ return { local lint = require 'lint' lint.linters_by_ft = { -- markdown = { 'markdownlint' }, - -- sql = { 'sqlfluff' }, -- go = { 'golangcilint' }, -- proto = { 'buf_lint' }, -- Крашит }