diff --git a/.bashrc b/.bashrc index a9a41cd..803bce9 100644 --- a/.bashrc +++ b/.bashrc @@ -91,6 +91,7 @@ fi alias ll='ls -alFh' alias la='ls -A' alias l='ls -CF' +alias lb='lsblk -o+FSAVAIL,FSUSED,FSUSE%,MODEL,PARTTYPENAME,STATE' # Add an "alert" alias for long running commands. Use like so: # sleep 10; alert @@ -118,16 +119,19 @@ fi EDITOR=/usr/bin/vim.basic PAGER="less" -LESS="-S" -export PG="psql -U ptrowbridge -d ubm -p 54329 -h hptrow.me" -export PGD="psql -U ptrowbridge -d ubm -p 54339 -h hptrow.me" +lESS="-S" +export PG="psql -U -d -p -h " export PSQL_PAGER="pspg" -# GOPATH=$HOME/go -# function _update_ps1() { -# PS1="$($GOPATH/bin/powerline-go -error $?)" -# } -# if [ "$TERM" != "linux" ] && [ -f "$GOPATH/bin/powerline-go" ]; then -# PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" -# fi +# Set config variables first +GIT_PROMPT_ONLY_IN_REPO=1 +GIT_PROMPT_FETCH_REMOTE_STATUS=0 + +# Load the gitprompt script +if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then +source "$HOME/.bash-git-prompt/gitprompt.sh" +fi + +#---------point to local--------------- +[ -f ~/.bashrc_local ] && source ~/.bashrc_local diff --git a/setup.sh b/setup.sh index 8d61664..0dd3d4d 100755 --- a/setup.sh +++ b/setup.sh @@ -171,3 +171,16 @@ then esac done fi + +while true; do + read -p "do you want to install git-bash-prompt?" yn + case $yn in + [Yy]* ) + git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt --depth=1 + break;; + [Nn]* ) + break;; + * ) echo "Please answer yes or no.";; + esac +done +