Permalink
Browse files

Better prompt and gititnore

  • Loading branch information...
1 parent 87d4c9b commit e6d248fffd2c2af9cd2fa907fd857027d0149d83 @imanel committed Feb 7, 2014
Showing with 13 additions and 57 deletions.
  1. +2 −49 bash_prompt
  2. 0 brewfile
  3. +8 −8 gitconfig
  4. +3 −0 path
View
@@ -1,50 +1,3 @@
-# @gf3’s Sexy Bash Prompt, inspired by “Extravagant Zsh Prompt”
-# Shamelessly copied from https://github.com/gf3/dotfiles
-# Screenshot: http://i.imgur.com/s0Blh.png
-
-# PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]'
-
-if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
- export TERM=gnome-256color
-elif infocmp xterm-256color >/dev/null 2>&1; then
- export TERM=xterm-256color
-fi
-
-if tput setaf 1 &> /dev/null; then
- tput sgr0
- if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
- MAGENTA=$(tput setaf 9)
- ORANGE=$(tput setaf 172)
- GREEN=$(tput setaf 190)
- PURPLE=$(tput setaf 141)
- WHITE=$(tput setaf 0)
- else
- MAGENTA=$(tput setaf 5)
- ORANGE=$(tput setaf 4)
- GREEN=$(tput setaf 2)
- PURPLE=$(tput setaf 1)
- WHITE=$(tput setaf 7)
- fi
- BOLD=$(tput bold)
- RESET=$(tput sgr0)
-else
- MAGENTA="\033[1;31m"
- ORANGE="\033[1;33m"
- GREEN="\033[1;32m"
- PURPLE="\033[1;35m"
- WHITE="\033[1;37m"
- BOLD=""
- RESET="\033[m"
-fi
-
-export MAGENTA
-export ORANGE
-export GREEN
-export PURPLE
-export WHITE
-export BOLD
-export RESET
-
function parse_git_dirty() {
[[ $(git status 2> /dev/null | tail -n1) != *"working directory clean"* ]] && echo "*"
}
@@ -53,5 +6,5 @@ function parse_git_branch() {
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/"
}
-export PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
-export PS2="\[$ORANGE\]→ \[$RESET\]"
+export PS1="\[\033[1;32m\]\u \[\033[1;34m\]\w \$([[ -n \$(git branch 2> /dev/null) ]])\[\033[1;33m\]\$(parse_git_branch) \[\033[1;32m\]\$ \[\033[m\]"
+export PS2="\[\033[1;33m\]→ \[\033[m\]"
View
0 brewfile 100755 → 100644
No changes.
View
@@ -3,7 +3,7 @@
co = checkout
ci = commit
cm = commit -m
- st = status -s
+ st = status
di = diff
# View abbreviated SHA, description, and history graph of the latest 20 commits
lg = log --pretty=oneline -n 20 --graph --abbrev-commit
@@ -40,17 +40,17 @@
# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
ui = auto
[color "branch"]
- current = yellow reverse
+ current = green
local = yellow
remote = green
[color "diff"]
- meta = yellow bold
- frag = magenta bold
- old = red bold
- new = green bold
+ meta = yellow
+ frag = cyan
+ old = red
+ new = green
[color "status"]
- added = yellow
- changed = green
+ added = green
+ changed = yellow
untracked = cyan
[merge]
# Include summaries of merged commits in newly created merge commit messages
View
3 path
@@ -3,3 +3,6 @@ export PATH="$HOME/.bin:$PATH"
# Add RVM to PATH for scripting
export PATH="$HOME/.rvm/bin:$PATH"
+
+# Export brew files
+export PATH="/usr/local/bin:$PATH"

0 comments on commit e6d248f

Please sign in to comment.