From 2b038e4b0d9bc7a90102deb827acae3df530a3eb Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Tue, 21 Nov 2023 22:32:32 +0200
Subject: [PATCH] Nvim: add signcol plugin, change gitsigns keybinds

---
 home/.config/nvim/lua/plugins/gitsigns.lua  | 13 -----------
 home/.config/nvim/lua/plugins/statuscol.lua | 26 +++++++++++++++++++++
 home/.config/nvim/lua/plugins/ufo.lua       |  3 ++-
 3 files changed, 28 insertions(+), 14 deletions(-)
 delete mode 100644 home/.config/nvim/lua/plugins/gitsigns.lua
 create mode 100644 home/.config/nvim/lua/plugins/statuscol.lua

diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua
deleted file mode 100644
index 557c23bc..00000000
--- a/home/.config/nvim/lua/plugins/gitsigns.lua
+++ /dev/null
@@ -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,
-}
diff --git a/home/.config/nvim/lua/plugins/statuscol.lua b/home/.config/nvim/lua/plugins/statuscol.lua
new file mode 100644
index 00000000..1391671a
--- /dev/null
+++ b/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,
+}
diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua
index 780c7255..89eab7d1 100644
--- a/home/.config/nvim/lua/plugins/ufo.lua
+++ b/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