From 04d02d34176610c0489f14345ca189fcf8336aa3 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Tue, 19 Aug 2025 14:32:53 -0500 Subject: [PATCH] Revert Catppuccin background color to be more pleasing --- ghostty/themes/catppuccin-mocha.conf | 8 +++--- k9s/skins/catppuccin-latte.yaml | 17 ++++--------- k9s/skins/catppuccin-mocha.yaml | 38 ++++++++++++++-------------- nvim/lazy-lock.json | 14 +++++----- nvim/lua/plugins/00-colorscheme.lua | 5 ---- 5 files changed, 35 insertions(+), 47 deletions(-) diff --git a/ghostty/themes/catppuccin-mocha.conf b/ghostty/themes/catppuccin-mocha.conf index f38b71a..927dd81 100644 --- a/ghostty/themes/catppuccin-mocha.conf +++ b/ghostty/themes/catppuccin-mocha.conf @@ -5,7 +5,7 @@ palette = 3=#f9e2af palette = 4=#89b4fa palette = 5=#f5c2e7 palette = 6=#94e2d5 -palette = 7=#bac2de +palette = 7=#a6adc8 palette = 8=#585b70 palette = 9=#f38ba8 palette = 10=#a6e3a1 @@ -13,10 +13,10 @@ palette = 11=#f9e2af palette = 12=#89b4fa palette = 13=#f5c2e7 palette = 14=#94e2d5 -palette = 15=#a6adc8 -background = 101018 +palette = 15=#bac2de +background = 1e1e2e foreground = cdd6f4 cursor-color = f5e0dc -cursor-text = 101018 +cursor-text = 1e1e2e selection-background = 353749 selection-foreground = cdd6f4 diff --git a/k9s/skins/catppuccin-latte.yaml b/k9s/skins/catppuccin-latte.yaml index acfcc8b..a085784 100644 --- a/k9s/skins/catppuccin-latte.yaml +++ b/k9s/skins/catppuccin-latte.yaml @@ -1,3 +1,4 @@ +--- k9s: body: fgColor: '#4c4f69' @@ -64,19 +65,11 @@ k9s: bgColor: '#eff1f5' chartBgColor: '#eff1f5' dialBgColor: '#eff1f5' - defaultDialColors: - - '#40a02b' - - '#d20f39' - defaultChartColors: - - '#40a02b' - - '#d20f39' + defaultDialColors: ['#40a02b', '#d20f39'] + defaultChartColors: ['#40a02b', '#d20f39'] resourceColors: - cpu: - - '#8839ef' - - '#1e66f5' - mem: - - '#df8e1d' - - '#fe640b' + cpu: ['#8839ef', '#1e66f5'] + mem: ['#df8e1d', '#fe640b'] yaml: keyColor: '#1e66f5' valueColor: '#4c4f69' diff --git a/k9s/skins/catppuccin-mocha.yaml b/k9s/skins/catppuccin-mocha.yaml index eef8ae4..b31988f 100644 --- a/k9s/skins/catppuccin-mocha.yaml +++ b/k9s/skins/catppuccin-mocha.yaml @@ -2,22 +2,22 @@ k9s: body: fgColor: '#cdd6f4' - bgColor: '#101018' + bgColor: default logoColor: '#cba6f7' prompt: fgColor: '#cdd6f4' - bgColor: '#181825' + bgColor: default suggestColor: '#89b4fa' help: fgColor: '#cdd6f4' - bgColor: '#101018' + bgColor: default sectionColor: '#a6e3a1' keyColor: '#89b4fa' numKeyColor: '#eba0ac' frame: title: fgColor: '#94e2d5' - bgColor: '#101018' + bgColor: default highlightColor: '#f5c2e7' counterColor: '#f9e2af' filterColor: '#a6e3a1' @@ -29,8 +29,8 @@ k9s: keyColor: '#89b4fa' numKeyColor: '#eba0ac' crumbs: - fgColor: '#101018' - bgColor: '#eba0ac' + fgColor: '#1e1e2e' + bgColor: default activeColor: '#f2cdcd' status: newColor: '#89b4fa' @@ -47,24 +47,24 @@ k9s: views: table: fgColor: '#cdd6f4' - bgColor: '#101018' + bgColor: default cursorFgColor: '#313244' cursorBgColor: '#45475a' markColor: '#f5e0dc' header: fgColor: '#f9e2af' - bgColor: '#101018' + bgColor: default sorterColor: '#89dceb' xray: fgColor: '#cdd6f4' - bgColor: '#101018' + bgColor: default cursorColor: '#45475a' - cursorTextColor: '#101018' + cursorTextColor: '#1e1e2e' graphicColor: '#f5c2e7' charts: - bgColor: '#101018' - chartBgColor: '#101018' - dialBgColor: '#101018' + bgColor: default + chartBgColor: default + dialBgColor: default defaultDialColors: ['#a6e3a1', '#f38ba8'] defaultChartColors: ['#a6e3a1', '#f38ba8'] resourceColors: @@ -76,18 +76,18 @@ k9s: colonColor: '#a6adc8' logs: fgColor: '#cdd6f4' - bgColor: '#101018' + bgColor: default indicator: fgColor: '#b4befe' - bgColor: '#101018' + bgColor: default toggleOnColor: '#a6e3a1' toggleOffColor: '#a6adc8' dialog: fgColor: '#f9e2af' - bgColor: '#9399b2' - buttonFgColor: '#101018' - buttonBgColor: '#7f849c' - buttonFocusFgColor: '#101018' + bgColor: default + buttonFgColor: '#1e1e2e' + buttonBgColor: default + buttonFocusFgColor: '#1e1e2e' buttonFocusBgColor: '#f5c2e7' labelFgColor: '#f5e0dc' fieldFgColor: '#cdd6f4' diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 5054744..8f9f33b 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "avante.nvim": { "branch": "main", "commit": "4e0a8620b68a0de7a0ec67a0a7503863500f6d29" }, + "avante.nvim": { "branch": "main", "commit": "fed6902c9a9a3c4473238e924cddc1ba19f3195b" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "catppuccin": { "branch": "main", "commit": "3aaf3ab60221bca8edb1354e41bd514a22c89de2" }, + "catppuccin": { "branch": "main", "commit": "9a9a875e979fe9d2b42423d056f944dd286d0280" }, "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "dropbar.nvim": { "branch": "master", "commit": "418897fe7828b2749ca78056ec8d8ad43136b695" }, "fidget.nvim": { "branch": "main", "commit": "2cb5edb2dd6700a958a446b20bb2be04d318da9d" }, @@ -10,16 +10,16 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "0e9d1f972a91acf5a0513319099ba41f7c09c30a" }, - "neo-tree.nvim": { "branch": "main", "commit": "46fa0c22ca39e05fe15744102d21feb07fe9a94a" }, + "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" }, + "neo-tree.nvim": { "branch": "main", "commit": "bbeda076c8a2e7d16614287cd70239f577e5bf55" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-lspconfig": { "branch": "master", "commit": "45ff1914044de7dbd4cd85053dc09f47312a2f4d" }, + "nvim-lspconfig": { "branch": "master", "commit": "34c9ecfdcc19d579f51c072300a71445fbec9da8" }, "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" }, - "nvim-surround": { "branch": "main", "commit": "c271c9082886a24866353764cf96c9d957e95b2b" }, + "nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, diff --git a/nvim/lua/plugins/00-colorscheme.lua b/nvim/lua/plugins/00-colorscheme.lua index 128946c..9fd5d62 100644 --- a/nvim/lua/plugins/00-colorscheme.lua +++ b/nvim/lua/plugins/00-colorscheme.lua @@ -10,11 +10,6 @@ return { dark = "mocha", }, term_colors = vim.g.neovide, - color_overrides = { - mocha = { - base = "#101018", - }, - }, integrations = { blink_cmp = true, diffview = true,