Merge remote branch 'origin/master' into restructure_plugins

12 files changed, 91 insertions, 0 deletions

diff --git a/plugins/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index a30540966..a30540966 100644
--- a/plugins/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
new file mode 100644
index 000000000..6a2b289a2
--- /dev/null
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
@@ -0,0 +1,39 @@
+#!/bin/zsh
+# 
+# Make the dirstack more persistant
+# 
+# Add dirpersist to $plugins in ~/.zshrc to load
+# 
+
+# $zdirstore is the file used to persist the stack
+zdirstore=~/.zdirstore
+
+dirpersistinstall () {
+    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
+    else
+        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
+            echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
+        else
+            echo "If you don't want this message to appear, remove dirspersist from \$plugins"
+        fi
+    fi
+}
+
+dirpersiststore () {
+    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
+}
+
+dirpersistrestore () {
+    if [ -f $zdirstore ]; then
+        source $zdirstore
+    fi
+}
+
+DIRSTACKSIZE=10
+setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
+
+dirpersistinstall
+dirpersistrestore
+
+# Make popd changes permanent without having to wait for logout
+alias popd="popd;dirpersiststore"
diff --git a/plugins/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 655eaf728..655eaf728 100644
--- a/plugins/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
diff --git a/plugins/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
index 4eb06a997..4eb06a997 100644
--- a/plugins/lighthouse.plugin.zsh
+++ b/plugins/lighthouse/lighthouse.plugin.zsh
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
new file mode 100644
index 000000000..9564829b0
--- /dev/null
+++ b/plugins/macports/macports.plugin.zsh
@@ -0,0 +1,7 @@
+#Aliases
+alias pc="sudo port clean --all installed"
+alias pi="sudo port install $1"
+alias psu="sudo port selfupdate"
+alias puni="sudo port uninstall inactive"
+alias puo="sudo port upgrade outdated"
+alias pup="psu && puo"
diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
index 63b881c9f..63b881c9f 100644
--- a/plugins/mysql-macports.plugin.zsh
+++ b/plugins/mysql/mysql-macports.plugin.zsh
diff --git a/plugins/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index fce88c796..fce88c796 100644
--- a/plugins/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
diff --git a/plugins/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 45bebb722..45bebb722 100644
--- a/plugins/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
diff --git a/plugins/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 82bf5d49d..82bf5d49d 100644
--- a/plugins/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
new file mode 100644
index 000000000..ce0d645c1
--- /dev/null
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -0,0 +1,23 @@
+# Based on code from Joseph M. Reagle
+# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+
+local SSH_ENV=$HOME/.ssh/environment
+
+function start_agent {
+  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
+  chmod 600 ${SSH_ENV}
+  . ${SSH_ENV} > /dev/null
+  /usr/bin/ssh-add;
+}
+
+# Source SSH settings, if applicable
+
+if [ -f "${SSH_ENV}" ]; then
+  . ${SSH_ENV} > /dev/null
+  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+    start_agent;
+  }
+else
+  start_agent;
+fi
+
diff --git a/plugins/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index 7b73e2751..7b73e2751 100644
--- a/plugins/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
new file mode 100644
index 000000000..c47ab7211
--- /dev/null
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -0,0 +1,22 @@
+function zle-line-init zle-keymap-select {
+  zle reset-prompt
+}
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+
+bindkey -v
+
+# if mode indicator wasn't setup by theme, define default
+if [[ "$MODE_INDICATOR" == "" ]]; then
+  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+fi
+
+function vi_mode_prompt_info() {
+  echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+}
+
+# define right prompt, if it wasn't defined by a theme
+if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
+  RPS1='$(vi_mode_prompt_info)'
+fi