diff --git a/lazy-lock.json b/lazy-lock.json index 232dd99..231831a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -135,7 +135,7 @@ "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }, "vimtex": { "branch": "master", "commit": "80c9bc179784c30192d482741a43f176c859daa1" }, - "which-key.nvim": { "branch": "main", "commit": "c77cda8cd2f54965e4316699f1d124a2b3bf9d49" }, + "which-key.nvim": { "branch": "main", "commit": "4d5b8959fd2a4df065ff76ccb39019aaa70cb0dc" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, "zen-mode.nvim": { "branch": "main", "commit": "2694c5a2bc4dc26c7a9e74b9e2b812920c90a830" } } diff --git a/lua/plugins/null_ls.lua b/lua/plugins/null_ls.lua deleted file mode 100644 index 9f538ba..0000000 --- a/lua/plugins/null_ls.lua +++ /dev/null @@ -1,85 +0,0 @@ -return { - "jay-babu/mason-null-ls.nvim", - event = { "BufReadPre", "BufNewFile" }, - enabled = false, - dependencies = { - "williamboman/mason.nvim", - "nvim-lua/plenary.nvim", - { "nvimtools/none-ls.nvim", dependencies = { - "nvimtools/none-ls-extras.nvim", - } }, - }, - config = function() - local null_ls = require("null-ls") - -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics - local formatting = null_ls.builtins.formatting - -- https://github.com/prettier-solidity/prettier-plugin-solidity - local diagnostics = null_ls.builtins.diagnostics - null_ls.setup({ - sources = { - require("none-ls.diagnostics.cpplint"), - -- Here you can add tools not supported by mason.nvim - -- make sure the source name is supported by null-ls - -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md - formatting.cbfmt.with({ extra_filetypes = { "vimwiki" } }), - --[[ formatting.prettier.with({ - extra_filetypes = { "toml" }, - extra_args = { - "--no-semi", - "--double-quote", - "--no-bracket-spacing", - "--tab-width", - "4", - "--bracket-same-line", - "--html-whitespace-sensitivity", - "strict", - }, - }), ]] - formatting.sql_formatter.with({ - extra_args = { - "-c", - [[ - { - "language": "postgresql", - "dialect": "postgresql", - "tabWidth": 2, - "useTabs": false, - "keywordCase": "upper", - "dataTypeCase": "upper", - "functionCase": "upper", - "identifierCase": "upper", - "indentStyle": "standard", - "logicalOperatorNewline": "before", - "expressionWidth": "80", - "linesBetweenQueries": 2, - "denseOperators": false, - "newlineBeforeSemicolon": false - } - ]], - }, - }), - formatting.rustywind.with({ extra_filetypes = { "htmldjango", "javascriptreact" } }), - }, - }) - require("mason-null-ls").setup({ - ensure_installed = { - "clang_format", - "cmake_format", - "cmake_lint", - "google_java_format", - "selene", - "stylua", - "yamlfmt", - "rustywind", - }, - automatic_installation = true, - handlers = { - -- Here you can add functions to register sources. - -- See https://github.com/jay-babu/mason-null-ls.nvim#handlers-usage - -- - -- If left empty, mason-null-ls will use a "default handler" - -- to register all sources - }, - }) - end, -}