diff --git a/lazy-lock.json b/lazy-lock.json index 4e19a10..b2c20ff 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -37,10 +37,10 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, + "nvim-treesitter": { "branch": "master", "commit": "30de5e7e9486fb1b1b8c2a1e71052b13f94f1cb0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, "nvim-ts-autotag": { "branch": "main", "commit": "62db4b3054ec6847e5cb189b4dea452ce0c7ad7f" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cbab9ad88036915beebd13b47e100743ff2ed2d5" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index e571156..cbe0507 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,104 +1,105 @@ return { - { - "nvim-lualine/lualine.nvim", - event = { "InsertEnter", "BufRead", "BufNewFile" }, - config = function() - local component = require("user.utils.lualine_component") - local treesitter = component.treesitter - local lsp_info = component.lsp_info - local diagnostics = component.diagnostics - local diff = component.diff - local spaces = component.spaces - local mode = component.mode - local get_branch = component.get_branch - local lsp_progress = {} - local data_ok, lspprogress = pcall(require, "lsp-progress") - if data_ok then - lsp_progress = lspprogress.progress - end - local colors = component.colors + { + "nvim-lualine/lualine.nvim", + event = { "InsertEnter", "BufRead", "BufNewFile" }, + config = function() + local component = require "user.utils.lualine_component" + local treesitter = component.treesitter + local lsp_info = component.lsp_info + local diagnostics = component.diagnostics + local diff = component.diff + local spaces = component.spaces + local mode = component.mode + local get_branch = component.get_branch + local lsp_progress = {} + local data_ok, lspprogress = pcall(require, "lsp-progress") + if data_ok then + lsp_progress = lspprogress.progress + end + local colors = component.colors - -- check config for theme - local set_theme = "auto" - local bubbles_theme - local color = vim.g.pcode_colorscheme - switch(color, { - ["tokyonight"] = function() - set_theme = "auto" - end, - ["tokyonight-night"] = function() - set_theme = "auto" - end, - ["tokyonight-storm"] = function() - set_theme = "auto" - end, - ["tokyonight-day"] = function() - set_theme = "auto" - end, - ["tokyonight-moon"] = function() - set_theme = "auto" - end, - ["dracula"] = function() - local clr = require("dracula").colors() - colors.blue = clr.green - colors.black = clr.black - colors.cyan = clr.yellow - set_theme = "bubbles_theme" - end, - default = function() - set_theme = "auto" - end, - }) + -- check config for theme + local set_theme = "auto" + local bubbles_theme + local color = vim.g.pcode_colorscheme + switch(color, { + ["tokyonight"] = function() + set_theme = "auto" + end, + ["tokyonight-night"] = function() + set_theme = "auto" + end, + ["tokyonight-storm"] = function() + set_theme = "auto" + end, + ["tokyonight-day"] = function() + set_theme = "auto" + end, + ["tokyonight-moon"] = function() + set_theme = "auto" + end, + ["dracula"] = function() + local clr = require("dracula").colors() + colors.blue = clr.green + colors.black = clr.black + colors.cyan = clr.yellow + set_theme = "bubbles_theme" + end, + default = function() + set_theme = "auto" + end, + }) - bubbles_theme = component.bubbles_theme(colors) - if set_theme == "auto" then - bubbles_theme = vim.fn.fnamemodify("auto", ":t") - end + bubbles_theme = component.bubbles_theme(colors) + if set_theme == "auto" then + bubbles_theme = vim.fn.fnamemodify("auto", ":t") + end - require("lualine").setup({ - options = { - theme = bubbles_theme, - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - disabled_filetypes = { - "TelescopePrompt", - "packer", - "alpha", - "dashboard", - "NvimTree", - "Outline", - "DressingInput", - "toggleterm", - "lazy", - "mason", - "neo-tree", - "startuptime", - }, - 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 = " " }, padding = 1 }, - }, - }, - inactive_sections = { - lualine_a = { "filename" }, - lualine_b = {}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { "location" }, - }, - tabline = {}, - extensions = {}, - }) - end, - }, + require("lualine").setup { + options = { + theme = bubbles_theme, + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + "TelescopePrompt", + "packer", + "alpha", + "dashboard", + "NvimTree", + "Outline", + "DressingInput", + "toggleterm", + "lazy", + "mason", + "neo-tree", + "startuptime", + "crunner", + }, + 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 = " " }, padding = 1 }, + }, + }, + inactive_sections = { + lualine_a = { "filename" }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { "location" }, + }, + tabline = {}, + extensions = {}, + } + end, + }, }