From a71534ee6826a2a508e67700c91042b2ceba5373 Mon Sep 17 00:00:00 2001 From: Patrick Auernig Date: Thu, 7 Sep 2023 18:43:20 +0200 Subject: [PATCH] Add statuscol plugin --- lazy-lock.json | 1 + lua/valeth/options.lua | 6 +----- lua/valeth/plugins/lsp/ufo.lua | 5 +++++ lua/valeth/plugins/statuscol.lua | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 lua/valeth/plugins/statuscol.lua diff --git a/lazy-lock.json b/lazy-lock.json index 18fefe3..2558f46 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -36,6 +36,7 @@ "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, "rainbow_csv.nvim": { "branch": "main", "commit": "763994066877cebae2d5159a46f8b423c50f82da" }, "resession.nvim": { "branch": "master", "commit": "0be4f5401f6f843b320c0ba9035fe682b6b89d0d" }, + "statuscol.nvim": { "branch": "main", "commit": "0944234914438695050eec6f83b4669864680c1a" }, "telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, "undotree": { "branch": "main", "commit": "2685ce282702ab0b79c65916f352db2265b245dd" }, "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" } diff --git a/lua/valeth/options.lua b/lua/valeth/options.lua index f623cfd..670eeed 100644 --- a/lua/valeth/options.lua +++ b/lua/valeth/options.lua @@ -10,13 +10,9 @@ vim.opt.incsearch = true vim.opt.termguicolors = true vim.opt.scrolloff = 8 -vim.opt.signcolumn = "yes" vim.opt.colorcolumn = "100" -vim.opt.foldcolumn = "0" -vim.opt.foldlevel = 99 -vim.opt.foldlevelstart = 99 -vim.opt.foldenable = true +vim.opt.fillchars:append({ eob = "·" }) vim.api.nvim_create_autocmd({"InsertEnter", "InsertLeave", "BufEnter"}, { callback = function(args) diff --git a/lua/valeth/plugins/lsp/ufo.lua b/lua/valeth/plugins/lsp/ufo.lua index 63b632e..b8f4353 100644 --- a/lua/valeth/plugins/lsp/ufo.lua +++ b/lua/valeth/plugins/lsp/ufo.lua @@ -4,6 +4,7 @@ local spec = { spec.dependencies = { "kevinhwang91/promise-async", + "luukvbaal/statuscol.nvim", } spec.event = "LspAttach" @@ -13,6 +14,10 @@ spec.config = function() local autocmd = vim.api.nvim_create_autocmd local autogroup = vim.api.nvim_create_augroup + vim.opt.foldlevel = 99 + vim.opt.foldlevelstart = 99 + vim.opt.foldenable = true + autocmd("LspAttach", { group = autogroup("LspUfo", {}), callback = function(event) diff --git a/lua/valeth/plugins/statuscol.lua b/lua/valeth/plugins/statuscol.lua new file mode 100644 index 0000000..e2047e6 --- /dev/null +++ b/lua/valeth/plugins/statuscol.lua @@ -0,0 +1,32 @@ +local spec = { + "luukvbaal/statuscol.nvim", + lazy = true, +} + +spec.config = function() + local statuscol = require("statuscol") + local builtin = require("statuscol.builtin") + + vim.opt.signcolumn = "yes" + vim.opt.foldcolumn = "1" + vim.opt.fillchars:append({ + fold = " ", + foldopen = "", + foldsep = " ", + foldclose = "", + }) + + statuscol.setup({ + relculright = true, + segments = { + { text = { "%s" }}, + { + text = { builtin.lnumfunc, " " }, + condition = { true, builtin.not_empty }, + }, + { text = { builtin.foldfunc, " " }}, + } + }) +end + +return spec