touched the nvim, alot.

nvim/lua/plugins/ui/barbar.lua

@@ -17,8 +17,13 @@ return {
 			separator = {left = '', right = ''},
 			separator_at_end = false,
 			inactive = { button = '', separator = { left = '', right = ''} },
-			modified = {button = icons.filetree.git.modified },
-			pinned = {button = '', filename = true},
+			modified = {button = icons.gitsigns.modified },
+			pinned = {button = icons.pinned, filename = true},
+			gitsigns = {
+				added = { enabled = false },
+				changed = { enabled = false },
+				deleted = { enabled = false },
+			}
 		},
 		maximum_padding = 2,
 		minimum_padding = 1,

nvim/lua/plugins/ui/catppuccin.lua

@@ -2,7 +2,7 @@ return {
 	"catppuccin/nvim",
 	name = "catppuccin",
 	priority = 1000,
-	opts = require('config.catppuccin'),
+	opts = require('config.plugins.catppuccin'),
 	config = function (_, opts)
 		require("catppuccin").setup(opts)
 		vim.cmd.colorscheme("catppuccin")

nvim/lua/plugins/ui/neo-tree.lua

@@ -23,12 +23,16 @@ return {
 				indent_marker = "│",
 				last_indent_marker = "└",
 			},
-			icon = icons.filetree.basic,
+			icon = {
+				folder_open = icons.folder.open,
+				folder_close = icons.folder.close,
+				folder_empty = icons.folder.empty,
+			},
 			name = {
 				use_git_status_colors = false,
 			},
 			git_status = {
-				symbols = icons.filetree.git
+				symbols = icons.gitsigns
 			},
 		},
 		event_handlers = {

nvim/lua/plugins/ui/which-key.lua

@@ -11,6 +11,7 @@ return {
 			["<leader>r"] = { name = "+rename" },
 			["<leader>b"] = { name = "+buffers" },
 			["<leader>f"] = { name = "+files" },
+			["<leader>d"] = { name = "+diagnostics" }
 		}
 	},
 	config = function(_, opts)