From 09361db9ee52be27ddb27320eda8121223330f04 Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Fri, 17 Jun 2022 17:39:56 +0200 Subject: commits from laptop --- after/plugin/feline.lua | 4 ++-- after/plugin/luasnip.lua | 1 + after/plugin/null-ls.lua | 25 +++++++++++++++++-------- 3 files changed, 20 insertions(+), 10 deletions(-) (limited to 'after/plugin') diff --git a/after/plugin/feline.lua b/after/plugin/feline.lua index d3a332a..d2de449 100644 --- a/after/plugin/feline.lua +++ b/after/plugin/feline.lua @@ -29,7 +29,7 @@ feline.winbar.setup({ provider = { name = 'file_info', opts = { - type = 'full-path', + type = 'relative', file_modified_icon = '' }, }, @@ -46,7 +46,7 @@ feline.winbar.setup({ provider = { name = 'file_info', opts = { - type = 'full-path', + type = 'relative', file_modified_icon = '' }, }, diff --git a/after/plugin/luasnip.lua b/after/plugin/luasnip.lua index 9891eb3..8538b8e 100644 --- a/after/plugin/luasnip.lua +++ b/after/plugin/luasnip.lua @@ -95,6 +95,7 @@ local make = function(tbl) return result end +ls.cleanup() for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/alpha/snips/ft/*.lua", true)) do local ft = vim.fn.fnamemodify(ft_path, ":t:r") ls.add_snippets(ft, make(loadfile(ft_path)())) diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua index 7d7d3b2..357a3d3 100644 --- a/after/plugin/null-ls.lua +++ b/after/plugin/null-ls.lua @@ -1,18 +1,27 @@ local ok, null_ls = pcall(require, "null-ls") if not ok then - return + return end +local my_sources = require("alpha.php_code_actions") + local sources = { - null_ls.builtins.code_actions.gitsigns, - null_ls.builtins.formatting.stylua, - null_ls.builtins.diagnostics.eslint, - null_ls.builtins.diagnostics.phpstan, -} + null_ls.builtins.code_actions.gitsigns, + null_ls.builtins.formatting.stylua, + null_ls.builtins.diagnostics.eslint, + null_ls.builtins.diagnostics.phpstan, + null_ls.builtins.formatting.phpcsfixer, + null_ls.builtins.diagnostics.golangci_lint, + -- null_ls.builtins.formatting.goimports, + null_ls.builtins.formatting.jq, + null_ls.builtins.code_actions.gitrebase, + null_ls.builtins.code_actions.refactoring, + null_ls.builtins.completion.luasnip, -require("alpha.php_code_actions") + my_sources.php_setter_getter_actions, +} null_ls.setup({ - sources = sources, + sources = sources, }) -- cgit v1.2.3