X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=.bashrc;h=c1dbd77fc6ab7a7182e3462c86b8c1baa31f1d16;hb=61ed433181c33cd554c70db0d632946a0939a997;hp=ba355b41afc20b1fcb533d414d8f33ea8568c081;hpb=563cc41a1f3ddb95bedf595cc249f53aea6629c1;p=distro-setup diff --git a/.bashrc b/.bashrc index ba355b4..c1dbd77 100644 --- a/.bashrc +++ b/.bashrc @@ -33,16 +33,16 @@ HISTIGNORE='pass *:otp *:oathtool *:histrm *' -#### begin section that works with sl() function to return from -# noninteractive ssh shells, or tty. tty because often i -# use it when something is going and io is slow and my bashrc -# is too slow. +#### if (in +# noninteractive ssh shells or tty). tty because often i use it when +# something is going and io is slow and my bashrc is too slow. if [[ $LC_USEBASHRC != t && ( $SSH_CONNECTION || $TERM == linux ) ]]; then # Here we did not opt-in to running our .bashrc file so we just # return, but we still setup a function to source it without returning # so if we want it we don't have to restart our ssh connection. brc() { export LC_USEBASHRC=t + # shellcheck disable=SC1090 # obviously, no need to follow a sourcing of this file source ~/.bashrc } return 0 @@ -85,6 +85,9 @@ else source $_tmp fi fi + if [[ $IANK_BASHRC_RUN ]]; then + $IANK_BASHRC_RUN ||: + fi ###### End sourcing of files ##### fi #### end section that works with sl() function to return from @@ -97,6 +100,13 @@ return 0 # kitty puts this here on startup, i need to build with some option to # avoid it, whatever. -# BEGIN_KITTY_SHELL_INTEGRATION -if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi -# END_KITTY_SHELL_INTEGRATION +## BEGIN_KITTY_SHELL_INTEGRATION +# if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi +## END_KITTY_SHELL_INTEGRATION + +# Automatically added by the Guix install script. +if [ -n "$GUIX_ENVIRONMENT" ]; then + if [[ $PS1 =~ (.*)"\\$" ]]; then + PS1="${BASH_REMATCH[1]} [env]\\\$ " + fi +fi