dotfiles

commit b679f5e9a90260474577a35d46894edf9ff39f31
parent cc79796cfe2227d0da7b40f07ead988d18770877
Author: edvb54 <edvb54@gmail.com>
Date:   Mon,  2 Jun 2014 21:19:40 -0700

Change BASH Prompt

Diffstat:
bash_profile
 | 
63
++++++++++++++++++++++++++++++---------------------------------
vimrc
 | 
8
++++----

2 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/bash_profile b/bash_profile
@@ -1,37 +1,38 @@
-#!/usr/bin/env bash
 # prompt statement{{{1
-check="${Green}✓ "
-cross="${Red}✗ "
-cmd_check="\[\`if [[ \$? = "0" ]]; then echo '$check'; else echo '$cross'; fi\`"
-
-# file_number="\[\`/bin/ls -lah | /bin/grep -m 1 total | /bin/sed 's/total //'\`"
-# file_number="\[\`ls -1 | wc -l\`"
-
-if [[ "$@" = "cd" ]]; then
-    connector="┝";
-else
-    connector="┌";
-fi
+cmd_check() {
+    if [[ $? = 0 ]]; then
+        echo "${Green}:)";
+    else
+        echo "${Red}:(";
+    fi;
+}
 
-PS1="${Cyan}${connector}─${Cyan}\
-(${BIBlue}\u${Cyan})─\
-(${BIBlue}\h${Cyan})─\
-(${BIBlue}\j${Cyan})
-${Cyan}└─\
-${Cyan}(${cmd_check}${Cyan})\
-${Cyan}❯${Color_Off}❯ "
+PS1='\
+[${Blue}\u\
+ $(cmd_check) ${White}]\
+${White}$(__git_ps1 "[${Cyan}%s${White}]")${White}\
+\$${Color_Off} \
+'
+
+# PS1="\
+# ${Cyan}┌─${Cyan}\
+# (${BIBlue}\u${Cyan})─\
+# (${BIBlue}\h${Cyan})─\
+# (${BIBlue}\j${Cyan})
+# ${Cyan}└─\
+# ${Cyan}($(cmd_check)${Cyan})\
+# ${Cyan}❯${Color_Off}❯ \
+# "
 
 # PS1="${Blue}\u@\h${Color_Off}:${Cyan}\w${IBlue}❯${Color_Off}❯ "
-# PS1="${Blue}\$${Color_Off} "
-# PS1="${BGreen}\u@\h${Color_Off}:${BBlue}\w${Color_Off}\$ "
+# PS1='C:${PWD////\\\\}>'
 
-# (${BIBlue}$(file_number), $(file_size)${Cyan})-\
-PS2="    ${Cyan}❯${Color_Off} "
+PS2="\$"
 
 # basic{{{1
 export EDITOR='vim'
 
-fortune | cowsay
+# fortune | cowsay
 
 # alias stuff{{{1
 bind '"\t":menu-complete'
@@ -46,21 +47,17 @@ alias cp='cp -i'
 alias ln='ln -i'
 alias rm='rm -i'
 
-alias py='python3'
-alias py2='python2'
-
 alias vrc='vim ~/.vimrc'
 alias vrcb='vim ~/.vimrc.bundles'
 alias brc='vim ~/.bashrc'
 alias bp='vim ~/dotfiles/bash_profile'
 alias tconf='vim ~/dotfiles/tmux.conf'
 
-alias v='xmodmap ~/.vim_keyboard'
+alias py='python3'
+alias py2='python2'
+alias ta='tmux attach -t'
 
-cd() {
-    builtin cd "$@"
-    echo -e "${Cyan}┌${Color_Off}(${BBlack}"`pwd`"${Color_Off})"
-}
+alias v='xmodmap ~/.vim_keyboard'
 
 # function stuff{{{1
 function ipls
diff --git a/vimrc b/vimrc
@@ -15,8 +15,8 @@ set t_Co=256
 set background=dark
 " colorscheme badwolf
 " colorscheme hybrid
-" colorscheme jellybeans
-colorscheme molokai
+colorscheme jellybeans
+" colorscheme molokai
 " colorscheme skittles_berry
 " colorscheme solarized
 
@@ -221,10 +221,10 @@ au BufRead,BufNewFile *.ino set filetype=arduino
 " turn off the background for the end of line signs and make faster
 hi clear NonText
 
-hi SignColumn ctermbg=16
+" hi SignColumn ctermbg=16
 
 " better folding color
-hi Folded ctermfg=241 ctermbg=233
+" hi Folded ctermfg=241 ctermbg=233
 
 " mapping{{{1
 " make ZS save without closing