From 20c365d7f4af987e0ebd67a00afb6032ae121bfa Mon Sep 17 00:00:00 2001 From: "Lockszmith (VAST@MacBook)" Date: Wed, 30 Apr 2025 12:37:51 -0400 Subject: [PATCH] optimize pager and cat alias setup for bat+ov, ov, bat or moar --- .../private_dot_config/sz.env/991_pager.env | 1 + .../sz.env/991_aliases.env.tmpl | 12 ---------- .../private_dot_config/sz.env/991_pager.env | 22 +++++++++++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) create mode 120000 chezmoi.roots/_home.macos/private_dot_config/sz.env/991_pager.env create mode 100644 chezmoi.roots/_home/private_dot_config/sz.env/991_pager.env diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/991_pager.env b/chezmoi.roots/_home.macos/private_dot_config/sz.env/991_pager.env new file mode 120000 index 0000000..613c88f --- /dev/null +++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/991_pager.env @@ -0,0 +1 @@ +../../../_home/private_dot_config/sz.env/991_pager.env \ No newline at end of file diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/991_aliases.env.tmpl b/chezmoi.roots/_home/private_dot_config/sz.env/991_aliases.env.tmpl index adebcc1..5b107b5 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/991_aliases.env.tmpl +++ b/chezmoi.roots/_home/private_dot_config/sz.env/991_aliases.env.tmpl @@ -17,18 +17,6 @@ alias lu='l -U ' alias sudo='sudo ' -is_cmd ov \ -&& alias less="ov --wrap=false " \ -&& export PAGER="ov --wrap=false " - -if is_cmd bat; then - alias less='bat --wrap=never --style=plain ' - alias cat='bat --wrap=never ' -elif is_cmd moar; then - alias less="moar " \ - && export PAGER=moar -fi - is_cmd nvim \ && export VISUAL="nvim" EDITOR="nvim" \ || export VISUAL="vim" EDITOR="vim" diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/991_pager.env b/chezmoi.roots/_home/private_dot_config/sz.env/991_pager.env new file mode 100644 index 0000000..f3a624f --- /dev/null +++ b/chezmoi.roots/_home/private_dot_config/sz.env/991_pager.env @@ -0,0 +1,22 @@ +#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' +if is_cmd moar; then + alias less="moar " + export PAGER=moar + alias cat='moar -quit-if-one-screen ' +fi + +if is_cmd ov; then + . <( ov completion "${SHELL##*/}" ) + alias less="ov --wrap=false " + export PAGER="ov --wrap=false " + BAT_CAT_PAGER="${PAGER} --quit-if-one-screen" +fi +alias cat="${BAT_CAT_PAGER:-${PAGER}} " + +if is_cmd bat; then + alias less='bat --wrap=never --style=plain ' + alias cat="bat --wrap=never --paging=auto --pager='${BAT_CAT_PAGER:-${PAGER}}' " +fi + +# vim: set ft=sh expandtab tabstop=4 shiftwidth=4: +