merge live config.fish changes, fix chezmoi template on macOS
- pull live local changes: gpt-5.2 model, llm.py, rewritten s/icat/ils functions with ghostty support, antigravity path - re-apply our improvements on top: fish_add_path, guards, hardcoded path fixes, micromamba removal - fix osRelease.id template error on macOS (wrap ncurses block in linux check) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
ac46863b48
commit
f03b8e90b2
@ -40,11 +40,12 @@ abbr vi nvim
|
||||
|
||||
# functions
|
||||
function sss
|
||||
python3 ~/.config/scripts/ss.py --model gpt-3.5-turbo $argv
|
||||
python3 ~/.config/scripts/ss.py --model gpt-5.2 $argv
|
||||
end
|
||||
|
||||
function ss
|
||||
python3 ~/.config/scripts/ss.py $argv
|
||||
#python3 ~/.config/scripts/ss.py $argv
|
||||
python3 ~/.config/scripts/llm.py cmd $argv
|
||||
end
|
||||
|
||||
set IPPATH (which ip)
|
||||
@ -52,20 +53,49 @@ function ip
|
||||
$IPPATH --color=auto $argv
|
||||
end
|
||||
|
||||
|
||||
function s
|
||||
if [ $TERM_PROGRAM ]
|
||||
ssh $argv
|
||||
else
|
||||
kitty +kitten ssh $argv
|
||||
end
|
||||
if test "$TERM_PROGRAM" = kitty
|
||||
kitty +kitten ssh $argv
|
||||
else
|
||||
ssh $argv
|
||||
end
|
||||
end
|
||||
|
||||
function icat
|
||||
if [ $TERM_PROGRAM ]
|
||||
wezterm imgcat $argv
|
||||
if test "$TERM_PROGRAM" = "WezTerm"
|
||||
wezterm imgcat $argv
|
||||
else if test "$TERM_PROGRAM" = "ghostty"
|
||||
env TERM=xterm-kitty viu $argv
|
||||
else
|
||||
kitty +kitten icat --align=left $argv
|
||||
end
|
||||
end
|
||||
|
||||
function ils
|
||||
if test (count $argv) -eq 0
|
||||
# 1. Find "Fast" images (JPG, PNG, etc.) - Case Insensitive
|
||||
set -l fast_imgs (find . -maxdepth 1 -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" -o -iname "*.gif" -o -iname "*.webp" -o -iname "*.svg" \) | sort)
|
||||
|
||||
# 2. Find "Slow" RAW images (ARW, DNG, etc.)
|
||||
# We search for these separately so we can append them to the end of the list
|
||||
|
||||
set -l slow_imgs (find . -maxdepth 1 -type f \( -iname "*.arw" -o -iname "*.raw" -o -iname "*.cr2" -o -iname "*.nef" \) | sort)
|
||||
|
||||
# Combine them: Fast first, Slow last
|
||||
set argv $fast_imgs $slow_imgs
|
||||
end
|
||||
|
||||
if test (count $argv) -gt 0
|
||||
# Move cursor to bottom to prevent scrolling glitches
|
||||
tput cup (tput lines) 0
|
||||
# -g 5 : 5 images per row (The Grid!)
|
||||
# -p k : Force Kitty protocol (Cleanest for Ghostty)
|
||||
# --title : Show filename headers
|
||||
# --upscale=0 : Don't stretch small icons
|
||||
# --center : Center the whole grid in the terminal
|
||||
timg -p k --grid 5 --frames=1 --title --center $argv 2>/dev/null
|
||||
else
|
||||
kitty +kitten icat --align=left $argv
|
||||
echo "No images found."
|
||||
end
|
||||
end
|
||||
|
||||
@ -88,7 +118,7 @@ if type -q direnv
|
||||
direnv hook fish | source
|
||||
end
|
||||
if [ -f ~/.config/op/plugins.sh ]
|
||||
source ~/.config/op/plugins.sh
|
||||
source ~/.config/op/plugins.sh
|
||||
end
|
||||
|
||||
#fish_vi_key_bindings
|
||||
@ -108,3 +138,5 @@ fish_add_path $HOME/.cache/lm-studio/bin
|
||||
# Added by OrbStack: command-line tools and integration
|
||||
# This won't be added again if you remove it.
|
||||
source ~/.orbstack/shell/init.fish 2>/dev/null || :
|
||||
|
||||
fish_add_path $HOME/.antigravity/antigravity/bin
|
||||
|
||||
@ -143,11 +143,13 @@ pad() {
|
||||
}
|
||||
|
||||
|
||||
{{ if eq .chezmoi.os "linux" -}}
|
||||
{{ if eq .chezmoi.osRelease.id "almalinux" "rocky" "fedora" -}}
|
||||
echo -e "--> "$Blue$1$Blue"Installing prerequestative ncurses for this script's interface"$NC
|
||||
sudo dnf install ncurses -y 2>&1|pad
|
||||
|
||||
{{ end -}}
|
||||
{{ end -}}
|
||||
|
||||
LINES=$(tput lines)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user