From ac26d8f410854209a2b127f13a50ec89d6db29ac Mon Sep 17 00:00:00 2001 From: askiiart <dev@askiiart.net> Date: Tue, 7 Jan 2025 08:05:31 -0600 Subject: [PATCH] make relevant parts `if status is-interactive` so it works with scp and stuff --- fish/conf.d/aliases.fish | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish index 7be2e8c..328b30d 100644 --- a/fish/conf.d/aliases.fish +++ b/fish/conf.d/aliases.fish @@ -16,26 +16,27 @@ alias please="sudo" alias pwease="please" alias pls="please" -# kitty stuff -if [ $TERM = "xterm-kitty" ] - alias icat="kitten icat" - alias s="kitten ssh" -else - alias icat="wezterm imgcat" - alias s="ssh" -end +if status is-interactive + # kitty stuff + if [ $TERM = "xterm-kitty" ] + alias icat="kitten icat" + alias s="kitten ssh" + else + alias icat="wezterm imgcat" + alias s="ssh" + end # NixOS -if type -q nixos-rebuild - alias nrs="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all" - alias nrb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all" - alias nrs-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all --rollback" - alias nrb-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all --rollback" - alias hms="NIXPKGS_ALLOW_INSECURE=1 home-manager switch" - alias hmb="NIXPKGS_ALLOW_INSECURE=1 home-manager build" + if type -q nixos-rebuild + alias nrs="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all" + alias nrb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all" + alias nrs-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all --rollback" + alias nrb-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all --rollback" + alias hms="NIXPKGS_ALLOW_INSECURE=1 home-manager switch" + alias hmb="NIXPKGS_ALLOW_INSECURE=1 home-manager build" + end end - # git alias git-us="git submodule update --init --recursive"