meh

git/.gitconfig

@@ -21,9 +21,10 @@
     cam = commit -a -m
     m = commit --amend --verbose
 
-    d = diff
+    dt = icdiff
-    ds = diff --stat
+    ; d = diff
-    dc = diff --cached
+    ; ds = diff --stat
+    dc = icdiff --cached
 
     s = status -s
     st = status -s

vim/.vim/lua/plugins/themes-personal.lua

@@ -5,8 +5,7 @@ return {
 		"rebelot/kanagawa.nvim",
 		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
 		priority = 1000, -- make sure to load this before all the other start plugins
-		cond = not use_google(),
+		-- cond = not use_google(),
-		cond = false,
 		config = function()
 			-- vim.cmd("colorscheme kanagawa")
 		end,
@@ -30,84 +29,4 @@ return {
 			-- vim.cmd("colorscheme bluloco")
 		end,
 	},
-	{
-		"catppuccin/nvim",
-		name = "catppuccin",
-		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
-		priority = 1000, -- make sure to load this before all the other start plugins
-		cond = use_google(),
-		config = function()
-			vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
-			local colors = require("catppuccin.palettes").get_palette()
-
-			require("catppuccin").setup({
-				flavour = "macchiato",
-				integrations = {
-					cmp = true,
-					-- coc_nvim = false,
-					dashboard = true,
-					-- fern = false,
-					fidget = true,
-					gitgutter = true,
-					gitsigns = true,
-					-- hop = false,
-					-- illuminate = false,
-					-- leap = false,
-					-- lightspeed = false,
-					-- lsp_saga = false,
-					lsp_trouble = true,
-					mason = true,
-					markdown = true,
-					-- neogit = false,
-					-- neotest = false,
-					neotree = true,
-					notify = true,
-					-- nvimtree = true,
-					-- overseer = false,
-					-- pounce = false,
-					symbols_outline = true,
-					telescope = true,
-					treesitter = true,
-					treesitter_context = false,
-					-- ts_rainbow = false,
-					-- vim_sneak = false,
-					-- vimwiki = false,
-					which_key = true,
-
-					-- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
-					dap = {
-						enabled = false,
-						enable_ui = false,
-					},
-					indent_blankline = {
-						enabled = true,
-						colored_indent_levels = false,
-					},
-					native_lsp = {
-						enabled = true,
-						virtual_text = {
-							errors = { "italic" },
-							hints = { "italic" },
-							warnings = { "italic" },
-							information = { "italic" },
-						},
-						underlines = {
-							errors = { "underline" },
-							hints = { "underline" },
-							warnings = { "underline" },
-							information = { "underline" },
-						},
-					},
-				},
-				custom_highlights = {
-					Identifier = { fg = colors.lavender },
-					Statement = { fg = colors.rosewater },
-					-- Identifier = { fg = colors.sapphire },
-					Function = { fg = colors.mauve },
-				},
-			})
-
-			vim.api.nvim_command("colorscheme catppuccin")
-		end,
-	},
 }