From 1f1ab36f37a9ce3bb84ad1396bc6e3de58f9fc2b Mon Sep 17 00:00:00 2001 From: David DeSandro Date: Fri, 17 Jun 2011 10:18:48 -0400 Subject: [PATCH 1/5] Add rainbowbrite theme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Looks like: ± ~/path/to (branch ✓) $ in glorious red / blue / yellow color scheme --- themes/rainbowbrite/rainbowbrite.theme.bash | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 themes/rainbowbrite/rainbowbrite.theme.bash diff --git a/themes/rainbowbrite/rainbowbrite.theme.bash b/themes/rainbowbrite/rainbowbrite.theme.bash new file mode 100644 index 00000000..c9d6f7e8 --- /dev/null +++ b/themes/rainbowbrite/rainbowbrite.theme.bash @@ -0,0 +1,28 @@ +#!/bin/bash + +# based off of n0qorg +# looks like, if you're in a git repo: +# ± ~/path/to (branch ✓) $ +# in glorious red / blue / yellow color scheme + +prompt_setter() { + # Save history + history -a + history -c + history -r + # displays user@server in purple + # PS1="\[$red\]$(scm_char) \[$purple\]\u@\h\[$reset_color\]:\[$blue\]\w\[$yellow\]$(scm_prompt_info)$(rvm_version_prompt) \[$black\]$\[$reset_color\] " + # no user@server + PS1="\[$red\]$(scm_char) \[$blue\]\w\[$yellow\]$(scm_prompt_info)$(rvm_version_prompt) \[$black\]$\[$reset_color\] " + PS2='> ' + PS4='+ ' +} + +PROMPT_COMMAND=prompt_setter + +SCM_THEME_PROMPT_DIRTY=" ✗" +SCM_THEME_PROMPT_CLEAN=" ✓" +SCM_THEME_PROMPT_PREFIX=" (" +SCM_THEME_PROMPT_SUFFIX=")" +RVM_THEME_PROMPT_PREFIX=" (" +RVM_THEME_PROMPT_SUFFIX=")" From 3dc46203205f89195d29be5cf079f2e31669e77d Mon Sep 17 00:00:00 2001 From: David DeSandro Date: Fri, 17 Jun 2011 10:24:04 -0400 Subject: [PATCH 2/5] SCM_NONE_CHAR='.' -> dot if no repo --- themes/base.theme.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index 70876622..c80290dc 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -15,7 +15,7 @@ SCM_HG_CHAR='☿' SVN='svn' SCM_SVN_CHAR='⑆' -SCM_NONE_CHAR='○' +SCM_NONE_CHAR='·' RVM_THEME_PROMPT_PREFIX=' |' RVM_THEME_PROMPT_SUFFIX='|' From fcf358169ff91ca3f10f96161b187e1a7227b93c Mon Sep 17 00:00:00 2001 From: David DeSandro Date: Fri, 17 Jun 2011 10:34:20 -0400 Subject: [PATCH 3/5] rainbowbrite theme : color branch status indicator --- themes/rainbowbrite/rainbowbrite.theme.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/rainbowbrite/rainbowbrite.theme.bash b/themes/rainbowbrite/rainbowbrite.theme.bash index c9d6f7e8..581fca4a 100644 --- a/themes/rainbowbrite/rainbowbrite.theme.bash +++ b/themes/rainbowbrite/rainbowbrite.theme.bash @@ -20,9 +20,9 @@ prompt_setter() { PROMPT_COMMAND=prompt_setter -SCM_THEME_PROMPT_DIRTY=" ✗" -SCM_THEME_PROMPT_CLEAN=" ✓" +SCM_THEME_PROMPT_DIRTY=" ${red}✗" +SCM_THEME_PROMPT_CLEAN=" ${green}✓" SCM_THEME_PROMPT_PREFIX=" (" -SCM_THEME_PROMPT_SUFFIX=")" +SCM_THEME_PROMPT_SUFFIX="${yellow})" RVM_THEME_PROMPT_PREFIX=" (" RVM_THEME_PROMPT_SUFFIX=")" From 3ef689f29a777f8a076b4a7032ca46f4ba331106 Mon Sep 17 00:00:00 2001 From: David DeSandro Date: Fri, 17 Jun 2011 10:57:31 -0400 Subject: [PATCH 4/5] Add various aliases --- aliases/available/general.aliases.bash | 9 +++++++++ aliases/available/git.aliases.bash | 7 ++++++- aliases/available/jekyll.aliases.bash | 3 +++ aliases/available/osx.aliases.bash | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 79bd7aa0..2ed9d134 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -46,6 +46,15 @@ alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'" alias md='mkdir -p' alias rd=rmdir +# show / hide hidden files +alias showhidden="defaults write com.apple.finder AppleShowAllFiles TRUE; killall Finder" +alias hidehidden="defaults write com.apple.finder AppleShowAllFiles FALSE; killall Finder" +# display IP address +alias myip="echo ethernet:; ipconfig getifaddr en0; echo wireless:; ipconfig getifaddr en1" + +# http://snippets.dzone.com/posts/show/2486 +alias killsvn="find . -name ".svn" -type d -exec rm -rf {} \;" + function aliases-help() { echo "Generic Alias Usage" echo diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 45d7d05f..3a5d2a9f 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -39,7 +39,12 @@ case $OSTYPE in ;; esac - +# git add remote branch +function garb() { + echo "Adding remote branch '$1'"; + git config branch.$1.remote origin; + git config branch.$1.merge refs/heads/$1; +} function git-help() { echo "Git Custom Aliases Usage" diff --git a/aliases/available/jekyll.aliases.bash b/aliases/available/jekyll.aliases.bash index e52c0351..feaf245a 100644 --- a/aliases/available/jekyll.aliases.bash +++ b/aliases/available/jekyll.aliases.bash @@ -18,3 +18,6 @@ alias buildsite="builtin cd $JEKYLL_LOCAL_ROOT && rm -rf _site/ && jekyll" # Rsync the site to the remote server alias deploysite="builtin cd $JEKYLL_LOCAL_ROOT && rsync -rz _site/ $JEKYLL_REMOTE_ROOT" + +alias jkas="jekyll --auto --server" +alias rmjkas="rm -rf _site/* && jkas" \ No newline at end of file diff --git a/aliases/available/osx.aliases.bash b/aliases/available/osx.aliases.bash index e0746952..d25c0511 100644 --- a/aliases/available/osx.aliases.bash +++ b/aliases/available/osx.aliases.bash @@ -14,6 +14,7 @@ alias dashcode="open -a dashcode" alias f='open -a Finder ' alias textedit='open -a TextEdit' alias hex='open -a "Hex Fiend"' +alias gitx="open -a GitX" if [ -s /usr/bin/firefox ] ; then unalias firefox From d22a4cfa7058b224e37dbf07aa7cd3c583fdd188 Mon Sep 17 00:00:00 2001 From: David DeSandro Date: Fri, 17 Jun 2011 11:01:18 -0400 Subject: [PATCH 5/5] move garb into git plugins; rename newpost as jknewpost --- aliases/available/git.aliases.bash | 7 ------- plugins/available/git.plugins.bash | 8 +++++++- plugins/available/jekyll.plugins.bash | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 3a5d2a9f..7cfc9d93 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -39,13 +39,6 @@ case $OSTYPE in ;; esac -# git add remote branch -function garb() { - echo "Adding remote branch '$1'"; - git config branch.$1.remote origin; - git config branch.$1.merge refs/heads/$1; -} - function git-help() { echo "Git Custom Aliases Usage" echo diff --git a/plugins/available/git.plugins.bash b/plugins/available/git.plugins.bash index b0b9ce8c..3fbdac61 100644 --- a/plugins/available/git.plugins.bash +++ b/plugins/available/git.plugins.bash @@ -5,6 +5,13 @@ function git_remote { git remote add origin $GIT_HOSTING:$1.git } +# git add remote branch +function garb() { + echo "Adding remote branch '$1'"; + git config branch.$1.remote origin; + git config branch.$1.merge refs/heads/$1; +} + function git_first_push { echo "Running: git push origin master:refs/heads/master" git push origin master:refs/heads/master @@ -92,4 +99,3 @@ else echo "you're currently not in a git repository" fi } - diff --git a/plugins/available/jekyll.plugins.bash b/plugins/available/jekyll.plugins.bash index aebe69bc..3b96f451 100644 --- a/plugins/available/jekyll.plugins.bash +++ b/plugins/available/jekyll.plugins.bash @@ -26,7 +26,7 @@ editpost() { fi } -newpost() { +jknewpost() { # 'builtin cd' into the local jekyll root