From 8c7f054891576fb4e053d908778f3a7e73049ccd Mon Sep 17 00:00:00 2001 From: urec56 Date: Sun, 8 Jun 2025 19:30:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20sqlfluff.=20?= =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=82=D0=B0=D0=B1?= =?UTF-8?q?=D1=8B=20=D0=B2=20=D0=BF=D0=B8=D1=82=D0=BE=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nvim/lua/kickstart/plugins/autoformat.lua | 26 +++++++++++------------ nvim/lua/kickstart/settings.lua | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/nvim/lua/kickstart/plugins/autoformat.lua b/nvim/lua/kickstart/plugins/autoformat.lua index 8ce5e72..964074d 100644 --- a/nvim/lua/kickstart/plugins/autoformat.lua +++ b/nvim/lua/kickstart/plugins/autoformat.lua @@ -41,7 +41,7 @@ return { formatters_by_ft = { lua = { 'stylua' }, go = { 'gofmt', 'injected' }, - sql = { 'sqlfluff' }, + -- sql = { 'sqlfluff' }, -- ['*'] = { 'injected' }, -- enables injected-lang formatting for all filetypes -- Conform can also run multiple formatters sequentially @@ -67,18 +67,18 @@ return { -- end, -- stdin = true, -- }, - sqlfluff = { - command = 'sqlfluff', - args = { - 'format', - -- 'fix', - -- '--dialect', - -- 'postgres', - -- '--disable-progress-bar', - '-', - }, - stdin = true, - }, + -- sqlfluff = { + -- command = 'sqlfluff', + -- args = { + -- 'format', + -- -- 'fix', + -- -- '--dialect', + -- -- 'postgres', + -- -- '--disable-progress-bar', + -- '-', + -- }, + -- stdin = true, + -- }, }, }, }, diff --git a/nvim/lua/kickstart/settings.lua b/nvim/lua/kickstart/settings.lua index 7e314d7..ab65155 100644 --- a/nvim/lua/kickstart/settings.lua +++ b/nvim/lua/kickstart/settings.lua @@ -28,6 +28,7 @@ vim.opt.expandtab = true -- Их параметры конфига для переназначения не работают. Пришлось костыль сделать vim.cmd [[ autocmd FileType yaml setlocal shiftwidth=2 tabstop=2 softtabstop=2 expandtab + autocmd BufEnter *.py :setlocal shiftwidth=4 tabstop=4 softtabstop=4 noexpandtab ]] -- Комментировать .proto код биндом