diff --git a/lazy-lock.json b/lazy-lock.json index a5ad6db..c001883 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -38,5 +38,6 @@ "urlview.nvim": { "branch": "main", "commit": "c07733179e27c225ac3c58c3951701ee10b2dbde" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, + "wrapping.nvim": { "branch": "master", "commit": "a5210c29be19ed736eb3333677e08a57efebce78" } +} diff --git a/lua/nvim-lsp-config.lua b/lua/nvim-lsp-config.lua index abd5999..cd46d7e 100644 --- a/lua/nvim-lsp-config.lua +++ b/lua/nvim-lsp-config.lua @@ -34,6 +34,10 @@ local on_attach = function(_, bufnr) end, bufopts) end +vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { + virtual_text = true, +}) + local lsp_flags = { -- This is the default in Nvim 0.7+ debounce_text_changes = 150, @@ -50,12 +54,14 @@ lspconfig.clangd.setup({}) lspconfig.rust_analyzer.setup({}) -lspconfig.nixd.setup({}) +--lspconfig.nixd.setup({}) lspconfig.r_language_server.setup({}) --lspconfig.qmlls.setup({}) +lspconfig.nil_ls.setup({}) + lspconfig.lua_ls.setup({ on_init = function(client) local path = client.workspace_folders[1].name diff --git a/lua/plugins.lua b/lua/plugins.lua index 6fa9c25..8a0e14d 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,3 +1,5 @@ +-- vim:fileencoding=utf-8:foldmethod=marker + local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then vim.fn.system({ @@ -12,6 +14,14 @@ end vim.opt.rtp:prepend(lazypath) require("lazy").setup({ + --: Behaviour {{{ + { + "andrewferrier/wrapping.nvim", + config = function() + require("wrapping").setup() + end, + }, + --:}}} { "nvim-tree/nvim-tree.lua", dependencies = {