From 845c6a4fe72df8d3b599ca52a5f8b0b084386ba6 Mon Sep 17 00:00:00 2001 From: ChristianChiarulli Date: Tue, 20 Sep 2022 16:03:27 -0400 Subject: feat(lualine): update statusline --- lua/lvim/core/lualine/styles.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lua/lvim/core/lualine/styles.lua') diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 8991d9d9..49ad6312 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -80,7 +80,6 @@ styles.lvim = { }, lualine_b = { components.branch, - components.filename, }, lualine_c = { components.diff, @@ -88,13 +87,12 @@ styles.lvim = { }, lualine_x = { components.diagnostics, - components.treesitter, components.lsp, components.filetype, }, - lualine_y = {}, + lualine_y = { components.location }, lualine_z = { - components.scrollbar, + components.progress, }, }, inactive_sections = { -- cgit v1.2.3 From 5948c30362ea947d1e66aa8ebb8c85845907b5b7 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Tue, 20 Sep 2022 23:03:34 -0400 Subject: fix: make sure to use global in lualine --- lua/lvim/core/lualine/styles.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lua/lvim/core/lualine/styles.lua') diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 49ad6312..5e6f3864 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -11,6 +11,7 @@ styles.none = { style = "none", options = { theme = "auto", + globalstatus = true, icons_enabled = lvim.use_icons, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, @@ -40,6 +41,7 @@ styles.default = { style = "default", options = { theme = "auto", + globalstatus = true, icons_enabled = lvim.use_icons, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, -- cgit v1.2.3 From 2cfb55ddb628e135a95f669d9f393ed3a2b1d950 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 17:58:52 -0400 Subject: feat(lualine): improvements --- lua/lvim/core/lualine/styles.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'lua/lvim/core/lualine/styles.lua') diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 5e6f3864..7e576855 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -90,6 +90,7 @@ styles.lvim = { lualine_x = { components.diagnostics, components.lsp, + components.spaces, components.filetype, }, lualine_y = { components.location }, -- cgit v1.2.3 From 2ecdc8ecbff0f8b15eca46d7f51ba1eab873a8a8 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 21:12:15 -0400 Subject: fix: improve lualine inactive --- lua/lvim/core/lualine/styles.lua | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'lua/lvim/core/lualine/styles.lua') diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 7e576855..57bd7260 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -71,6 +71,7 @@ styles.lvim = { style = "lvim", options = { theme = "auto", + globalstatus = true, icons_enabled = lvim.use_icons, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, @@ -100,13 +101,25 @@ styles.lvim = { }, inactive_sections = { lualine_a = { - "filename", + components.mode, + }, + lualine_b = { + components.branch, + }, + lualine_c = { + components.diff, + components.python_env, + }, + lualine_x = { + components.diagnostics, + components.lsp, + components.spaces, + components.filetype, + }, + lualine_y = { components.location }, + lualine_z = { + components.progress, }, - lualine_b = {}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = {}, }, tabline = {}, extensions = { "nvim-tree" }, -- cgit v1.2.3 From 3803fff75846089f5c4aac70bbed7b58c77561e3 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 21:18:44 -0400 Subject: fix: lualine slightly better --- lua/lvim/core/lualine/styles.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lua/lvim/core/lualine/styles.lua') diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 57bd7260..0d759c95 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -75,7 +75,7 @@ styles.lvim = { icons_enabled = lvim.use_icons, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, - disabled_filetypes = { "alpha", "NvimTree", "Outline" }, + disabled_filetypes = { "alpha" }, }, sections = { lualine_a = { @@ -122,7 +122,7 @@ styles.lvim = { }, }, tabline = {}, - extensions = { "nvim-tree" }, + extensions = {}, } function M.get_style(style) -- cgit v1.2.3 From 8767a17b5e6087153494a5cd30e5ae0c5165c9af Mon Sep 17 00:00:00 2001 From: Philippe Richard Date: Sun, 2 Oct 2022 23:48:23 -0400 Subject: feat: move icons to a single icons file (#3115) --- lua/lvim/core/lualine/styles.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lua/lvim/core/lualine/styles.lua') diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 0d759c95..8cde37c4 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -43,8 +43,14 @@ styles.default = { theme = "auto", globalstatus = true, icons_enabled = lvim.use_icons, - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, + component_separators = { + left = lvim.icons.ui.DividerRight, + right = lvim.icons.ui.DividerLeft, + }, + section_separators = { + left = lvim.icons.ui.BoldDividerRight, + right = lvim.icons.ui.BoldDividerLeft, + }, disabled_filetypes = {}, }, sections = { -- cgit v1.2.3 From e5bcf01c759e7c833d8a5f1fcf665b6ea32a7c16 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 4 Oct 2022 19:23:52 +0200 Subject: refactor: more deliberate reload (#3133) --- lua/lvim/core/lualine/styles.lua | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lua/lvim/core/lualine/styles.lua') diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua index 8cde37c4..81dbbabb 100644 --- a/lua/lvim/core/lualine/styles.lua +++ b/lua/lvim/core/lualine/styles.lua @@ -152,6 +152,14 @@ function M.update() local style = M.get_style(lvim.builtin.lualine.style) lvim.builtin.lualine = vim.tbl_deep_extend("keep", lvim.builtin.lualine, style) + + local color_template = vim.g.colors_name or lvim.colorscheme + local theme_supported, template = pcall(function() + require("lualine.utils.loader").load_theme(color_template) + end) + if theme_supported and template then + lvim.builtin.lualine.options.theme = color_template + end end return M -- cgit v1.2.3