diff --git a/lazy-lock.json b/lazy-lock.json index 6601f4b..dc2e92a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "blink.cmp": { "branch": "main", "commit": "49f211fe5d729df53df4c042d7c3464cf47d199e" }, + "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, "commander.nvim": { "branch": "main", "commit": "84101e8eb1613a72bbdec655b734f891d8a00694" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, @@ -19,16 +19,18 @@ "none-ls-extras.nvim": { "branch": "main", "commit": "1214d729e3408470a7b7a428415a395e5389c13c" }, "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, - "nvim-lspconfig": { "branch": "master", "commit": "ff6471d4f837354d8257dfa326b031dd8858b16e" }, - "nvim-treesitter": { "branch": "master", "commit": "86768fdd002c75833414010052a1e95a4760ee32" }, + "nvim-autopairs": { "branch": "master", "commit": "84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968" }, + "nvim-lspconfig": { "branch": "master", "commit": "40f120c10ea4b87311175539a183c3b75eab95a3" }, + "nvim-treesitter": { "branch": "master", "commit": "997288c55253e27f782d991099490f80205d65bf" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, + "nvim-ufo": { "branch": "main", "commit": "c15fed422506a130a62e5e79c2d754392231d7d8" }, "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, "output-panel.nvim": { "branch": "main", "commit": "9979f9988acb35fd8e699d8b1fbc7aa17c9d8148" }, "package-info.nvim": { "branch": "master", "commit": "3e8914a77668c780fc5ef8b0fbcf3747dfcf6ec5" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown.nvim": { "branch": "main", "commit": "a1fc4e559252baa128c471adadf0be045abd542d" }, - "schemastore.nvim": { "branch": "main", "commit": "e659e0c6ca06727ed898aaaeea3850f528898684" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "render-markdown.nvim": { "branch": "main", "commit": "0ed141a60ca4befcaf923b21c36f6f2971d61b9e" }, + "schemastore.nvim": { "branch": "main", "commit": "87cf380f6ecc0b5aed0cba353fd6d8a1397e1167" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, diff --git a/lua/config/settings.lua b/lua/config/settings.lua index a3acfb1..6f2b34a 100644 --- a/lua/config/settings.lua +++ b/lua/config/settings.lua @@ -12,9 +12,14 @@ opt.colorcolumn = "80" opt.clipboard:append({ "unnamed", "unnamedplus" }) opt.expandtab = true opt.exrc = true -opt.foldmethod = "syntax" opt.foldcolumn = "1" -opt.foldlevelstart = 20 +opt.foldlevel = 99 +opt.foldlevelstart = 99 +opt.foldenable = true +opt.fillchars:append({ + foldopen = "", + foldclose = "", +}) opt.ignorecase = true opt.incsearch = true opt.inccommand = "split" diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index fb3755d..0061184 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -55,10 +55,15 @@ return { "neovim/nvim-lspconfig", config = function() local lspconfig = require('lspconfig') + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities.textDocument.foldingRange = { + dynamicRegistration = false, + lineFoldingOnly = true + } for _, v in ipairs(vim.api.nvim_get_runtime_file('lua/lsp/*', true)) do local name = vim.fn.fnamemodify(v, ':t:r') local cfg = require("lsp/" .. name) - lspconfig[name].setup(cfg) + lspconfig[name].setup(vim.tbl_deep_extend("force", cfg, { capabilities })) end end }, diff --git a/lua/plugins/nvim-ufo.lua b/lua/plugins/nvim-ufo.lua new file mode 100644 index 0000000..cff389d --- /dev/null +++ b/lua/plugins/nvim-ufo.lua @@ -0,0 +1,6 @@ +return { + 'kevinhwang91/nvim-ufo', + dependencies = { 'kevinhwang91/promise-async' }, + + opts = {} +} diff --git a/lua/plugins/package-info.nvim.lua b/lua/plugins/package-info.nvim.lua index ed96fe5..b8e6621 100644 --- a/lua/plugins/package-info.nvim.lua +++ b/lua/plugins/package-info.nvim.lua @@ -1,5 +1,5 @@ return { "vuki656/package-info.nvim", - requires = "MunifTanjim/nui.nvim", + dependencies = { "MunifTanjim/nui.nvim" }, opts = {} }