From 06bd02cd037c3cf43baabe8fc0003d0f3b3259df Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Sat, 17 Oct 2020 23:54:35 -0700 Subject: [PATCH] dont run config on non-interactive shells --- fish/.config/fish/config.fish | 106 ++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 43 deletions(-) diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 0339b3a..609a7f2 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,43 +1,63 @@ -# setup location variables -set FISH_PATH "$HOME/.config/fish" -set FLINE_PATH "$FISH_PATH/fishline" - -set -gx PATH /usr/local/opt/curl/bin $PATH -set -gx PATH /usr/local/opt/openssl/bin $PATH -set -gx PATH ~/Library/Python/2.7/bin $PATH - -set -gx PKG_CONFIG_PATH /usr/local/opt/openssl/lib/pkgconfig $PKG_CONFIG_PATH - -# setup FishLine -source $FLINE_PATH/init.fish -source $FISH_PATH/fishline_colors.fish -set FLCLR_USER_BG blue -set FLCLR_USER_FG white - -# setup colors -set -gx GCC_COLORS 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' -set -gx CLICOLOR 1 -set -gx LSCOLORS 'ExcxdxfxgxxexcxdxfBxBx' - -set fish_color_autosuggestion 'brblack' -set fish_color_cancel -r -set fish_color_command --bold -set fish_color_comment red -set fish_color_cwd green -set fish_color_cwd_root red -set fish_color_end brmagenta -set fish_color_error brred -set fish_color_escape 'bryellow' '--bold' -set fish_color_history_current --bold -set fish_color_host normal -set fish_color_match --background=brblue -set fish_color_normal normal -set fish_color_operator bryellow -set fish_color_param cyan -set fish_color_quote yellow -set fish_color_redirection brblue -set fish_color_search_match 'bryellow' '--background=brblack' -set fish_color_selection 'white' '--bold' '--background=brblack' -set fish_color_user brgreen -set fish_color_valid_path --underline - +if status is-interactive + # setup location variables + set FISH_PATH "$HOME/.config/fish" + set FLINE_PATH "$FISH_PATH/fishline" + + set -gx PATH /usr/local/opt/curl/bin $PATH + set -gx PATH /usr/local/opt/ruby/bin $PATH + set -gx PATH /usr/local/opt/openssl/bin $PATH + set -gx PATH /usr/local/opt/qt/bin $PATH + set -gx PATH /usr/local/opt/llvm/bin $PATH + set -gx PATH ~/.dotnet/tools $PATH + set -gx PATH ~/Library/Python/2.7/bin $PATH + set -gx PATH ~/Library/Python/3.8/bin $PATH + set -gx PATH ~/.gem/ruby/2.6.0/bin $PATH + set -gx PATH /opt/local/bin /opt/local/sbin $PATH + + set -gx PKG_CONFIG_PATH /usr/local/opt/openssl/lib/pkgconfig $PKG_CONFIG_PATH + set -gx PKG_CONFIG_PATH /usr/local/opt/libffi/lib/pkgconfig $PKG_CONFIG_PATH + + set -gx LDFLAGS -L/usr/local/opt/gettext/lib $LDFLAGS + set -gx CPPFLAGS -I/usr/local/opt/gettext/include $CPPFLAGS + + set -gx LDFLAGS -L/usr/local/opt/llvm/lib $LDFLAGS + set -gx CPPFLAGS -I/usr/local/opt/llvm/include $CPPFLAGS + + set -gx GOPATH $HOME/Scripts/go + set -gx MONO_GAC_PREFIX /usr/local + + + # setup FishLine + source $FLINE_PATH/init.fish + source $FISH_PATH/fishline_colors.fish + set FLCLR_USER_BG blue + set FLCLR_USER_FG white + + # setup colors + set -gx GCC_COLORS 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + set -gx CLICOLOR 1 + set -gx LSCOLORS 'ExcxdxfxgxxexcxdxfBxBx' + + set fish_color_autosuggestion 'brblack' + set fish_color_cancel -r + set fish_color_command --bold + set fish_color_comment red + set fish_color_cwd green + set fish_color_cwd_root red + set fish_color_end brmagenta + set fish_color_error brred + set fish_color_escape 'bryellow' '--bold' + set fish_color_history_current --bold + set fish_color_host normal + set fish_color_match --background=brblue + set fish_color_normal normal + set fish_color_operator bryellow + set fish_color_param cyan + set fish_color_quote yellow + set fish_color_redirection brblue + set fish_color_search_match 'bryellow' '--background=brblack' + set fish_color_selection 'white' '--bold' '--background=brblack' + set fish_color_user brgreen + set fish_color_valid_path --underline +end +