diff options
| author | EuAndreh <eu@euandre.org> | 2018-07-03 12:12:49 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2018-07-03 12:12:49 -0300 |
| commit | 8f28b93508c52e3cd8fbd39c543850ec762fb55e (patch) | |
| tree | 204b998fd2062b7b4b79ff3527912da9820697a0 | |
| parent | Add SSH_SERVER_FOLDER env var (diff) | |
| download | dotfiles-8f28b93508c52e3cd8fbd39c543850ec762fb55e.tar.gz dotfiles-8f28b93508c52e3cd8fbd39c543850ec762fb55e.tar.xz | |
Fix $IN_NIX_SHELL PS1 check
| -rw-r--r-- | bash/bashrc.sh | 6 | ||||
| -rw-r--r-- | bash/colors.sh | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/bash/bashrc.sh b/bash/bashrc.sh index 3ee3df6..e46d8d7 100644 --- a/bash/bashrc.sh +++ b/bash/bashrc.sh @@ -20,12 +20,6 @@ source $DOTFILES/encrypted/env.sh set -h source ~/dev/nu/nucli/nu.bashcompletion -# Here's the place to do custom nix-shell config -if [[ -z $IN_NIX_SHELL ]]; then - printf "" -else - printf "" -fi # FIXME isLinux && { diff --git a/bash/colors.sh b/bash/colors.sh index 47019fd..dde3dd7 100644 --- a/bash/colors.sh +++ b/bash/colors.sh @@ -103,7 +103,7 @@ if [ $? -eq 0 ]; then \ echo `git status` | grep -v "Changes" | grep -E "to update your local branch" > /dev/null 2>&1 && echo "'$IBlue'"$(__git_ps1 " [v%sv]")"'$Color_Off'"; \ echo `git status` | grep -v "Changes" | grep -E -v "to publish|update your local branch" > /dev/null 2>&1 && echo "'$Green'"$(__git_ps1 " (%s)")"'$Color_Off'"; \ )" - $(echo "'$IBlack'"`git sha7`"'$Color_Off'"); \ -fi)$(if [[ $IN_NIX_SHELL == 1 ]]; then\ +fi)$(if [[ $IN_NIX_SHELL != "" ]]; then\ echo "\n'$IBlack'~>'$Color_Off' '$Purple'nix-shell'$Color_Off' ('$BIBlue'$name'$Color_Off')'$Color_Off'" ;\ fi)$(echo "\n'$BIPurple'\$'$Color_Off' ";)' |