Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

streamlining

  • Loading branch information...
commit ba4efff5b82a56992fee72429e4369de38337217 1 parent e84e9d7
@chadoh authored
Showing with 68 additions and 65 deletions.
  1. +4 −4 .aliases
  2. +64 −61 .bash_prompt
View
8 .aliases
@@ -8,15 +8,15 @@ alias -- -="cd -"
alias g="git"
alias v="vim"
-# List all files colorized in long format
-alias ls='ls -pG'
-
-# List all files colorized in long format, including dot files
+# List all files colorized in long format, including hidden files
alias ll='ls -alFGh'
# List only directories
alias lsd='ls -l | grep "^d"'
+# Show directories with trailing slash when `ls`ing
+alias ls='ls -p'
+
# Always use color output for `ls`
if [[ "$OSTYPE" =~ ^darwin ]]; then
alias ls="command ls -G"
View
125 .bash_prompt
@@ -7,83 +7,86 @@ elif infocmp xterm-256color >/dev/null 2>&1; then
fi
# Reset
-Reset='\e[0m' # Text Reset
+Reset='\[\e[0m\]' # Text Reset
# Regular Colors
-Black='\e[0;30m' # Black
-Red='\e[0;31m' # Red
-Green='\e[0;32m' # Green
-Yellow='\e[0;33m' # Yellow
-Blue='\e[0;34m' # Blue
-Purple='\e[0;35m' # Purple
-Cyan='\e[0;36m' # Cyan
-White='\e[0;37m' # White
+Black='\[\e[0;30m\]' # Black
+Red='\[\e[0;31m\]' # Red
+Green='\[\e[0;32m\]' # Green
+Yellow='\[\e[0;33m\]' # Yellow
+Blue='\[\e[0;34m\]' # Blue
+Purple='\[\e[0;35m\]' # Purple
+Cyan='\[\e[0;36m\]' # Cyan
+White='\[\e[0;37m\]' # White
# Bold
-BBlack='\e[1;30m' # Black
-BRed='\e[1;31m' # Red
-BGreen='\e[1;32m' # Green
-BYellow='\e[1;33m' # Yellow
-BBlue='\e[1;34m' # Blue
-BPurple='\e[1;35m' # Purple
-BCyan='\e[1;36m' # Cyan
-BWhite='\e[1;37m' # White
+BBlack='\[\e[1;30m\]' # Black
+BRed='\[\e[1;31m\]' # Red
+BGreen='\[\e[1;32m\]' # Green
+BYellow='\[\e[1;33m\]' # Yellow
+BBlue='\[\e[1;34m\]' # Blue
+BPurple='\[\e[1;35m\]' # Purple
+BCyan='\[\e[1;36m\]' # Cyan
+BWhite='\[\e[1;37m\]' # White
# Underline
-UBlack='\e[4;30m' # Black
-URed='\e[4;31m' # Red
-UGreen='\e[4;32m' # Green
-UYellow='\e[4;33m' # Yellow
-UBlue='\e[4;34m' # Blue
-UPurple='\e[4;35m' # Purple
-UCyan='\e[4;36m' # Cyan
-UWhite='\e[4;37m' # White
+UBlack='\[\e[4;30m\]' # Black
+URed='\[\e[4;31m\]' # Red
+UGreen='\[\e[4;32m\]' # Green
+UYellow='\[\e[4;33m\]' # Yellow
+UBlue='\[\e[4;34m\]' # Blue
+UPurple='\[\e[4;35m\]' # Purple
+UCyan='\[\e[4;36m\]' # Cyan
+UWhite='\[\e[4;37m\]' # White
# Background
-On_Black='\e[40m' # Black
-On_Red='\e[41m' # Red
-On_Green='\e[42m' # Green
-On_Yellow='\e[43m' # Yellow
-On_Blue='\e[44m' # Blue
-On_Purple='\e[45m' # Purple
-On_Cyan='\e[46m' # Cyan
-On_White='\e[47m' # White
+On_Black='\[\e[40m\]' # Black
+On_Red='\[\e[41m\]' # Red
+On_Green='\[\e[42m\]' # Green
+On_Yellow='\[\e[43m\]' # Yellow
+On_Blue='\[\e[44m\]' # Blue
+On_Purple='\[\e[45m\]' # Purple
+On_Cyan='\[\e[46m\]' # Cyan
+On_White='\[\e[47m\]' # White
# High Intensty
-IBlack='\e[0;90m' # Black
-IRed='\e[0;91m' # Red
-IGreen='\e[0;92m' # Green
-IYellow='\e[0;93m' # Yellow
-IBlue='\e[0;94m' # Blue
-IPurple='\e[0;95m' # Purple
-ICyan='\e[0;96m' # Cyan
-IWhite='\e[0;97m' # White
+IBlack='\[\e[0;90m\]' # Black
+IRed='\[\e[0;91m\]' # Red
+IGreen='\[\e[0;92m\]' # Green
+IYellow='\[\e[0;93m\]' # Yellow
+IBlue='\[\e[0;94m\]' # Blue
+IPurple='\[\e[0;95m\]' # Purple
+ICyan='\[\e[0;96m\]' # Cyan
+IWhite='\[\e[0;97m\]' # White
# Bold High Intensty
-BIBlack='\e[1;90m' # Black
-BIRed='\e[1;91m' # Red
-BIGreen='\e[1;92m' # Green
-BIYellow='\e[1;93m' # Yellow
-BIBlue='\e[1;94m' # Blue
-BIPurple='\e[1;95m' # Purple
-BICyan='\e[1;96m' # Cyan
-BIWhite='\e[1;97m' # White
+BIBlack='\[\e[1;90m\]' # Black
+BIRed='\[\e[1;91m\]' # Red
+BIGreen='\[\e[1;92m\]' # Green
+BIYellow='\[\e[1;93m\]' # Yellow
+BIBlue='\[\e[1;94m\]' # Blue
+BIPurple='\[\e[1;95m\]' # Purple
+BICyan='\[\e[1;96m\]' # Cyan
+BIWhite='\[\e[1;97m\]' # White
# High Intensty backgrounds
-On_IBlack='\e[0;100m' # Black
-On_IRed='\e[0;101m' # Red
-On_IGreen='\e[0;102m' # Green
-On_IYellow='\e[0;103m' # Yellow
-On_IBlue='\e[0;104m' # Blue
-On_IPurple='\e[10;95m' # Purple
-On_ICyan='\e[0;106m' # Cyan
-On_IWhite='\e[0;107m' # White
+On_IBlack='\[\e[0;100m\]' # Black
+On_IRed='\[\e[0;101m\]' # Red
+On_IGreen='\[\e[0;102m\]' # Green
+On_IYellow='\[\e[0;103m\]' # Yellow
+On_IBlue='\[\e[0;104m\]' # Blue
+On_IPurple='\[\e[10;95m\]' # Purple
+On_ICyan='\[\e[0;106m\]' # Cyan
+On_IWhite='\[\e[0;107m\]' # White
if [ -f `brew --prefix`/etc/bash_completion ]; then
. `brew --prefix`/etc/bash_completion
else
+ function parse_git_dirty() {
+ [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo " * ⮁ "
+ }
function __git_ps1() {
- git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1/"
+ git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/"
}
fi
@@ -91,8 +94,8 @@ export GIT_PS1_SHOWDIRTYSTATE=1
export GIT_PS1_SHOWSTASHSTATE=1
export GIT_PS1_SHOWUNTRACKEDFILES=1
# This is used locally. Cool blue.
-PS1="\[${BIBlue}\]\[${On_Black}\] \W \[${Black}\]⮀\[${Purple}\] \$(__git_ps1 %s' ⮁ ')\[${Reset}\]"
+PS1="${BIBlue}${On_Black} \W ${Black}${Purple} \$(__git_ps1 %s' ⮁ ')${Reset}"
# This is for production servers
-#PS1="\[${BIYellow}\]\[${On_Red}\] \W \[${Red}\]⮀\[${Reset}\] "
+#PS1="${BIYellow}${On_Red} \W ${Red}${Reset} "
# And this is for non-production servers
-#PS1="\[${On_IWhite}\] \W \[${IWhite}\]⮀\[${Reset}\] "
+#PS1="${On_IWhite} \W ${IWhite}${Reset} "
Please sign in to comment.
Something went wrong with that request. Please try again.