diff options
Diffstat (limited to '.vim')
| -rw-r--r-- | .vim/lua/internal/statusline.lua | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/.vim/lua/internal/statusline.lua b/.vim/lua/internal/statusline.lua index 1c09271..9d1ddc7 100644 --- a/.vim/lua/internal/statusline.lua +++ b/.vim/lua/internal/statusline.lua @@ -5,9 +5,11 @@ function _G.statusline() local sl = hi -- sl = sl .. statusline_append([[ ⢷]], 'StatusLineIcon', hi) - sl = sl .. statusline_append(statusline_lightbulb(), 'StatusLineLightbulb', hi) + sl = sl .. [[%-h%-w%-q%-f %-m %-r]] - sl = sl .. statusline_append(statusline_ts(), 'StatusLineTreesitter', hi) + -- sl = sl .. statusline_append(statusline_ts(), 'StatusLineTreesitter', hi) + + sl = sl .. [[ %= ]] -- spacer sl = sl .. statusline_append(statusline_lsp_diagnostics(bufnr, hi), 'StatusLineDiagnostics', hi) @@ -15,13 +17,13 @@ function _G.statusline() sl = sl .. statusline_append(statusline_dap(), 'StatusLineDap', hi) - sl = sl .. [[ %= ]] -- spacer + -- sl = sl .. [[ %= ]] -- spacer sl = sl .. statusline_append(statusline_notify(hi), 'StatusLineNotify', hi) sl = sl .. statusline_append(statusline_spinner(bufnr), 'StatusLineJobs', hi) - sl = sl .. statusline_append([[ %l:%v --%p%%-- %y]], hi, hi) + sl = sl .. [[%-l:%-v --%p%%-- %-Y]] return sl end @@ -40,6 +42,7 @@ function _G.statusline_color(mode) -- return '%{g:actual_curwin==win_getid()?'.. hi ..':%#StatusLineNC#}' return hi end + -- does item highlighting and conditionnal spacing function _G.statusline_append(element, hi, default_hi, opts) if not element or element == '' then @@ -59,6 +62,7 @@ function _G.statusline_append(element, hi, default_hi, opts) end return el end + function _G.statusline_combine_hi(outer_name, inner_name) local outer = vim.api.nvim_get_hl_by_id(vim.api.nvim_get_hl_id_by_name(outer_name), true) local inner = vim.api.nvim_get_hl_by_id(vim.api.nvim_get_hl_id_by_name(inner_name), true) @@ -99,6 +103,7 @@ function _G.statusline_lsp_diagnostics(bufnr, default_hi) end return vim.trim(s) end + function _G.statusline_ts() local navic = package.loaded['nvim-navic'] if not navic then @@ -122,6 +127,7 @@ function _G.statusline_ts() end return table.concat(s, ' > ') end + function _G.statusline_lspstatus() local lst = package.loaded['lsp-status'] if not lst then @@ -129,13 +135,7 @@ function _G.statusline_lspstatus() end return vim.trim(lst.status()) end -function _G.statusline_lightbulb() - local lb = package.loaded['nvim-lightbulb'] - if not lb then - return '' - end - return lb.get_status_text() -end + function _G.statusline_spinner(bufnr) local sp = package.loaded.spinner if not sp then @@ -143,6 +143,7 @@ function _G.statusline_spinner(bufnr) end return sp.status(bufnr) end + function _G.statusline_dap() local dap = package.loaded.dap if not dap then @@ -163,8 +164,8 @@ function _G.statusline_notify(default_hi) local timeout = (n.options and n.options.timeout) or 2000 -- pop message after <timeout> and move to archive vim.defer_fn(function() - local n = table.remove(_G.statusline_notifications, 1) - table.insert(_G.statusline_notifications_archive, n) + local n_ = table.remove(_G.statusline_notifications, 1) + table.insert(_G.statusline_notifications_archive, n_) -- make sure archive is never longer than 20 notifications if #_G.statusline_notifications_archive > 20 then table.remove(_G.statusline_notifications_archive, 1) @@ -185,11 +186,10 @@ function _G.statusline_notify(default_hi) return vim.trim(s) end --- vim.opt.statusline = '%!luaeval("statusline()")' vim.opt.statusline = '%{%v:lua.statusline()%}' -- WINBAR -- -vim.opt.winbar = [[%h%w%q%f %-m %-r %= %#WinBarCwd#%{%getcwd()%}%*]] -- keep it simple +-- vim.opt.winbar = [[%h%w%q%f %-m %-r %= %#WinBarCwd#%{%getcwd()%}%*]] -- keep it simple -- function _G.winbar() -- return [[%<%F %-m %-r]] -- end |