diff --git a/lazy-lock.json b/lazy-lock.json index 2110c4c..f8712fe 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,7 +27,7 @@ "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "none-ls.nvim": { "branch": "main", "commit": "793c6071621814c61a14c24cdb43e9badd88f0af" }, + "none-ls.nvim": { "branch": "main", "commit": "b4bd764cd1705086de4bd89f7ccf9d9ed0401259" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, @@ -46,7 +46,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "e1e1e6ca3754bd8ef971fb69673cc17965eb9e37" }, - "telescope.nvim": { "branch": "master", "commit": "2e1e382df42467029b493c143c2e727028140214" }, + "telescope.nvim": { "branch": "master", "commit": "d5c4d9856320a07d04607c9b3a0523bd3f373328" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, "transparent.nvim": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua index 60d840b..8822212 100644 --- a/lua/custom/plugins/lualine.lua +++ b/lua/custom/plugins/lualine.lua @@ -118,66 +118,28 @@ return { local mode = { "mode", padding = 1, - separator = { left = "", right = "" }, - right_padding = 3, + separator = { left = "" }, + -- right_padding = 3, fmt = function(str) return " " .. str end, } - - -- stylua: ignore - local colors = { - blue = '#9ece6a', - cyan = '#bb9af7', - black = '#1a1b26', - black_transparant = '#1a1b2600', - white = '#c6c6c6', - red = "#ff757f", - skyblue = '#7aa2f7', - grey = '#3b4261', - yellow = "#ffc777", - fg_gutter = "#3b4261", - green1 = "#4fd6be", - } - - local bubbles_theme = { - normal = { - a = { fg = colors.black, bg = colors.skyblue }, - b = { fg = colors.white, bg = colors.grey }, - c = { fg = colors.white, bg = colors.black_transparant }, - }, - - insert = { - a = { fg = colors.black, bg = colors.blue }, - b = { fg = colors.blue, bg = colors.grey }, - }, - visual = { - a = { fg = colors.black, bg = colors.cyan }, - b = { fg = colors.cyan, bg = colors.grey }, - }, - replace = { - a = { bg = colors.red, fg = colors.black }, - b = { bg = colors.fg_gutter, fg = colors.red }, - }, - command = { - a = { bg = colors.yellow, fg = colors.black }, - b = { bg = colors.fg_gutter, fg = colors.yellow }, - }, - terminal = { - a = { bg = colors.green1, fg = colors.black }, - b = { bg = colors.fg_gutter, fg = colors.green1 }, - }, - inactive = { - a = { fg = colors.white, bg = colors.black_transparant }, - b = { fg = colors.white, bg = colors.black_transparant }, - c = { fg = colors.black, bg = colors.black_transparant }, - }, + local branch = { + "branch", + padding = 1, } + local get_branch = function() + if vim.b.gitsigns_head ~= nil then + return " " .. vim.b.gitsigns_head + else + return " " .. vim.fn.fnamemodify("null", ":t") + end + end + require("lualine").setup({ options = { - theme = bubbles_theme, - -- component_separators = "|", + theme = "auto", component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, disabled_filetypes = { @@ -199,13 +161,12 @@ return { lualine_a = { mode, }, - -- lualine_b = { "filename", "branch" }, - lualine_b = { "branch" }, + lualine_b = { get_branch }, lualine_c = { lsp_info, diagnostics }, lualine_x = { diff, spaces, "filetype" }, lualine_y = { "progress" }, lualine_z = { - { "location", separator = { left = "", right = "" }, left_padding = 3 }, + { "location", separator = { right = "" }, padding = 1 }, }, }, inactive_sections = { diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index b9bdac4..66b224e 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -311,6 +311,7 @@ return { config = function() require("nightfox").setup({ options = { + terminal_colors = true, transparent = transparent, }, }) diff --git a/lua/user/tokyonight.lua b/lua/user/tokyonight.lua index 5551ff1..7439751 100644 --- a/lua/user/tokyonight.lua +++ b/lua/user/tokyonight.lua @@ -46,6 +46,7 @@ tokyonight.setup({ -- @param colors ColorScheme on_colors = function(colors) colors.bg_highlight = hilight + colors.bg_statusline = colors.none end, --- You can override specific highlights to use other groups or a hex color