From 2b20c2e576a609434b5837828f4e6fbeb4a8ef81 Mon Sep 17 00:00:00 2001 From: joelazar Date: Fri, 8 May 2026 23:32:06 +0200 Subject: [PATCH] :wrench: apply Catppuccin Mocha theme and move pgcli to uv tools - Move pgcli from Homebrew to uv tool with psycopg[binary] and catppuccin[pygments] - Update fastfetch, pgcli, ripgrep configs with Catppuccin Mocha palette --- Brewfile.private | 1 - Brewfile.work | 1 - dot_config/fastfetch/config.conf | 7 +++++ dot_config/pgcli/config | 44 ++++++++++++++++++------------- dot_config/ripgrep/config | 10 +++++++ run_once_install_packages.sh.tmpl | 2 ++ 6 files changed, 45 insertions(+), 20 deletions(-) diff --git a/Brewfile.private b/Brewfile.private index caaf2826..eb1ce51d 100644 --- a/Brewfile.private +++ b/Brewfile.private @@ -83,7 +83,6 @@ brew "neovim" brew "nss" brew "ollama" brew "ouch" -brew "pgcli" brew "pngpaste" brew "poetry" brew "poppler" diff --git a/Brewfile.work b/Brewfile.work index f7ee8e1b..6557f135 100644 --- a/Brewfile.work +++ b/Brewfile.work @@ -219,7 +219,6 @@ brew "opentofu" # Painless compression and decompression for your terminal brew "ouch" # CLI for Postgres with auto-completion and syntax highlighting -brew "pgcli" # Paste PNG into files brew "pngpaste" # Fast, disk space efficient package manager diff --git a/dot_config/fastfetch/config.conf b/dot_config/fastfetch/config.conf index 7523db01..529a8b9e 100644 --- a/dot_config/fastfetch/config.conf +++ b/dot_config/fastfetch/config.conf @@ -517,3 +517,10 @@ #--lib-pulse /usr/lib/libpulse.so #--lib-ddcutil /usr/lib/libddcutil.so #--lib-nm /usr/lib/libnm.so + +# === Catppuccin Mocha tint === +# fastfetch has no official catppuccin port; tweak built-in color slots +# to lean on the mocha palette (mauve keys, blue title). +# `fastfetch --help color` for syntax. Named ANSI colors only. +--color-keys magenta +--color-title blue diff --git a/dot_config/pgcli/config b/dot_config/pgcli/config index 07a93083..30d640e1 100644 --- a/dot_config/pgcli/config +++ b/dot_config/pgcli/config @@ -106,7 +106,11 @@ table_format = psql # Syntax Style. Possible values: manni, igor, xcode, vim, autumn, vs, rrt, # native, perldoc, borland, tango, emacs, friendly, monokai, paraiso-dark, # colorful, murphy, bw, pastie, paraiso-light, trac, default, fruity -syntax_style = default +# Catppuccin Mocha pygments style. Provided by `catppuccin[pygments]`, +# installed into pgcli's uv tool venv: +# uv tool install pgcli --with 'catppuccin[pygments]' +# Falls back to default highlighting if package missing. +syntax_style = catppuccin-mocha # Keybindings: # When Vi mode is enabled you can use modal editing features offered by Vi in the REPL. @@ -151,32 +155,36 @@ null_string = '' # manage pager on startup enable_pager = True -# Custom colors for the completion menu, toolbar, etc. +# Custom colors — Catppuccin Mocha palette +# https://github.com/catppuccin/catppuccin?tab=readme-ov-file#-palette +# base=#1e1e2e crust=#11111b text=#cdd6f4 surface0=#313244 surface1=#45475a +# overlay0=#6c7086 mauve=#cba6f7 blue=#89b4fa green=#a6e3a1 yellow=#f9e2af +# red=#f38ba8 teal=#94e2d5 [colors] -Token.Menu.Completions.Completion.Current = 'bg:#ffffff #000000' -Token.Menu.Completions.Completion = 'bg:#008888 #ffffff' -Token.Menu.Completions.Meta.Current = 'bg:#44aaaa #000000' -Token.Menu.Completions.Meta = 'bg:#448888 #ffffff' -Token.Menu.Completions.MultiColumnMeta = 'bg:#aaffff #000000' -Token.Menu.Completions.ProgressButton = 'bg:#003333' -Token.Menu.Completions.ProgressBar = 'bg:#00aaaa' -Token.SelectedText = '#ffffff bg:#6666aa' -Token.SearchMatch = '#ffffff bg:#4444aa' -Token.SearchMatch.Current = '#ffffff bg:#44aa44' -Token.Toolbar = 'bg:#222222 #aaaaaa' -Token.Toolbar.Off = 'bg:#222222 #888888' -Token.Toolbar.On = 'bg:#222222 #ffffff' +Token.Menu.Completions.Completion.Current = 'bg:#cba6f7 #11111b bold' +Token.Menu.Completions.Completion = 'bg:#313244 #cdd6f4' +Token.Menu.Completions.Meta.Current = 'bg:#b4befe #11111b' +Token.Menu.Completions.Meta = 'bg:#45475a #bac2de' +Token.Menu.Completions.MultiColumnMeta = 'bg:#585b70 #cdd6f4' +Token.Menu.Completions.ProgressButton = 'bg:#11111b' +Token.Menu.Completions.ProgressBar = 'bg:#cba6f7' +Token.SelectedText = '#11111b bg:#cba6f7' +Token.SearchMatch = '#11111b bg:#f9e2af' +Token.SearchMatch.Current = '#11111b bg:#a6e3a1' +Token.Toolbar = 'bg:#181825 #bac2de' +Token.Toolbar.Off = 'bg:#181825 #6c7086' +Token.Toolbar.On = 'bg:#181825 #cdd6f4' Token.Toolbar.Search = 'noinherit bold' Token.Toolbar.Search.Text = 'nobold' Token.Toolbar.System = 'noinherit bold' Token.Toolbar.Arg = 'noinherit bold' Token.Toolbar.Arg.Text = 'nobold' -Token.Toolbar.Transaction.Valid = 'bg:#222222 #00ff5f bold' -Token.Toolbar.Transaction.Failed = 'bg:#222222 #ff005f bold' +Token.Toolbar.Transaction.Valid = 'bg:#181825 #a6e3a1 bold' +Token.Toolbar.Transaction.Failed = 'bg:#181825 #f38ba8 bold' # color of table # you can use token or custom colors -Token.Output.Header = "#00ff5f bold" +Token.Output.Header = "#cba6f7 bold" Token.Output.OddRow = "" Token.Output.EvenRow = "" diff --git a/dot_config/ripgrep/config b/dot_config/ripgrep/config index e79f1b0b..7d2fbe43 100644 --- a/dot_config/ripgrep/config +++ b/dot_config/ripgrep/config @@ -7,3 +7,13 @@ --glob=!.git/ --glob=!package-lock.json --glob=!yarn.lock + +# Catppuccin Mocha colors +# mauve=#cba6f7(203,166,247) blue=#89b4fa(137,180,250) +# green=#a6e3a1(166,227,161) yellow=#f9e2af(249,226,175) +--colors=path:fg:137,180,250 +--colors=path:style:bold +--colors=line:fg:249,226,175 +--colors=column:fg:166,227,161 +--colors=match:fg:203,166,247 +--colors=match:style:bold diff --git a/run_once_install_packages.sh.tmpl b/run_once_install_packages.sh.tmpl index 696832c3..5f537fba 100755 --- a/run_once_install_packages.sh.tmpl +++ b/run_once_install_packages.sh.tmpl @@ -79,6 +79,8 @@ install_packages_from_list "UV" "install_uv_tool" "${UV_TOOLS[@]}" # UV tools with extra dependencies execute "uv tool install ansible-core --with ansible --with netaddr" "ansible-core (with ansible, netaddr)" +# psycopg[binary] bundles libpq; catppuccin[pygments] provides syntax_style +execute "uv tool install pgcli --with 'psycopg[binary]' --with 'catppuccin[pygments]'" "pgcli (catppuccin + psycopg-binary)" # Pi packages PI_PACKAGES=() -- 2.51.2