Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Documented, described, functions. Tuned path order. Deprecated unused…

… tools.
  • Loading branch information...
commit cf0486067ff643087ec6914d586904e5aaf44d96 1 parent 3fb3760
@matthewmccullough authored
View
10 bash_gitprompt
@@ -1,6 +1,8 @@
-##############################
-# Git Commands
-#############################
+#!/bin/bash
+
+########################################################################
+# Matthew's Git Bash Prompt
+########################################################################
RED="\[\033[0;31m\]"
YELLOW="\[\033[0;33m\]"
GREEN="\[\033[0;32m\]"
@@ -58,4 +60,4 @@ function prompt_func() {
fi
}
-PROMPT_COMMAND=prompt_func
+PROMPT_COMMAND=prompt_func
View
26 bash_profile
@@ -1,19 +1,27 @@
-#Import the Z or Bash shell agnostic environment config
+#!/bin/bash
+
+########################################################################
+# Bash Interactive Shell Setup
+########################################################################
+
+# Import the Z or Bash shell agnostic environment config
source ~/.profile
-#When running two bash windows, allow both to write to the history, not one stomping the other
+# When running two bash windows, allow both to write to the history, not one stomping the other
shopt -s histappend
+
#PROMPT_COMMAND='history -a'
-#Remove duplicates from history
-export HISTCONTROL="ignoredups"
-export HISTIGNORE="&:ls:[bf]g:exit"
+# Remove duplicates from bash history
+# export HISTCONTROL="ignoredups"
+# export HISTIGNORE="&:ls:[bf]g:exit"
-#Keep multiline commands as one command in history
+# Keep multiline commands as one command in history
shopt -s cmdhist
-
+# Load Matthew's Git bash prompt
source ~/.dotfiles/bash_gitprompt
-#source ~/scripts/git-completion.sh
-source /usr/local/Cellar/git/1.7.11.3/etc/bash_completion.d/git-completion.bash
+
+# Load Brew's git bash completion
+source /usr/local/Cellar/git/1.8.0.1/etc/bash_completion.d/git-completion.bash
View
11 bashrc
@@ -1,5 +1,8 @@
-source ~/.bash_profile
+#!/bin/bash
+
+########################################################################
+# Bash non-interactive session setup
+########################################################################
-#For Autojump
-# No longer using Autojump, but z-zsh instead
-# source /etc/profile.d/autojump.bash
+# Bash non-interactive shell will load the same functions as the interactive shell
+source ~/.bash_profile
View
4 gitconfig
@@ -169,7 +169,9 @@
tagcontains = git tag -l --contains HEAD
cc-cache = "config --global credential.helper 'cache --timeout=300'"
cc-off = "config --unset --global credential.helper"
- cc-helper = "config --global credential.helper 'osxkeychain'"
+ cc-helperosx = "config --global credential.helper 'osxkeychain'"
+ cc-helperwin = "config --global credential.helper 'wincred'"
+ cc-helperlin = "config --global credential.helper '/pathto/git-credential-gnome-key'"
logm = log --stat -M
logcpy = log --stat -1 -C -C
pushsvn = svn dcommit
2  oh-my-zsh
@@ -1 +1 @@
-Subproject commit c2ae9e09ca1f33ff1e13e629a0b2e6bdd19f83a9
+Subproject commit 397c085a19a22f6be515665835d09a2505cb3f23
View
21 profile
@@ -2,19 +2,24 @@
# Generic configuration that applies to all shells
#############################################################
-#RVM Ruby Selector
-# [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # This loads RVM into a shell session.
-
-#Set textmate as our default command line editor (vi is the default otherwise)
+###################
+# Set textmate as our default command line editor
export EDITOR='mate -w'
-# RVM suggests using gcc instead of llvm (which Apple now symlinks gcc to)
-# export CC=gcc-4.2
-
+###################
+# Load paths and environment variables
source ~/.shellvars
source ~/.shellpaths
source ~/.shellaliases
source ~/.shellactivities
-eval "$(rbenv init -)"
+###################
+# RVM Ruby Selector
+# [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # This loads RVM into a shell session.
+# RVM suggests using gcc instead of llvm (which Apple now symlinks gcc to)
+# export CC=gcc-4.2
+
+###################
+# Load rbenv, an alternative to rvm for Ruby selection on a per-project basis
+eval "$(rbenv init -)"
2  scripts
@@ -1 +1 @@
-Subproject commit 7d696add1adb46fe22e89fb16fba1cc49599bc70
+Subproject commit e2c4bac37826e294a87939bf6ffd921db850a801
View
17 shellaliases
@@ -170,16 +170,17 @@ function find.name() {
sh -c "find . -iname $wild"
}
-function history.150() {
- tail -150 ~/.zsh_history | cut -c 16- | subl&
-}
-
-function history.400() {
- tail -400 ~/.zsh_history | cut -c 16- | subl&
-}
-
alias lessc='less -R' # Lets color escape sequences carry through to less
alias morec='more -R'
alias lesscolor='less -R'
alias morecolor='more -R'
+function screenshot.setjpg() {
+ defaults write com.apple.screencapture type jpg
+ killall SystemUIServer
+}
+
+function screenshot.setpng() {
+ defaults write com.apple.screencapture type png
+ killall SystemUIServer
+}
View
22 shellpaths
@@ -1,3 +1,7 @@
+########################################################################
+# Shell agnostic path setup
+########################################################################
+
# Matthew's Scripts
export PATH=$PATH:.
export PATH=$PATH:~/bin
@@ -5,7 +9,7 @@ export PATH=$PATH:~/.dotfiles/scripts
# Brew
export PATH=/usr/local/sbin:$PATH
-export PATH=/usr/local/bin:$PATH
+#export PATH=/usr/local/bin:$PATH
# MacPorts
## Having MacPorts first instead of after $PATH causes a GitK error
@@ -16,8 +20,8 @@ export MANPATH=$MANPATH:/opt/local/share/man
# Dev frameworks
#export PATH=$PATH:$ANT_HOME/bin
-export PATH=$PATH:$M2_HOME/bin
-export PATH=$PATH:$GROOVY_HOME/bin
+#export PATH=$PATH:$M2_HOME/bin
+#export PATH=$PATH:$GROOVY_HOME/bin
#export PATH=$PATH:$GRAILS_HOME/bin
#export PATH=$PATH:$NEXUS_HOME/bin/jsw/macosx-universal-64
#export PATH=$PATH:$JMETER_HOME/bin
@@ -26,13 +30,13 @@ export PATH=$PATH:$GROOVY_HOME/bin
#export PATH=$PATH:$APPENGINE_HOME/bin
# Dev
-export PATH=$PATH:/Applications/Dev/apache-tomcat/bin
-export PATH=$PATH:/Applications/Dev/apache-maven/bin
-export PATH=$PATH:/Applications/Dev/sonar/bin/macosx-universal-64
+#export PATH=$PATH:/Applications/Dev/apache-tomcat/bin
+#export PATH=$PATH:/Applications/Dev/apache-maven/bin
+#export PATH=$PATH:/Applications/Dev/sonar/bin/macosx-universal-64
#export PATH=$PATH:/Library/PostgreSQL/8.4/bin
-export PATH=$PATH:/Applications/Dev/gradle/bin
-export PATH=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands:$PATH
-export PATH=~/.gem/ruby/1.8/bin:$PATH #For showoff
+#export PATH=$PATH:/Applications/Dev/gradle/bin
+#export PATH=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands:$PATH
+#export PATH=~/.gem/ruby/1.8/bin:$PATH #For showoff
#export PATH=$PATH:~/.cljr/bin
export PATH=~/.rbenv/bin:$PATH
View
4 vimrc
@@ -1,3 +1,7 @@
+" ########################################################################
+" # VI text editor setup
+" ########################################################################
+
" set our tabs to four spaces
set ts=4
View
4 zlogout
@@ -1,3 +1,5 @@
-# Store dirs stack
+##################################################################
+# Store recent directory stack
# See ~/.dotfiles/oh-my-zsh/plugins/dirspersist.plugin.zsh
+#################################################################
dirpersiststore
View
11 zprofile
@@ -1,10 +1,12 @@
+#!/bin/zsh
+
##############################################################################
-#Import the shell-agnostic (Bash or Zsh) environment config
+# Import the shell-agnostic (Bash or Zsh) environment config
##############################################################################
source ~/.profile
##############################################################################
-# History Configuration
+# ZShell History Configuration
##############################################################################
HISTSIZE=5000 #How many lines of history to keep in memory
HISTFILE=~/.zsh_history #Where to save history to disk
@@ -15,7 +17,8 @@ setopt sharehistory #Share history across terminals
setopt incappendhistory #Immediately append to the history file, not just when a term is killed
##############################################################################
-# sjl/z-zsh setup
+# sjl/z-zsh setup (Path frecency like autojump)
+# Deprecated in favor of the better rupa/z
##############################################################################
#. ~/.dotfiles/z-zsh/z.sh
#function precmd () {
@@ -23,6 +26,6 @@ setopt incappendhistory #Immediately append to the history file, not just wh
#}
##############################################################################
-# rupa/z setup
+# rupa/z setup (path frecency with tab completion)
##############################################################################
. ~/.dotfiles/z-rupa/z.sh
View
12 zshrc
@@ -1,3 +1,9 @@
+#!/bin/zsh
+
+# ---------------------------------------------------------------------
+# oh-my-zsh setup
+# ---------------------------------------------------------------------
+
# Path to your oh-my-zsh configuration.
export ZSH=$HOME/.dotfiles/oh-my-zsh
@@ -5,6 +11,7 @@ export ZSH=$HOME/.dotfiles/oh-my-zsh
# Look in $ZSH/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
+
#export ZSH_THEME="gozilla"
export ZSH_THEME="fino"
#export ZSH_THEME="takashiyoshida"
@@ -23,9 +30,6 @@ export CASE_SENSITIVE="true"
# export DISABLE_AUTO_TITLE="true"
# Which plugins would you like to load? (plugins can be found in ~/.dotfiles/oh-my-zsh/plugins/*)
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git brew macports osx rvm gradle ant compleat dirpersist gem ssh-agent cloudapp)
+plugins=(git battery brew osx gradle ant compleat dirpersist gem ssh-agent cloudapp ruby textmate sublime)
source $ZSH/oh-my-zsh.sh
-
-# Customize to your needs...
Please sign in to comment.
Something went wrong with that request. Please try again.