diff --git a/home/apps/colorscheme-sync.nix b/home/apps/colorscheme-sync.nix index 13dfc6a..3fb54a4 100644 --- a/home/apps/colorscheme-sync.nix +++ b/home/apps/colorscheme-sync.nix @@ -40,11 +40,11 @@ in { }; programs.zsh = { - shellAliases.cat = "bat --theme=$(dark-mode-ternary 'Catppuccin-frappe' 'Catppuccin-latte')"; + shellAliases.cat = "bat --theme=\"$(dark-mode-ternary 'Catppuccin Mocha' 'Catppuccin Latte')\""; initExtra = '' zadm_sync() { - export STARSHIP_CONFIG__PALETTE="catppuccin_$(dark-mode-ternary frappe latte)" - fast-theme "XDG:catppuccin-$(dark-mode-ternary frappe latte)" >/dev/null + export STARSHIP_CONFIG__PALETTE="catppuccin_$(dark-mode-ternary mocha latte)" + fast-theme "XDG:catppuccin-$(dark-mode-ternary mocha latte)" >/dev/null } add-zsh-hook precmd zadm_sync ''; diff --git a/home/apps/discord/custom.css b/home/apps/discord/custom.css index f50c1dc..2415579 100644 --- a/home/apps/discord/custom.css +++ b/home/apps/discord/custom.css @@ -1,5 +1,3 @@ -@import url("//catppuccin.github.io/discord/dist/catppuccin-frappe-pink.theme.css") (prefers-color-scheme: dark); -@import url("//catppuccin.github.io/discord/dist/catppuccin-latte-pink.theme.css") (prefers-color-scheme: light); @import url(//dablulite.github.io/css-snippets/ConsistentChatbar/import.css); :root { diff --git a/home/apps/starship/config.toml b/home/apps/starship/config.toml index 984362d..8045d71 100644 --- a/home/apps/starship/config.toml +++ b/home/apps/starship/config.toml @@ -521,30 +521,29 @@ mantle = "#1e2030" crust = "#181926" [palettes.catppuccin_mocha] -rosewater = '#f5e0dc' -flamingo = '#f2cdcd' -pink = '#f5c2e7' -mauve = '#cba6f7' -red = '#f38ba8' -maroon = '#eba0ac' -peach = '#fab387' -yellow = '#f9e2af' -green = '#a6e3a1' -teal = '#94e2d5' -sky = '#89dceb' -sapphire = '#74c7ec' -blue = '#89b4fa' -lavender = '#b4befe' -text = '#cdd6f4' -subtext1 = '#bac2de' -subtext0 = '#a6adc8' -overlay2 = '#9399b2' -overlay1 = '#7f849c' -overlay0 = '#6c7086' -surface2 = '#585b70' -surface1 = '#45475a' -surface0 = '#313244' -base = '#1e1e2e' -mantle = '#181825' -crust = '#11111b' -contrast = '#000000' +rosewater = "#ece3e1" +flamingo = "#e1d2d2" +pink = "#ddccd8" +mauve = "#bbb2c9" +red = "#c4a2aa" +maroon = "#cbadb1" +peach = "#d5beb4" +yellow = "#ece3d3" +green = "#b9ddb6" +teal = "#badad4" +sky = "#b8d4db" +sapphire = "#a9c0ce" +blue = "#aab3c7" +lavender = "#bfc1d2" +text = "#d3d6e1" +subtext1 = "#bec2d2" +subtext0 = "#a8adc3" +overlay2 = "#9299b4" +overlay1 = "#7c84a5" +overlay0 = "#686f94" +surface2 = "#555a7b" +surface1 = "#434664" +surface0 = "#30314b" +base = "#101010" +mantle = "#090909" +crust = "#080808" diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix index b5fe9e5..796b820 100644 --- a/home/apps/vscode.nix +++ b/home/apps/vscode.nix @@ -101,7 +101,6 @@ in { ms-kubernetes-tools.vscode-kubernetes-tools ms-vscode.live-server oscarotero.vento-syntax - pkief.material-icon-theme redhat.vscode-yaml ryanluker.vscode-coverage-gutters serayuzgur.crates diff --git a/home/apps/vscode/settings.json b/home/apps/vscode/settings.json index bd9507a..0434c53 100644 --- a/home/apps/vscode/settings.json +++ b/home/apps/vscode/settings.json @@ -7,6 +7,36 @@ "statusBar.noFolderForeground": "accent" } }, + "catppuccin.colorOverrides": { + "mocha": { + "rosewater": "#ece3e1", + "flamingo": "#e1d2d2", + "pink": "#ddccd8", + "mauve": "#bbb2c9", + "red": "#c4a2aa", + "maroon": "#cbadb1", + "peach": "#d5beb4", + "yellow": "#ece3d3", + "green": "#b9ddb6", + "teal": "#badad4", + "sky": "#b8d4db", + "sapphire": "#a9c0ce", + "blue": "#aab3c7", + "lavender": "#bfc1d2", + "text": "#d3d6e1", + "subtext1": "#bec2d2", + "subtext0": "#a8adc3", + "overlay2": "#9299b4", + "overlay1": "#7c84a5", + "overlay0": "#686f94", + "surface2": "#555a7b", + "surface1": "#434664", + "surface0": "#30314b", + "base": "#101010", + "mantle": "#090909", + "crust": "#080808" + } + }, "catppuccin.extraBordersEnabled": true, "debug.onTaskErrors": "debugAnyway", "diffEditor.ignoreTrimWhitespace": false, @@ -48,10 +78,9 @@ "window.autoDetectColorScheme": true, "window.commandCenter": false, "window.titleBarStyle": "custom", - "workbench.colorTheme": "Catppuccin Frappé", - "workbench.iconTheme": "catppuccin-frappe", - "workbench.layoutControl.enabled": false, - "workbench.preferredDarkColorTheme": "Catppuccin Frappé", + "workbench.colorTheme": "Catppuccin Latte", + "workbench.iconTheme": "material-icon-theme", + "workbench.preferredDarkColorTheme": "Catppuccin Mocha", "workbench.preferredLightColorTheme": "Catppuccin Latte", "workbench.productIconTheme": "icons-carbon", @@ -253,5 +282,6 @@ "package.json": "package-lock.json, pnpm-lock.yaml, yarn.lock, yarn.config.cjs, .yarn*, .pnp.*, .eslint*, .prettier*", "readme*": "authors, backers*, changelog*, citation*, code_of_conduct*, codeowners, contributing*, contributors, copying*, credits, governance.md, history.md, license*, maintainers, readme*, security.md, sponsors*", "release-please-config.json": ".release-please-manifest.json" - } + }, + "material-icon-theme.saturation": 0.2 } diff --git a/home/apps/wezterm/wezterm.lua b/home/apps/wezterm/wezterm.lua index 4ecda80..81967fa 100644 --- a/home/apps/wezterm/wezterm.lua +++ b/home/apps/wezterm/wezterm.lua @@ -30,8 +30,37 @@ if utils.is_darwin() then end require("catppuccin.plugin").apply_to_config(c, { + color_overrides = { + mocha = { + rosewater = "#ece3e1", + flamingo = "#e1d2d2", + pink = "#ddccd8", + mauve = "#bbb2c9", + red = "#c4a2aa", + maroon = "#cbadb1", + peach = "#d5beb4", + yellow = "#ece3d3", + green = "#b9ddb6", + teal = "#badad4", + sky = "#b8d4db", + sapphire = "#a9c0ce", + blue = "#aab3c7", + lavender = "#bfc1d2", + text = "#d3d6e1", + subtext1 = "#bec2d2", + subtext0 = "#a8adc3", + overlay2 = "#9299b4", + overlay1 = "#7c84a5", + overlay0 = "#686f94", + surface2 = "#555a7b", + surface1 = "#434664", + surface0 = "#30314b", + base = "#101010", + mantle = "#090909", + crust = "#080808", + }, + }, sync = true, - sync_flavors = { dark = "frappe" }, }) return c