From 5cefc04143c7ebc2d2cacd675a9a78d51ddc356d Mon Sep 17 00:00:00 2001 From: Daveanand Mannie Date: Sun, 27 Oct 2024 11:23:35 -0400 Subject: [PATCH] [UPDATED] Lualine structure --- lazy-lock.json | 4 ++-- lua/plugins/lualine.lua | 33 +++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 946e643..5d83c01 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "LazyVim": { "branch": "main", "commit": "7c7c196a78e936a1bc4cf28e7908e9bd96d75607" }, - "SchemaStore.nvim": { "branch": "main", "commit": "fa562602268fc7335fd2b7581ddf9e67e70f18b6" }, + "SchemaStore.nvim": { "branch": "main", "commit": "e8835ae8e941e940ed3418c3a77976a2bacc52e4" }, "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, "catppuccin": { "branch": "main", "commit": "cf021ebfb1e400a5fd1615cbda024308ca589b18" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -32,7 +32,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "28b205ebe73a18f401e040585106f9bafd8ff21f" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-treesitter": { "branch": "master", "commit": "46a6587a23eb842411e27f325280e8d7f71bd00a" }, + "nvim-treesitter": { "branch": "master", "commit": "00d219068385a4aa80859d4606ad6e03af6faa83" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index abb8c3e..5616cb5 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -52,18 +52,7 @@ return { section_separators = { left = "", right = "" }, }, sections = { - lualine_a = { - { "mode", separator = { left = "" }, right_padding = 2 }, - { - function() - return require("noice").api.status.command.get() - end, - cond = function() - return package.loaded["noice"] and require("noice").api.status.command.has() - end, - color = { colors.black }, - }, - }, + lualine_a = {{ "mode", separator = { left = "" }, right_padding = 2 }}, lualine_b = { "branch", { @@ -105,6 +94,26 @@ return { lualine_y = { "encoding", "progress", + { + function() + return require("noice").api.status.mode.get() + end, + cond = function() + return package.loaded["noice"] and require("noice").api.status.mode.has() + end, + color = function() + return LazyVim.ui.fg("Constant") + end, + }, + { + function() + return require("noice").api.status.command.get() + end, + cond = function() + return package.loaded["noice"] and require("noice").api.status.command.has() + end, + color = { colors.black }, + }, }, lualine_z = { { "location", separator = { right = "" }, left_padding = 2 },