diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/alpha/lsp/default.lua | 2 | ||||
| -rw-r--r-- | lua/alpha/lsp/init.lua | 3 | ||||
| -rw-r--r-- | lua/alpha/lsp/servers/lua_ls.lua | 9 | ||||
| -rw-r--r-- | lua/config/lazy.lua | 3 | ||||
| -rw-r--r-- | lua/plugins/lsp.lua | 1 | ||||
| -rw-r--r-- | lua/plugins/neodev.lua | 5 | ||||
| -rw-r--r-- | lua/plugins/noice.lua | 60 |
7 files changed, 41 insertions, 42 deletions
diff --git a/lua/alpha/lsp/default.lua b/lua/alpha/lsp/default.lua index a1b1e25..4f53ddd 100644 --- a/lua/alpha/lsp/default.lua +++ b/lua/alpha/lsp/default.lua @@ -8,7 +8,7 @@ return { gopls = { enable = true }, html = { enable = true }, jsonls = { enable = true }, - lua_ls = { enable = true }, + lua_ls = { enable = true, neodev = true }, nil_ls = { enable = true }, phpactor = {enable = true }, rust_analyzer = { enable = true }, diff --git a/lua/alpha/lsp/init.lua b/lua/alpha/lsp/init.lua index 0d4a85d..0d69f07 100644 --- a/lua/alpha/lsp/init.lua +++ b/lua/alpha/lsp/init.lua @@ -37,6 +37,9 @@ return { table.insert(servers, string.format("%s <%s>", server, options.enable)) end + -- TODO: create an auto command that on write of the configuration, calls again the setup and restart the server if it's up. + -- can get the client by name of the file + vim.api.nvim_create_user_command("AlphaLSP", function() vim.ui.select(servers, { prompt = "LSP Servers" }, function(server) if server == nil then diff --git a/lua/alpha/lsp/servers/lua_ls.lua b/lua/alpha/lsp/servers/lua_ls.lua index 64f012c..c5f72bf 100644 --- a/lua/alpha/lsp/servers/lua_ls.lua +++ b/lua/alpha/lsp/servers/lua_ls.lua @@ -1,7 +1,11 @@ local lsp_attach = require "alpha.lsp.attach" -local lsp_flags = require("alpha.lsp.flags") +local lsp_flags = require "alpha.lsp.flags" return function(ops) + if ops.neodev == true then + require("neodev").setup() + end + return vim.tbl_extend("force", { on_attach = lsp_attach, flags = lsp_flags, @@ -23,6 +27,9 @@ return function(ops) hint = { enable = true, }, + completion = { + callSnippet = "Replace", + }, }, }, }, ops) diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index ef480d4..81584d1 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -15,6 +15,9 @@ require("lazy").setup { spec = { { import = "plugins" }, }, + default = { + lazy = true, + }, checker = { enabled = true, notify = false }, dev = { path = "~/code/plugins", diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 60ea560..c381931 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -10,6 +10,7 @@ return { }, }, }, + "folke/neodev.nvim", "williamboman/mason-lspconfig.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim", }, diff --git a/lua/plugins/neodev.lua b/lua/plugins/neodev.lua deleted file mode 100644 index dac73da..0000000 --- a/lua/plugins/neodev.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "folke/neodev.nvim", - ft = { "lua" }, - opts = {}, -} diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index 72f9e13..70e81e9 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -80,43 +80,33 @@ return { { view = "mini", filter = { - event = "msg_show", - find = "lines yanked", - }, - }, - { - view = "mini", - filter = { - event = "msg_show", - find = "more lines", - }, - }, - { - view = "mini", - filter = { - find = "laravel.sail.up", - }, - }, - { - view = "mini", - filter = { - find = "laravel.sail.down", - }, - }, - { - view = "mini", - filter = { - find = "Pattern not found", + any = { + { + event = "msg_show", + find = "lines yanked", + }, + { + event = "msg_show", + find = "more lines", + }, + { + event = "msg_show", + find = "direnv:", + }, + { + find = "laravel.sail.", + }, + { + find = "Pattern not found", + }, + { + event = "msg_show", + kind = "", + find = "change;", + }, + }, }, }, - { - view = "mini", - filter = { - event = "msg_show", - kind = "", - find = "change;" - } - }, }, }, } |