From a99d87f2cd47a730a02b56a35a93d4fdbea89b30 Mon Sep 17 00:00:00 2001
From: zackartz <zackmyers@lavabit.com>
Date: Wed, 17 Apr 2024 16:33:28 -0400
Subject: [PATCH] 379 current  2024-04-17 16:33:20  24.05.20240416.5672bc9 
 6.8.4-zen1                          *

---
 .../vim/config/lua/plugins/ui/bufferline.lua  | 36 ++++++++++++++-----
 .../vim/config/lua/plugins/ui/lualine.lua     | 10 +++---
 modules/home-manager/vim/lazy-lock.json       |  1 -
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/modules/home-manager/vim/config/lua/plugins/ui/bufferline.lua b/modules/home-manager/vim/config/lua/plugins/ui/bufferline.lua
index 497ac64..8e8729d 100644
--- a/modules/home-manager/vim/config/lua/plugins/ui/bufferline.lua
+++ b/modules/home-manager/vim/config/lua/plugins/ui/bufferline.lua
@@ -4,6 +4,7 @@ return {
 	"akinsho/bufferline.nvim",
 	event = { "BufReadPost", "BufNewFile" },
 	dependencies = "nvim-tree/nvim-web-devicons",
+	after = "catppuccin",
 	opts = {
 		options = {
 			diagnostics = "nvim_lsp",
@@ -33,15 +34,34 @@ return {
 		},
 	},
 	config = function(_, opts)
-		local colors = require("tokyonight.colors")
+		-- local colors = require("tokyonight.colors")
+		--
+		-- vim.opt.showtabline = 2
+		-- opts.highlights = {
+		-- 	background = { bg = colors.night.bg },
+		-- 	close_button = { bg = colors.night.bg },
+		-- 	separator = { fg = colors.night.bg, bg = colors.night.bg },
+		-- 	offset_separator = { bg = colors.night.bg },
+		-- 	pick = { bg = colors.night.bg },
+		-- }
 
-		vim.opt.showtabline = 2
-		opts.highlights = {
-			background = { bg = colors.night.bg },
-			close_button = { bg = colors.night.bg },
-			separator = { fg = colors.night.bg, bg = colors.night.bg },
-			offset_separator = { bg = colors.night.bg },
-			pick = { bg = colors.night.bg },
+		local mocha = require("catppuccin.palettes").get_palette("mocha")
+
+		opts = {
+			highlights = require("catppuccin.groups.integrations.bufferline").get({
+				styles = { "italic", "bold" },
+				custom = {
+					all = {
+						fill = { bg = "#000000" },
+					},
+					mocha = {
+						background = { fg = mocha.text },
+					},
+					latte = {
+						background = { fg = "#000000" },
+					},
+				},
+			}),
 		}
 
 		require("bufferline").setup(opts)
diff --git a/modules/home-manager/vim/config/lua/plugins/ui/lualine.lua b/modules/home-manager/vim/config/lua/plugins/ui/lualine.lua
index cbbfc22..093ccfe 100644
--- a/modules/home-manager/vim/config/lua/plugins/ui/lualine.lua
+++ b/modules/home-manager/vim/config/lua/plugins/ui/lualine.lua
@@ -5,11 +5,11 @@ return {
 	event = { "BufReadPost", "BufNewFile" },
 	dependencies = { "nvim-tree/nvim-web-devicons" },
 	config = function(_, opts)
-		local colors = require("tokyonight.colors")
-		local tokyonight = require("lualine.themes.catppuccin")
-
-		vim.opt.laststatus = 3
-		tokyonight.normal.c.bg = colors.night.bg
+		-- local colors = require("tokyonight.colors")
+		-- local tokyonight = require("lualine.themes.catppuccin")
+		--
+		-- vim.opt.laststatus = 3
+		-- tokyonight.normal.c.bg = colors.night.bg
 		opts.options.theme = "catppuccin"
 
 		require("lualine").setup(opts)
diff --git a/modules/home-manager/vim/lazy-lock.json b/modules/home-manager/vim/lazy-lock.json
index 0cb61b2..db5a61b 100644
--- a/modules/home-manager/vim/lazy-lock.json
+++ b/modules/home-manager/vim/lazy-lock.json
@@ -55,7 +55,6 @@
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope.nvim": { "branch": "master", "commit": "d00d9df48c00d8682c14c2b5da78bda7ef06b939" },
   "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
-  "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" },
   "treesj": { "branch": "main", "commit": "60e27280030f9cd8dfb6ceb335922c6ff76682cc" },
   "vim-dadbod": { "branch": "master", "commit": "960bbb7de11b7282a68d579a64e838b487934493" },
   "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" },