From 0495d983567435db8a2072e67af31b03b61e7a7a Mon Sep 17 00:00:00 2001 From: Simon Olofsson Date: Sat, 7 Mar 2026 13:27:45 +0100 Subject: [PATCH] fish: move MANPAGER to bat.fish, drop Solarized workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Solarized theme override for man pages is no longer needed now that the upstream Rosé Pine tmTheme includes manpage scopes. MANPAGER is no longer theme-dependent, so move it to bat.fish. See rose-pine/tm-theme#9. Co-Authored-By: Claude Opus 4.6 --- fish/conf.d/bat.fish | 3 +++ fish/conf.d/theme.fish | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fish/conf.d/bat.fish b/fish/conf.d/bat.fish index 9f52ba1..d81d85f 100644 --- a/fish/conf.d/bat.fish +++ b/fish/conf.d/bat.fish @@ -13,5 +13,8 @@ abbr b bat # Highlight help messages abbr --position anywhere -- --help '--help | bat -plhelp' +# Use bat for man pages +set -gx MANPAGER "sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'" + # Make less more usable set -gx LESS "--ignore-case --no-histdups --color=s+y" diff --git a/fish/conf.d/theme.fish b/fish/conf.d/theme.fish index c1373d9..1a9f3e3 100644 --- a/fish/conf.d/theme.fish +++ b/fish/conf.d/theme.fish @@ -23,9 +23,6 @@ function __so_apply_theme --on-variable fish_terminal_color_theme # Bat and delta both use `BAT_THEME`. set -gx BAT_THEME "rose-pine-$theme_variant" - # Use Solarized for man pages because Rosé Pine doesn't support man page highlighting. - set -gx MANPAGER "sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman --theme \"Solarized ($appearance)\"'" - # delta can detect the background color of the terminal automatically. # # But this doesn't work when Delta is embedded in other tools or when its