diff --git a/lazy-lock.json b/lazy-lock.json index b2c20ff..a324515 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,7 +24,7 @@ "mini.animate": { "branch": "main", "commit": "82519630b2760ffc516ebc387bef632f9c07b9f5" }, "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, "neoscroll.nvim": { "branch": "master", "commit": "e78657719485c5663b88e5d96ffcfb6a2fe3eec0" }, - "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "noice.nvim": { "branch": "main", "commit": "278578720a62787aa5893043f2007792a685a443" }, "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" }, "none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, @@ -38,8 +38,8 @@ "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, "nvim-treesitter": { "branch": "master", "commit": "30de5e7e9486fb1b1b8c2a1e71052b13f94f1cb0" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, - "nvim-ts-autotag": { "branch": "main", "commit": "62db4b3054ec6847e5cb189b4dea452ce0c7ad7f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, @@ -49,7 +49,7 @@ "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, - "telescope.nvim": { "branch": "master", "commit": "4aed63995a69e343b068c7469491a8d1592c339f" }, + "telescope.nvim": { "branch": "master", "commit": "5665d93988acfbb0747bdbf4f4cb583bcebc8930" }, "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 090b8c8..ea9dbf8 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -27,9 +27,11 @@ vim.g.pcode_colorscheme = "dracula" -- 0 =off 1= on vim.g.pcode_transparent_mode = 0 -- rounded +-- roundedall -- square +-- triangle -- default -vim.g.pcode_lualinetheme = "rounded" +vim.g.pcode_lualinetheme = "roundedall" -- 0 disable progress -- 1 lualine lsp progress -- 2 fidget progress diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 8899ce5..845bf9a 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -48,8 +48,12 @@ return { local theme = gettheme.rounded(bubbles_theme) if theme_option == "rounded" then theme = gettheme.rounded(bubbles_theme) + elseif theme_option == "roundedall" then + theme = gettheme.roundedall(bubbles_theme) elseif theme_option == "square" then theme = gettheme.square(bubbles_theme) + elseif theme_option == "triangle" then + theme = gettheme.triangle(bubbles_theme) elseif theme_option == "default" then theme = {} end diff --git a/lua/user/utils/lualine_component.lua b/lua/user/utils/lualine_component.lua index 9fe3cb1..6c34922 100644 --- a/lua/user/utils/lualine_component.lua +++ b/lua/user/utils/lualine_component.lua @@ -129,6 +129,22 @@ return { return icons.ui.Neovim .. " " .. str end, }, + mode_roundedall = { + "mode", + padding = 1, + separator = { left = " ", right = "" }, + fmt = function(str) + return icons.ui.Neovim .. " " .. str + end, + }, + mode_triangle = { + "mode", + padding = 1, + separator = { left = " ", right = "" }, + fmt = function(str) + return icons.ui.Neovim .. " " .. str + end, + }, mode_square = { "mode", diff --git a/lua/user/utils/lualine_template.lua b/lua/user/utils/lualine_template.lua index ace23b7..96b86ac 100644 --- a/lua/user/utils/lualine_template.lua +++ b/lua/user/utils/lualine_template.lua @@ -64,6 +64,75 @@ M.rounded = function(colorscheme) } end +M.roundedall = function(colorscheme) + local mode = component.mode_roundedall + return { + options = { + theme = colorscheme, + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = M.filetype, + always_divide_middle = true, + }, + sections = { + lualine_a = { + mode, + }, + lualine_b = { get_branch }, + lualine_c = { diff, lsp_info, lsp_progress }, + lualine_x = { diagnostics, spaces, treesitter, "filetype" }, + lualine_y = { "progress" }, + lualine_z = { + { "location", separator = { right = " ", left = "" }, padding = 1 }, + }, + }, + inactive_sections = { + lualine_a = { "filename" }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { "location" }, + }, + tabline = {}, + extensions = {}, + } +end +M.triangle = function(colorscheme) + local mode = component.mode_triangle + return { + options = { + theme = colorscheme, + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = M.filetype, + always_divide_middle = true, + }, + sections = { + lualine_a = { + mode, + }, + lualine_b = { get_branch }, + lualine_c = { diff, lsp_info, lsp_progress }, + lualine_x = { diagnostics, spaces, treesitter, "filetype" }, + lualine_y = { "progress" }, + lualine_z = { + { "location", separator = { right = " ", left = "" }, padding = 1 }, + }, + }, + inactive_sections = { + lualine_a = { "filename" }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { "location" }, + }, + tabline = {}, + extensions = {}, + } +end + M.square = function(colorscheme) local mode = component.mode_square return {