aboutsummaryrefslogtreecommitdiffstats
path: root/after/plugin
diff options
context:
space:
mode:
authorAriel D'Alessandro <ariel.dalessandro@auto1.com>2022-06-17 17:39:56 +0200
committerAriel D'Alessandro <ariel.dalessandro@auto1.com>2022-06-17 17:39:56 +0200
commit09361db9ee52be27ddb27320eda8121223330f04 (patch)
tree186b2f6d6b2391739e150f49dcffe1891702bb9d /after/plugin
parent03436a47918c8c5229e435481cafdae61dd67fc5 (diff)
downloadnvim-conf-09361db9ee52be27ddb27320eda8121223330f04.tar.gz
nvim-conf-09361db9ee52be27ddb27320eda8121223330f04.zip
commits from laptop
Diffstat (limited to 'after/plugin')
-rw-r--r--after/plugin/feline.lua4
-rw-r--r--after/plugin/luasnip.lua1
-rw-r--r--after/plugin/null-ls.lua25
3 files changed, 20 insertions, 10 deletions
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,
})