From 07a8d1a5ff04cdba62dba7c7d4d776fb830d1683 Mon Sep 17 00:00:00 2001 From: Pavel Egorov Date: Mon, 23 Jun 2025 20:04:21 +0300 Subject: [fish] do program-specific configurations conditionally --- .config/fish/conf.d/abbr.fish | 12 +++++++----- .config/fish/conf.d/alias.fish | 6 ++++-- .config/fish/conf.d/js.fish | 4 +++- .config/fish/conf.d/python.fish | 4 +++- 4 files changed, 17 insertions(+), 9 deletions(-) (limited to '.config/fish/conf.d') diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish index 2f3b72c..c763d85 100644 --- a/.config/fish/conf.d/abbr.fish +++ b/.config/fish/conf.d/abbr.fish @@ -7,11 +7,13 @@ abbr --add ga "git add" abbr --add gco "git checkout" # Added proxy flags -set -l ssconfig "/etc/shadowsocks-rust/config.json" -set -l parsed_config (jq -r .local_address,.local_port $ssconfig) -set -l SSPROXY "socks5://$parsed_config[1]:$parsed_config[2]" -abbr --add curlss "curl --proxy=$SSPROXY" -abbr --add ytdlpss "yt-dlp --proxy=$SSPROXY" +if type -q sslocal + set -l ssconfig "/etc/shadowsocks-rust/config.json" + set -l parsed_config (jq -r .local_address,.local_port $ssconfig) + set -l SSPROXY "socks5://$parsed_config[1]:$parsed_config[2]" + abbr --add curlss "curl --proxy=$SSPROXY" + abbr --add ytdlpss "yt-dlp --proxy=$SSPROXY" +end # Pacman abbr --add pacman-unlock "sudo rm /var/lib/pacman/db.lck" diff --git a/.config/fish/conf.d/alias.fish b/.config/fish/conf.d/alias.fish index 442d3d8..64bac90 100644 --- a/.config/fish/conf.d/alias.fish +++ b/.config/fish/conf.d/alias.fish @@ -1,3 +1,5 @@ # ls & alternatives -alias ls "eza --long --almost-all --binary --smart-group --group-directories-first --git --git-repos --color=auto --icons=never" -alias lss "ls --total-size" +if type -q eza + alias ls "eza --long --almost-all --binary --smart-group --group-directories-first --git --git-repos --color=auto --icons=never" + alias lss "ls --total-size" +end diff --git a/.config/fish/conf.d/js.fish b/.config/fish/conf.d/js.fish index dab58c6..443fe29 100644 --- a/.config/fish/conf.d/js.fish +++ b/.config/fish/conf.d/js.fish @@ -1 +1,3 @@ -fnm env --use-on-cd --shell fish | source +if type -q fnm + fnm env --use-on-cd --shell fish | source +end diff --git a/.config/fish/conf.d/python.fish b/.config/fish/conf.d/python.fish index 54f931f..b3b5eec 100644 --- a/.config/fish/conf.d/python.fish +++ b/.config/fish/conf.d/python.fish @@ -1 +1,3 @@ -pyenv init - | source +if type -q pyenv + pyenv init - | source +end -- cgit v1.3