Remove gitsigns from barbar due to highlight issues

Some misc config tweaks

init.lua

@@ -43,8 +43,6 @@ require("lazy").setup {
 
 -- Set vim options
 vim.cmd [[colorscheme tokyonight]]
-vim.opt.laststatus = 3
-vim.opt.showtabline = 1
 vim.opt.shiftwidth = 4
 vim.opt.expandtab = true
 vim.opt.number = true

lua/plugins/barbar.lua

@@ -24,23 +24,17 @@ return {
         auto_hide = false,
         tabpages = true,
         hide = { extensions = true },
-        highlight_alternate = false,
-        highlight_inactive_file_icons = false,
-        highlight_visible = false,
         modified = { button = "●" },
         pinned = { button = "車", filename = true, separator = { right = "" } },
         icons = {
+            separator = { left = "", right = "|" },
+            button = "",
             diagnostics = {
                 [vim.diagnostic.severity.ERROR] = { enabled = true, icon = require("ui.lsp_icons").Error },
                 [vim.diagnostic.severity.WARN] = { enabled = true, icon = require("ui.lsp_icons").Warn },
                 [vim.diagnostic.severity.INFO] = { enabled = true, icon = require("ui.lsp_icons").Hint },
                 [vim.diagnostic.severity.HINT] = { enabled = true, icon = require("ui.lsp_icons").Info },
             },
-            gitsigns = {
-                added = { enabled = true, icon = "+" },
-                changed = { enabled = true, icon = "~" },
-                deleted = { enabled = true, icon = "-" },
-            },
             filetype = {
                 custom_colors = false,
                 enabled = true,

lua/plugins/catppuccin.lua

@@ -9,6 +9,7 @@ return {
         transparent_background = true,
         integrations = {
             alpha = true,
+            barbar = true,
             gitsigns = true,
             hop = true,
             indent_blankline = { enabled = true, colored_indent_levels = true },

lua/plugins/tokyonight.lua

@@ -3,7 +3,9 @@ return {
     lazy = true,
     config = true,
     opts = {
+        style = "storm",
         transparent = true,
+        terminal_colors = true,
         styles = { sidebars = "transparent", floats = "transparent" },
     },
 }