home/.config/nvim/lua/plugins/gitsigns.lua

@@ -1,13 +0,0 @@
--- Git status in signcolumn
-return {
-  "lewis6991/gitsigns.nvim",
-  config = function()
-    local gitsigns = require("gitsigns")
-    gitsigns.setup()
-
-    require("which-key").register({
-      ["["] = { h = { gitsigns.prev_hunk, "Previous hunk" } },
-      ["]"] = { h = { gitsigns.next_hunk, "Next hunk" } },
-    })
-  end,
-}

home/.config/nvim/lua/plugins/statuscol.lua

@@ -0,0 +1,26 @@
+return {
+  "luukvbaal/statuscol.nvim",
+  dependencies = {
+    {
+      "lewis6991/gitsigns.nvim",
+      opts = {},
+    },
+  },
+  config = function()
+    local gitsigns = require("gitsigns")
+    require("which-key").register({
+      ["["] = { c = { gitsigns.prev_hunk, "Previous hunk" } },
+      ["]"] = { c = { gitsigns.next_hunk, "Next hunk" } },
+    })
+
+    local builtin = require("statuscol.builtin")
+    require("statuscol").setup({
+      relculright = true,
+      segments = {
+        { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
+        { text = { "%s" }, click = "v:lua.ScSa" },
+        { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
+      },
+    })
+  end,
+}

home/.config/nvim/lua/plugins/ufo.lua

@@ -2,6 +2,7 @@
 return {
   "kevinhwang91/nvim-ufo",
   dependencies = { "kevinhwang91/promise-async" },
+  ---@type UfoConfig
   opts = {
     close_fold_kinds = {
       "imports",
@@ -17,7 +18,7 @@ return {
 
     -- Fold settings
     local o = vim.o
-    o.foldcolumn = "0"
+    o.foldcolumn = "1"
     o.foldlevel = 99
     o.foldlevelstart = 99
     o.foldenable = true