diff --git a/functions/replay.fish b/functions/replay.fish index 6f29f12..7a7ce22 100644 --- a/functions/replay.fish +++ b/functions/replay.fish @@ -27,11 +27,7 @@ function replay --description 'Run Bash commands replaying changes in Fish' case -v --version echo "replay, version 1.2.1" case "" -h --help - set -l c_head (set_color --bold cyan) - set -l c_cmd (set_color --bold) - set -l c_flag (set_color yellow) - set -l c_arg (set_color cyan) - set -l c_reset (set_color normal) + __fish_palette echo "$c_head""Usage:$c_reset $c_cmd""replay$c_reset $c_arg""$c_reset Run Bash commands replaying changes in Fish" echo "$c_head""Options:$c_reset" echo " $c_flag-v$c_reset or $c_flag--version$c_reset Print version" diff --git a/functions/repo-open.fish b/functions/repo-open.fish index 60eee02..8cc0c91 100644 --- a/functions/repo-open.fish +++ b/functions/repo-open.fish @@ -52,10 +52,7 @@ # NOTES # Typo abbreviation: open-repo (expands to repo-open on space/enter). function repo-open --description 'Open the origin remote of the current repo in a browser' - set -l c_head (set_color --bold cyan) - set -l c_cmd (set_color --bold) - set -l c_flag (set_color yellow) - set -l c_reset (set_color normal) + __fish_palette argparse -X 0 h/help p/print r/root -- $argv or return 1 diff --git a/functions/spark.fish b/functions/spark.fish index 19ddfad..2420de1 100644 --- a/functions/spark.fish +++ b/functions/spark.fish @@ -29,11 +29,7 @@ function spark --description 'Sparklines' if set --query _flag_version[1] echo "spark, version 1.1.0" else if set --query _flag_help[1] - set -l c_head (set_color --bold cyan) - set -l c_cmd (set_color --bold) - set -l c_flag (set_color yellow) - set -l c_arg (set_color cyan) - set -l c_reset (set_color normal) + __fish_palette echo "$c_head""Usage:$c_reset $c_cmd""spark$c_reset $c_arg""$c_reset" echo " stdin | $c_cmd""spark$c_reset" echo "$c_head""Options:$c_reset" diff --git a/functions/split.fish b/functions/split.fish index 618b42a..539cd67 100644 --- a/functions/split.fish +++ b/functions/split.fish @@ -31,8 +31,7 @@ function split --description 'Run a command in a new terminal split' # Opinionated guard (C4): integrations disabled if not __fish_config_op_enabled (status current-function) - set -l c_err (set_color red) - set -l c_reset (set_color normal) + __fish_palette echo "$c_err"'split: disabled by __fish_config_op_integrations'"$c_reset" >&2 return 1 end diff --git a/functions/spwin.fish b/functions/spwin.fish index 18fb036..954d3d1 100644 --- a/functions/spwin.fish +++ b/functions/spwin.fish @@ -26,8 +26,7 @@ function spwin --wraps='~/.config/kitty/spawn-window.sh' --description 'spawn window in kitty or wezterm' # Opinionated guard (C4): integrations disabled if not __fish_config_op_enabled (status current-function) - set -l c_err (set_color red) - set -l c_reset (set_color normal) + __fish_palette echo "$c_err"'spwin: disabled by __fish_config_op_integrations'"$c_reset" >&2 return 1 end diff --git a/functions/tab.fish b/functions/tab.fish index 6cb9c21..092acd0 100644 --- a/functions/tab.fish +++ b/functions/tab.fish @@ -27,8 +27,7 @@ function tab --description 'Spawn a new tab in the current terminal' # Opinionated guard (C4): integrations disabled if not __fish_config_op_enabled (status current-function) - set -l c_err (set_color red) - set -l c_reset (set_color normal) + __fish_palette echo "$c_err"'tab: disabled by __fish_config_op_integrations'"$c_reset" >&2 return 1 end diff --git a/functions/y.fish b/functions/y.fish index 5bac53d..26e5361 100644 --- a/functions/y.fish +++ b/functions/y.fish @@ -25,11 +25,7 @@ function y --description 'Yank to clipboard' # Check for help flag if contains -- -h $argv; or contains -- --help $argv - set -l c_head (set_color --bold cyan) - set -l c_cmd (set_color --bold) - set -l c_arg (set_color cyan) - set -l c_dim (set_color brblack) - set -l c_reset (set_color normal) + __fish_palette echo "$c_head""Usage:$c_reset $c_cmd""y$c_reset $c_arg""[TEXT]$c_reset or $c_arg""[COMMAND]$c_reset | $c_cmd""y$c_reset" echo "" echo "$c_head""Examples:$c_reset"