Permalink
Browse files

๐Ÿ’„

  • Loading branch information...
1 parent 794db3f commit da3625876e4aec4b9286b76f885b54f84efc2f27 @jbarnette committed Jan 28, 2014
Showing with 56 additions and 80 deletions.
  1. BIN bash/.profile.swp
  2. +0 โˆ’2 bash/aliases.sh
  3. +37 โˆ’0 bash/functions.sh
  4. +0 โˆ’53 bash/git.sh
  5. +11 โˆ’14 bash/main.sh
  6. +8 โˆ’4 gitconfig
  7. +0 โˆ’7 install.sh
View
Binary file not shown.
View
@@ -1,2 +0,0 @@
-alias be="bundle exec"
-alias e=$EDITOR
View
@@ -0,0 +1,37 @@
+# show friendly current directory or nwo @ branch for repos
+function set-terminal-title {
+ local branch
+ local title=$(pwd)
+
+ title=${title#$SRCPATH/}
+ title=${title/${HOME}/\~}
+
+ if branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null); then
+ title="$title @ $branch"
+ fi
+
+ echo -ne "\033]2;$title\007"
+}
+
+# cd to a github repo
+function gd {
+ local parent=$(dirname "$1")
+ local name=$(basename "$1")
+ local owner=$(basename "$parent")
+ local nwo="$owner/$name"
+ local dir="$SRCPATH/$nwo"
+
+ [ -e "$dir" ] || git clone "https://github.com/$nwo" "$dir"
+
+ cd "$dir"
+}
+
+function gda {
+ gd $1
+ atom
+}
+
+function gdag {
+ gda $1
+ github
+}
View
@@ -1,53 +0,0 @@
-__git_ps1 ()
-{
- local git="$(which git)"
-
- local g="$($git rev-parse --git-dir 2>/dev/null)"
- if [ -n "$g" ]; then
- local r
- local b
- if [ -d "$g/../.dotest" ]
- then
- if test -f "$g/../.dotest/rebasing"
- then
- r="|REBASE"
- elif test -f "$g/../.dotest/applying"
- then
- r="|AM"
- else
- r="|AM/REBASE"
- fi
- b="$($git symbolic-ref HEAD 2>/dev/null)"
- elif [ -f "$g/.dotest-merge/interactive" ]
- then
- r="|REBASE-i"
- b="$(cat "$g/.dotest-merge/head-name")"
- elif [ -d "$g/.dotest-merge" ]
- then
- r="|REBASE-m"
- b="$(cat "$g/.dotest-merge/head-name")"
- elif [ -f "$g/MERGE_HEAD" ]
- then
- r="|MERGING"
- b="$($git symbolic-ref HEAD 2>/dev/null)"
- else
- if [ -f "$g/BISECT_LOG" ]
- then
- r="|BISECTING"
- fi
- if ! b="$($git symbolic-ref HEAD 2>/dev/null)"
- then
- if ! b="$($git describe --exact-match HEAD 2>/dev/null)"
- then
- b="$(cut -c1-7 "$g/HEAD")..."
- fi
- fi
- fi
-
- if [ -n "$1" ]; then
- printf "$1" "${b##refs/heads/}$r"
- else
- printf " (%s)" "${b##refs/heads/}$r"
- fi
- fi
-}
View
@@ -1,23 +1,20 @@
-export DOTFILES=~/my/dotfiles
-
-source "$DOTFILES/bash/aliases.sh"
-source "$DOTFILES/bash/git.sh"
-
-if [ -s "$DOTFILES/bash/private.sh" ]
- then source "$DOTFILES/bash/private.sh"
-fi
-
if [ -f "/opt/boxen/env.sh" ]
then source "/opt/boxen/env.sh"
fi
-if [ -d $HOME/src/github/app-env ]; then
- export PATH="$HOME/src/github/app-env/bin:$PATH"
- source "$HOME/src/github/app-env/share/app-ps1.sh"
+export DOTFILES=~/my/dotfiles
+
+source "$DOTFILES/bash/functions.sh"
+
+if [ -s "$DOTFILES/bash/private.sh" ]; then
+ source "$DOTFILES/bash/private.sh"
fi
export EDITOR="atom --wait"
+export GOPATH=$HOME/go
export NODE_NO_READLINE=1
-export PATH=$HOME/bin:$PATH
-export PS1='$(app-ps1 "%s ")$(__git_ps1 "[%s] ")\w\\$ '
+export PATH=$HOME/bin:$GOPATH/bin:$PATH
+export PROMPT_COMMAND="set-terminal-title"
+export PS1="โค "
+export SRCPATH=$HOME/src
export VISUAL=$EDITOR
View
@@ -7,15 +7,19 @@
[credential]
helper = /opt/boxen/bin/boxen-git-credential
+[filter "media"]
+ clean = git-media-clean %f
+ smudge = git-media-smudge %f
+
[github]
user = jbarnette
[hub]
protocol = https
[push]
- default = current
- helper = /opt/boxen/bin/boxen-git-credential
+ default = simple
+
[user]
- name = John Barnette
- email = jbarnette@github.com
+ name = John Barnette
+ email = jbarnette@github.com
View
@@ -1,7 +0,0 @@
-ln -s ~/my/dotfiles/bash/main.sh ~/.profile
-ln -s ~/.profile ~/.bash_profile
-ln -s ~/.profile ~/.bashrc
-ln -s ~/my/dotfiles/emacs.d ~/.emacs.d
-ln -s ~/my/dotfiles/gitconfig ~/.gitconfig
-
-. ~/.profile

0 comments on commit da36258

Please sign in to comment.