Merge branch 'master' of git.nixy.moe:nixy/dotfiles
This commit is contained in:
commit
5426e96bed
@ -31,7 +31,7 @@ export ORIG_PS1=${PS1}
|
|||||||
|
|
||||||
if which direnv &> /dev/null; then
|
if which direnv &> /dev/null; then
|
||||||
update_prompt() {
|
update_prompt() {
|
||||||
if direnv status | grep -iq 'RC allowed true'; then
|
if direnv status | grep -iEq 'RC allowed (true|0)'; then
|
||||||
PS1=${DIRENV_PS1}
|
PS1=${DIRENV_PS1}
|
||||||
else
|
else
|
||||||
PS1=${ORIG_PS1}
|
PS1=${ORIG_PS1}
|
||||||
|
|||||||
@ -6,7 +6,6 @@ set -ex
|
|||||||
echo "PWD: $PWD"
|
echo "PWD: $PWD"
|
||||||
# Coder dotfiles (and most other ways of doing this) will not do a recursive clone, so do that in install script.
|
# Coder dotfiles (and most other ways of doing this) will not do a recursive clone, so do that in install script.
|
||||||
git submodule init && git submodule update
|
git submodule init && git submodule update
|
||||||
|
|
||||||
# Match case insensitively to make things easier for this part
|
# Match case insensitively to make things easier for this part
|
||||||
shopt -s nocasematch
|
shopt -s nocasematch
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user