diff --git a/lua/init-indent-blankline.lua b/lua/init-indent-blankline.lua index 8a8fae6..b8b35c6 100644 --- a/lua/init-indent-blankline.lua +++ b/lua/init-indent-blankline.lua @@ -1,5 +1,11 @@ require("indent_blankline").setup { space_char_blankline = " ", - show_current_context = true, + + show_current_context = true, } + +vim.cmd [[ + highlight IndentBlanklineChar guifg=#e5e5e5 gui=nocombine + highlight IndentBlanklineContextChar guifg=#666666 gui=nocombine +]] diff --git a/lua/init-null-ls.lua b/lua/init-null-ls.lua index 965324c..08ce508 100644 --- a/lua/init-null-ls.lua +++ b/lua/init-null-ls.lua @@ -1,6 +1,16 @@ local null_ls = require("null-ls") local sources = { + -- -- prettier - using perttierd instead + -- null_ls.builtins.formatting.prettier.with({ + -- extra_filetypes = { "php" }, + -- prefer_local = "node_modules/.bin", + -- }), + -- -- prettierd with php + -- null_ls.builtins.formatting.prettierd.with({ + -- extra_filetypes = { "php" }, + -- }), + -- prettierd without php (use phpcbf instead) null_ls.builtins.formatting.prettierd, -- phpcs - standards wordpress @@ -25,14 +35,12 @@ local sources = { condition = function(utils) return not utils.root_has_file({ "vendor/bin/phpcs" }) end, - args = { "--standard=PSR12", "--report=json", "-s", "-" }, }), -- phpcbf null_ls.builtins.formatting.phpcbf.with({ condition = function(utils) return not utils.root_has_file({ "vendor/bin/phpcbf" }) end, - args = { "--standard=PSR12", "--report=json", "-s", "-" }, }), -- black