Some fixes + sqls from work mac

This commit is contained in:
Tyler Hallada 2023-01-06 21:05:38 -05:00
parent 26446abf36
commit 7599c8e94d
3 changed files with 7 additions and 2 deletions

View File

@ -226,6 +226,7 @@ return require('packer').startup(function(use)
require('plugins.gruvbox') require('plugins.gruvbox')
end, end,
} }
use 'NLKNguyen/papercolor-theme'
use { use {
'akinsho/toggleterm.nvim', 'akinsho/toggleterm.nvim',
tag = '*', tag = '*',
@ -339,6 +340,7 @@ return require('packer').startup(function(use)
require('plugins.lualine-nvim') require('plugins.lualine-nvim')
end, end,
} }
use 'nanotee/sqls.nvim'
use 'tpope/vim-unimpaired' use 'tpope/vim-unimpaired'
use 'tpope/vim-repeat' use 'tpope/vim-repeat'
use 'tpope/vim-eunuch' use 'tpope/vim-eunuch'

View File

@ -26,6 +26,7 @@ require('lspconfig')['jsonls'].setup({
require('lspconfig')['eslint'].setup({ require('lspconfig')['eslint'].setup({
on_attach = on_attach, on_attach = on_attach,
flags = lsp_flags, flags = lsp_flags,
root_dir = require('lspconfig').util.find_git_ancestor,
}) })
require('lspconfig')['html'].setup({ require('lspconfig')['html'].setup({
on_attach = on_attach, on_attach = on_attach,
@ -73,7 +74,9 @@ require('lspconfig')['marksman'].setup({
flags = lsp_flags, flags = lsp_flags,
}) })
require('lspconfig')['sqls'].setup({ require('lspconfig')['sqls'].setup({
on_attach = on_attach, on_attach = function(client, bufn)
require('sqls').on_attach(client, bufn)
end,
flags = lsp_flags, flags = lsp_flags,
}) })
require('lspconfig')['taplo'].setup({ require('lspconfig')['taplo'].setup({

View File

@ -63,7 +63,7 @@ null_ls.setup({
-- Formatter -- Formatter
null_ls.builtins.formatting.eslint_d, null_ls.builtins.formatting.eslint_d,
null_ls.builtins.formatting.markdownlint, null_ls.builtins.formatting.markdownlint,
-- null_ls.builtins.formatting.prettierd, null_ls.builtins.formatting.prettierd,
null_ls.builtins.formatting.sqlfluff.with({ null_ls.builtins.formatting.sqlfluff.with({
extra_args = { "--dialect", "postgres" }, extra_args = { "--dialect", "postgres" },
}), }),