Merge 07144859fe into 26e936e645

.gitignore

@@ -6,3 +6,4 @@ custom/example.zsh
 *.swp
 !custom/example.zshcache
 cache/
+plugins/zsh-syntax-highlighting/

lib/history.zsh

@@ -2,8 +2,10 @@
 if [ -z $HISTFILE ]; then
     HISTFILE=$HOME/.zsh_history
 fi
-HISTSIZE=10000
+HISTSIZE=200000
-SAVEHIST=10000
+SAVEHIST=2000000
+INC_APPEND_HISTORY=1
+HIST_IGNORE_DUPS=1
 
 setopt append_history
 setopt extended_history
@@ -12,4 +14,4 @@ setopt hist_ignore_dups # ignore duplication command history list
 setopt hist_ignore_space
 setopt hist_verify
 setopt inc_append_history
-setopt share_history # share command history data
+# setopt share_history # share command history data

plugins/history-substring-search/history-substring-search.zsh

@@ -132,8 +132,8 @@
 # configuration variables
 #-----------------------------------------------------------------------------
 
-HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=cyan,fg=black'
-HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=magenta,fg=black'
 HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
 
 #-----------------------------------------------------------------------------

themes/lust.zsh-theme

@@ -0,0 +1,129 @@
+# ------------------------------------------------------------------------------
+#          FILE:  lust.zsh-theme
+#   DESCRIPTION:  oh-my-zsh theme file.
+#        AUTHOR:  Steven Lu, based on kphoen.zsh-theme by Kévin Gomez (geek63@gmail.com)
+#       VERSION:  0.2
+# ------------------------------------------------------------------------------
+ 
+function myjobs() {
+    JOBS=`jobs -l`
+    if [[ -n $JOBS ]]; then 
+        print "$JOBS%{\n%}"
+    fi
+}
+ 
+if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
+    PROMPT='%{$fg[red]%}%n%{$reset_color%}@%{$fg[green]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%} %{$fg[yellow]%}%W %T%{$fg[magenta]%} %!%{$reset_color%}
+$(myjobs)%(!.%{$fg[red]%}#.%{$fg[cyan]%}❯)%{$reset_color%} '
+ 
+    ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
+    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ 
+    ZSH_THEME_GIT_PROMPT_SHA_BEFORE="%{$fg[blue]%}"
+    ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
+ 
+    ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[grey]%}[%{$fg[yellow]%}⚡%{$fg[grey]%}]%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[grey]%}[%{$fg[green]%}✓%{$fg[grey]%}]%{$reset_color%}"
+ 
+    ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[cyan]%}↑%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[red]%}↓%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_DIVERGED="%{$fg[magenta]%}↕%{$reset_color%}"
+ 
+    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}✎"
+    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[cyan]%}➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}♦"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[blue]%}✭"
+    ZSH_THEME_GIT_PROMPT_STASHED="%{$fg[cyan]%}$"
+ 
+    # Colors vary depending on time lapsed.
+    ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
+    ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
+    ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
+    ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$reset_color%}"
+
+    # Determine the time since last commit. If branch is clean,
+    # use a neutral color, otherwise colors will vary according to time.
+    function git_time_since_commit() {
+        if git rev-parse --git-dir > /dev/null 2>&1; then
+            # Only proceed if there is actually a commit.
+            if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
+                # Get the last commit.
+                last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+                now=`date +%s`
+                seconds_since_last_commit=$((now-last_commit))
+
+                # Totals
+                MINUTES=$((seconds_since_last_commit / 60))
+                HOURS=$((seconds_since_last_commit/3600))
+
+                # Sub-hours and sub-minutes
+                DAYS=$((seconds_since_last_commit / 86400))
+                SUB_HOURS=$((HOURS % 24))
+                SUB_MINUTES=$((MINUTES % 60))
+
+                if [[ -n $(git status -s 2> /dev/null) ]]; then
+                    if [ "$MINUTES" -gt 30 ]; then
+                        COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
+                    elif [ "$MINUTES" -gt 10 ]; then
+                        COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
+                    else
+                        COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
+                    fi
+                else
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+                fi
+
+                if [ "$HOURS" -gt 24 ]; then
+                    echo "$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}"
+                elif [ "$MINUTES" -gt 60 ]; then
+                    echo "$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}"
+                else
+                    echo "$COLOR${MINUTES}m%{$reset_color%}"
+                fi
+            else
+                COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+                echo "$COLOR~"
+            fi
+        fi
+    }
+    function my_git_prompt_status_and_time() {
+        #wrap git prompt status with stuff 
+        NOW_GIT_PROMPT_STATUS="$(git_prompt_status)"
+        NOW_GIT_TIME_SINCE="$(git_time_since_commit)"
+        if [[ -n $NOW_GIT_PROMPT_STATUS ]]; then 
+            echo "%{$fg[grey]%}[$NOW_GIT_PROMPT_STATUS%{$fg[grey]%}]$NOW_GIT_TIME_SINCE%{$reset_color%}"
+        else
+            if [[ -n $NOW_GIT_TIME_SINCE ]]; then
+                echo "%{$fg[grey]%}‖$NOW_GIT_TIME_SINCE%{$reset_color%}"
+            fi
+        fi
+    }
+
+    # display exitcode on the right when >0
+    return_code="%(?..%F{magenta}%? ↲ %f) "
+ 
+    RPROMPT='${return_code}$(git_prompt_info)$(git_prompt_short_sha)$(my_git_prompt_status_and_time)'
+
+else
+    PROMPT='[%n@%m:%~$(git_prompt_info)]
+%# '
+ 
+    ZSH_THEME_GIT_PROMPT_PREFIX=" on"
+    ZSH_THEME_GIT_PROMPT_SUFFIX=""
+    ZSH_THEME_GIT_PROMPT_DIRTY=""
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+ 
+    # display exitcode on the right when >0
+    return_code="%(?..%? ↵)"
+ 
+    RPROMPT='${return_code}$(git_prompt_status)'
+ 
+    ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
+    ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
+fi

