lua/config/lsp.lua

@@ -110,11 +110,6 @@ local custom_attach = function(client, bufnr)
 end
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
--- required by nvim-ufo
-capabilities.textDocument.foldingRange = {
-    dynamicRegistration = false,
-    lineFoldingOnly = true
-}
 
 local lspconfig = require("lspconfig")
 

lua/config/nvim-statuscol.lua

@@ -1,23 +0,0 @@
-local builtin = require("statuscol.builtin")
-local ffi = require("statuscol.ffidef")
-local C = ffi.C
-
--- only show fold level up to this level
-local fold_level_limit = 2
-local function foldfunc(args)
-  local foldinfo = C.fold_info(args.wp, args.lnum)
-  if foldinfo.level > fold_level_limit then
-    return " "
-  end
-
-  return builtin.foldfunc(args)
-end
-
-require("statuscol").setup {
-  relculright = false,
-  segments = {
-    { text = { "%s" }, click = "v:lua.ScSa" },
-    { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
-    { text = { foldfunc, " " }, condition = { true, builtin.not_empty }, click = "v:lua.ScFa" },
-  },
-}

lua/config/nvim_ufo.lua

@@ -30,9 +30,10 @@ local handler = function(virtText, lnum, endLnum, width, truncate)
   return newVirtText
 end
 
-require("ufo").setup {
+local opts = {}
-  fold_virt_text_handler = handler,
+opts["fold_virt_text_handler"] = handler
-}
+
+require("ufo").setup(opts)
 
 vim.keymap.set("n", "zR", require("ufo").openAllFolds)
 vim.keymap.set("n", "zM", require("ufo").closeAllFolds)

lua/plugin_specs.lua

@@ -156,7 +156,7 @@ local plugin_specs = {
     event = "VeryLazy",
     cond = firenvim_not_active,
     config = function()
-      require("config.lualine")
+      require("config.statusline")
     end,
   },
 
@@ -190,7 +190,15 @@ local plugin_specs = {
     "luukvbaal/statuscol.nvim",
     opts = {},
     config = function()
-      require("config.nvim-statuscol")
+      local builtin = require("statuscol.builtin")
+      require("statuscol").setup {
+        relculright = true,
+        segments = {
+          { text = { "%s" }, click = "v:lua.ScSa" },
+          { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
+          { text = { builtin.foldfunc, " " }, condition = {true, builtin.not_empty}, click = "v:lua.ScFa" },
+        },
+      }
     end,
   },
   {
@@ -534,11 +542,6 @@ local plugin_specs = {
       require("config.fidget-nvim")
     end,
   },
-  {
-    "folke/lazydev.nvim",
-    ft = "lua", -- only load on lua files
-    opts = {},
-  },
 }
 
 require("lazy").setup {