tools/install.sh

@@ -4,8 +4,13 @@ then
   exit
 fi
 
+which zsh || {
+  echo "zsh not found!"
+  exit
+}
+
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
+hash git >/dev/null && /usr/bin/env git clone https://github.com/unphased/oh-my-zsh.git ~/.oh-my-zsh || {
   echo "git not installed"
   exit
 }
@@ -17,16 +22,22 @@ then
   mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
 fi
 
-echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
+echo "\033[0;34mUsing my zshrc, linking ~/.zshrc to it\033[0m"
-cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
+  rm ~/.zshrc
+fi
+ln -s "$HOME/.oh-my-zsh/zshrc" ~/.zshrc
 
-echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
+# cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
-echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
 
-echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
+# echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
+# echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
+
+echo "\033[0;34mChanging default shell to zsh\033[0m"
+sudo echo `which zsh` >> /etc/shells
 chsh -s `which zsh`
 
-echo "\033[0;32m"'         __                                     __   '"\033[0m"
+echo "\033[0;32m""         __    slu's fork                       __   ""\033[0m"
 echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
 echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
 echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"

zshrc

@@ -0,0 +1,87 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="lust"
+export LANG=en_US.UTF-8
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable bi-weekly auto-update checks
+DISABLE_AUTO_UPDATE="true"
+
+# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+COMPLETION_WAITING_DOTS="true" # yes yes yes
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git cp osx history zsh-syntax-highlighting)
+
+source $ZSH/oh-my-zsh.sh
+
+
+# Thankfully the path that is already present is the one that the system has set according to
+# normal practices. This inserts a few more things that I use from the shell.
+export PATH=~/bin:~/util:$PATH:/usr/local/share/npm/bin:~/.apportable/SDK/bin
+
+# this should be allowed I think. But the system should really be configured to
+# give that path to root user.
+[[ $(id -u) == 0 ]] && export PATH=/usr/local/bin:$PATH
+# export PAGER=vimpager
+
+# zmodload zsh/complist
+# bindkey -M menuselect ' ' accept-and-infer-next-history
+# bindkey -M menuselect '^?' undo
+
+
+stty -ixon
+stty -ixoff
+bindkey "^[[1;3C" forward-word
+bindkey "^[[1;3D" backward-word
+source $ZSH/plugins/history-substring-search/history-substring-search.plugin.zsh
+
+export HISTSIZE=20000
+export SAVEHIST=200000
+
+# This is an independent save of the history and terminal's cwd.
+# This avoids problems that crop up when I try to squish the cwd into the history entry.
+function zshaddhistory() {
+    COMMAND_STR=${1%%$'\n'}
+    [[ ( -z $COMMAND_STR ) || ( $COMMAND_STR =~ ^hist(ory)?$ ) || \
+        ( $COMMAND_STR =~ ^l(s\|l\|a)?$ ) || \
+        ( $COMMAND_STR =~ ^(d\|gd\|git\ diff\|glp\|gg)$ ) \
+    ]] && return 1
+    # do not do anything on common commands
+
+    # do the needful
+    print -r "$PWD; $COMMAND_STR; $TTY@$HOST@$(date +%s.%N)" >> ~/.zsh_enhanced_history
+
+    # rest is "default" zshaddhistory()
+    print -Sr ${COMMAND_STR}
+    fc -p
+}
+
+. ~/.aliases.sh
+
+# maintain this manually per-system
+source ~/.keychain-setup.sh
+
+echo "Finished loading my .zshrc"