From 559189e045852c307abae9ee222d32c793f1d291 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 2 Jun 2011 18:36:46 +0200 Subject: [PATCH] remove my zsh, so we can integrate my version of oh-my-zsh --- zsh/custom/example.zsh | 5 -- zsh/init.zsh | 23 ------ zsh/lib/aliases.zsh | 23 ------ zsh/lib/appearance.zsh | 38 ---------- zsh/lib/completion.zsh | 42 ---------- zsh/lib/correction.zsh | 10 --- zsh/lib/directories.zsh | 40 ---------- zsh/lib/editor.zsh | 2 - zsh/lib/functions.zsh | 39 ---------- zsh/lib/git.zsh | 40 ---------- zsh/lib/grep.zsh | 6 -- zsh/lib/history.zsh | 16 ---- zsh/lib/key-bindings.zsh | 42 ---------- zsh/lib/misc.zsh | 13 ---- zsh/lib/path.zsh | 2 - zsh/lib/paths.zsh | 1 - zsh/lib/spectrum.zsh | 20 ----- zsh/lib/termsupport.zsh | 21 ----- zsh/log/.easter-egg | 4 - zsh/plugins/cap/cap.plugin.zsh | 21 ----- zsh/plugins/dirpersist/dirpersist.plugin.zsh | 39 ---------- zsh/plugins/gem/_gem | 64 ---------------- zsh/plugins/gem/gem.plugin.zsh | 4 - zsh/plugins/git/git.plugin.zsh | 32 -------- zsh/plugins/github/_github | 40 ---------- zsh/plugins/github/github.plugin.zsh | 4 - zsh/plugins/lighthouse/lighthouse.plugin.zsh | 16 ---- zsh/plugins/mysql/mysql-macports.plugin.zsh | 6 -- zsh/plugins/pip/_pip | 46 ----------- zsh/plugins/pip/pip.plugin.zsh | 4 - zsh/plugins/rails/rails.plugin.zsh | 13 ---- zsh/plugins/ruby/ruby.plugin.zsh | 4 - zsh/plugins/ssh-agent/ssh-agent.plugin.zsh | 23 ------ zsh/plugins/textmate/textmate.plugin.zsh | 14 ---- zsh/plugins/vi-mode/vi-mode.plugin.zsh | 22 ------ zsh/themes/Soliah.zsh-theme | 6 -- zsh/themes/afowler.zsh-theme | 10 --- zsh/themes/arrow.zsh-theme | 14 ---- zsh/themes/aussiegeek.zsh-theme | 8 -- zsh/themes/candy.zsh-theme | 7 -- zsh/themes/clean.zsh-theme | 14 ---- zsh/themes/cloud.zsh-theme | 6 -- zsh/themes/cypher.zsh-theme | 4 - zsh/themes/dallas.zsh-theme | 26 ------- zsh/themes/darkblood.zsh-theme | 9 --- zsh/themes/daveverwer.zsh-theme | 7 -- zsh/themes/dst.zsh-theme | 16 ---- zsh/themes/dstufft.zsh-theme | 19 ----- zsh/themes/duellj.zsh-theme | 8 -- zsh/themes/eastwood.zsh-theme | 19 ----- zsh/themes/edvardm.zsh-theme | 6 -- zsh/themes/evan.zsh-theme | 2 - zsh/themes/example.zsh-theme | 5 -- zsh/themes/fletcherm.zsh-theme | 12 --- zsh/themes/funky.zsh-theme | 14 ---- zsh/themes/gallifrey.zsh-theme | 8 -- zsh/themes/garyblessington.zsh-theme | 6 -- zsh/themes/geoffgarside.zsh-theme | 5 -- zsh/themes/gozilla.zsh-theme | 15 ---- zsh/themes/imajes.zsh-theme | 5 -- zsh/themes/jbergantine.zsh-theme | 6 -- zsh/themes/jnrowe.zsh-theme | 31 -------- zsh/themes/josh.zsh-theme | 43 ----------- zsh/themes/jreese.zsh-theme | 16 ---- zsh/themes/kennethreitz.zsh-theme | 13 ---- zsh/themes/linuxonly | 80 -------------------- zsh/themes/lukerandall.zsh-theme | 10 --- zsh/themes/macovsky-modified-mine.zsh-theme | 11 --- zsh/themes/macovsky-ruby.zsh-theme | 8 -- zsh/themes/macovsky.zsh-theme | 8 -- zsh/themes/maran.zsh-theme | 6 -- zsh/themes/mgutz.zsh-theme | 6 -- zsh/themes/mikeh.zsh-theme | 23 ------ zsh/themes/mine.zsh-theme | 10 --- zsh/themes/mrtazz.zsh-theme | 7 -- zsh/themes/philips.zsh-theme | 14 ---- zsh/themes/pmcgee.zsh-theme | 16 ---- zsh/themes/rgm.zsh-theme | 8 -- zsh/themes/risto.zsh-theme | 6 -- zsh/themes/robbyrussell.zsh-theme | 6 -- zsh/themes/skaro.zsh-theme | 7 -- zsh/themes/sporty_256.zsh-theme | 13 ---- zsh/themes/takashiyoshida.zsh-theme | 27 ------- zsh/themes/theunraveler.zsh-theme | 6 -- zsh/themes/thomasjbradley.zsh-theme | 29 ------- zsh/themes/tonotdo.zsh-theme | 12 --- zsh/themes/wezm+.zsh-theme | 7 -- zsh/themes/wezm.zsh-theme | 7 -- zsh/themes/xiong-chiamiov-plus.zsh-theme | 6 -- zsh/themes/xiong-chiamiov.zsh-theme | 6 -- zsh/zsh.sh | 15 ---- 91 files changed, 1453 deletions(-) delete mode 100644 zsh/custom/example.zsh delete mode 100644 zsh/init.zsh delete mode 100644 zsh/lib/aliases.zsh delete mode 100644 zsh/lib/appearance.zsh delete mode 100644 zsh/lib/completion.zsh delete mode 100644 zsh/lib/correction.zsh delete mode 100644 zsh/lib/directories.zsh delete mode 100644 zsh/lib/editor.zsh delete mode 100644 zsh/lib/functions.zsh delete mode 100644 zsh/lib/git.zsh delete mode 100644 zsh/lib/grep.zsh delete mode 100644 zsh/lib/history.zsh delete mode 100644 zsh/lib/key-bindings.zsh delete mode 100644 zsh/lib/misc.zsh delete mode 100644 zsh/lib/path.zsh delete mode 100644 zsh/lib/paths.zsh delete mode 100644 zsh/lib/spectrum.zsh delete mode 100644 zsh/lib/termsupport.zsh delete mode 100644 zsh/log/.easter-egg delete mode 100644 zsh/plugins/cap/cap.plugin.zsh delete mode 100644 zsh/plugins/dirpersist/dirpersist.plugin.zsh delete mode 100644 zsh/plugins/gem/_gem delete mode 100644 zsh/plugins/gem/gem.plugin.zsh delete mode 100644 zsh/plugins/git/git.plugin.zsh delete mode 100644 zsh/plugins/github/_github delete mode 100644 zsh/plugins/github/github.plugin.zsh delete mode 100644 zsh/plugins/lighthouse/lighthouse.plugin.zsh delete mode 100644 zsh/plugins/mysql/mysql-macports.plugin.zsh delete mode 100644 zsh/plugins/pip/_pip delete mode 100644 zsh/plugins/pip/pip.plugin.zsh delete mode 100644 zsh/plugins/rails/rails.plugin.zsh delete mode 100644 zsh/plugins/ruby/ruby.plugin.zsh delete mode 100644 zsh/plugins/ssh-agent/ssh-agent.plugin.zsh delete mode 100644 zsh/plugins/textmate/textmate.plugin.zsh delete mode 100644 zsh/plugins/vi-mode/vi-mode.plugin.zsh delete mode 100644 zsh/themes/Soliah.zsh-theme delete mode 100644 zsh/themes/afowler.zsh-theme delete mode 100644 zsh/themes/arrow.zsh-theme delete mode 100644 zsh/themes/aussiegeek.zsh-theme delete mode 100644 zsh/themes/candy.zsh-theme delete mode 100644 zsh/themes/clean.zsh-theme delete mode 100644 zsh/themes/cloud.zsh-theme delete mode 100644 zsh/themes/cypher.zsh-theme delete mode 100644 zsh/themes/dallas.zsh-theme delete mode 100644 zsh/themes/darkblood.zsh-theme delete mode 100644 zsh/themes/daveverwer.zsh-theme delete mode 100644 zsh/themes/dst.zsh-theme delete mode 100644 zsh/themes/dstufft.zsh-theme delete mode 100644 zsh/themes/duellj.zsh-theme delete mode 100644 zsh/themes/eastwood.zsh-theme delete mode 100644 zsh/themes/edvardm.zsh-theme delete mode 100644 zsh/themes/evan.zsh-theme delete mode 100644 zsh/themes/example.zsh-theme delete mode 100644 zsh/themes/fletcherm.zsh-theme delete mode 100644 zsh/themes/funky.zsh-theme delete mode 100644 zsh/themes/gallifrey.zsh-theme delete mode 100644 zsh/themes/garyblessington.zsh-theme delete mode 100644 zsh/themes/geoffgarside.zsh-theme delete mode 100644 zsh/themes/gozilla.zsh-theme delete mode 100644 zsh/themes/imajes.zsh-theme delete mode 100644 zsh/themes/jbergantine.zsh-theme delete mode 100644 zsh/themes/jnrowe.zsh-theme delete mode 100644 zsh/themes/josh.zsh-theme delete mode 100644 zsh/themes/jreese.zsh-theme delete mode 100644 zsh/themes/kennethreitz.zsh-theme delete mode 100644 zsh/themes/linuxonly delete mode 100644 zsh/themes/lukerandall.zsh-theme delete mode 100644 zsh/themes/macovsky-modified-mine.zsh-theme delete mode 100644 zsh/themes/macovsky-ruby.zsh-theme delete mode 100644 zsh/themes/macovsky.zsh-theme delete mode 100644 zsh/themes/maran.zsh-theme delete mode 100644 zsh/themes/mgutz.zsh-theme delete mode 100644 zsh/themes/mikeh.zsh-theme delete mode 100644 zsh/themes/mine.zsh-theme delete mode 100644 zsh/themes/mrtazz.zsh-theme delete mode 100644 zsh/themes/philips.zsh-theme delete mode 100644 zsh/themes/pmcgee.zsh-theme delete mode 100644 zsh/themes/rgm.zsh-theme delete mode 100644 zsh/themes/risto.zsh-theme delete mode 100644 zsh/themes/robbyrussell.zsh-theme delete mode 100644 zsh/themes/skaro.zsh-theme delete mode 100644 zsh/themes/sporty_256.zsh-theme delete mode 100644 zsh/themes/takashiyoshida.zsh-theme delete mode 100644 zsh/themes/theunraveler.zsh-theme delete mode 100644 zsh/themes/thomasjbradley.zsh-theme delete mode 100644 zsh/themes/tonotdo.zsh-theme delete mode 100644 zsh/themes/wezm+.zsh-theme delete mode 100644 zsh/themes/wezm.zsh-theme delete mode 100644 zsh/themes/xiong-chiamiov-plus.zsh-theme delete mode 100644 zsh/themes/xiong-chiamiov.zsh-theme delete mode 100644 zsh/zsh.sh diff --git a/zsh/custom/example.zsh b/zsh/custom/example.zsh deleted file mode 100644 index 28ffcae..0000000 --- a/zsh/custom/example.zsh +++ /dev/null @@ -1,5 +0,0 @@ -# Add yourself some shortcuts to projects you often work on -# Example: -# -# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr -# \ No newline at end of file diff --git a/zsh/init.zsh b/zsh/init.zsh deleted file mode 100644 index 1824160..0000000 --- a/zsh/init.zsh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/zsh - -# Path to your oh-my-zsh configuration. -export ZSH=$HOME/.dotfiles/zsh - -# Set to the name theme to load. -# Look in ~/.oh-my-zsh/themes/ -export ZSH_THEME="afowler" - -# Set to this to use case-sensitive completion -export CASE_SENSITIVE="true" - -# Uncomment following line if you want to disable colors in ls -# export DISABLE_LS_COLORS="true" - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git) - -source $ZSH/zsh.sh - -# Customize to your needs... - diff --git a/zsh/lib/aliases.zsh b/zsh/lib/aliases.zsh deleted file mode 100644 index d2d3aed..0000000 --- a/zsh/lib/aliases.zsh +++ /dev/null @@ -1,23 +0,0 @@ -# Push and pop directories on directory stack -alias pu='pushd' -alias po='popd' - -# Basic directory operations -alias ...='cd ../..' -alias -- -='cd -' - -# Super user -alias _='sudo' - -#alias g='grep -in' - -# Show history -alias history='fc -l 1' - -# List direcory contents -alias lsa='ls -lah' -alias l='ls -la' -alias ll='ls -l' -alias sl=ls # often screw this up - -alias afind='ack-grep -il' diff --git a/zsh/lib/appearance.zsh b/zsh/lib/appearance.zsh deleted file mode 100644 index ffee52b..0000000 --- a/zsh/lib/appearance.zsh +++ /dev/null @@ -1,38 +0,0 @@ -# ls colors -autoload colors; colors; -export LSCOLORS="Gxfxcxdxbxegedabagacad" -#export LS_COLORS - -# Enable ls colors -if [ "$DISABLE_LS_COLORS" != "true" ] -then - # Find the option for using colors in ls, depending on the version: Linux or BSD - ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G' -fi - -#setopt no_beep -setopt auto_cd -setopt multios -setopt cdablevarS - -if [[ x$WINDOW != x ]] -then - SCREEN_NO="%B$WINDOW%b " -else - SCREEN_NO="" -fi - -# Apply theming defaults -PS1="%n@%m:%~%# " - -# git theming default: Variables for theming the git info prompt -ZSH_THEME_GIT_PROMPT_PREFIX="git:(" # Prefix at the very beginning of the prompt, before the branch name -ZSH_THEME_GIT_PROMPT_SUFFIX=")" # At the very end of the prompt -ZSH_THEME_GIT_PROMPT_DIRTY="*" # Text to display if the branch is dirty -ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is clean - -# Setup the prompt with pretty colors -setopt prompt_subst - -# Load the theme -source "$ZSH/themes/$ZSH_THEME.zsh-theme" \ No newline at end of file diff --git a/zsh/lib/completion.zsh b/zsh/lib/completion.zsh deleted file mode 100644 index 52cc5b5..0000000 --- a/zsh/lib/completion.zsh +++ /dev/null @@ -1,42 +0,0 @@ -# fixme - the load process here seems a bit bizarre - -unsetopt menu_complete # do not autoselect the first completion entry -unsetopt flowcontrol -setopt auto_menu # show completion menu on succesive tab press -setopt complete_in_word -setopt always_to_end - -WORDCHARS='' - -autoload -U compinit -compinit -i - -zmodload -i zsh/complist - -## case-insensitive (all),partial-word and then substring completion -if [ "x$CASE_SENSITIVE" = "xtrue" ]; then - zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' - unset CASE_SENSITIVE -else - zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' -fi - -zstyle ':completion:*' list-colors '' - -# should this be in keybindings? -bindkey -M menuselect '^o' accept-and-infer-next-history - -zstyle ':completion:*:*:*:*:*' menu select -zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01' -zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w" - -# disable named-directories autocompletion -zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories -cdpath=(.) - - -# Load known hosts file for auto-completion with ssh and scp commands -if [ -f ~/.ssh/known_hosts ]; then - zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts ) - zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts` -fi diff --git a/zsh/lib/correction.zsh b/zsh/lib/correction.zsh deleted file mode 100644 index fc60dcd..0000000 --- a/zsh/lib/correction.zsh +++ /dev/null @@ -1,10 +0,0 @@ -setopt correct_all - -alias man='nocorrect man' -alias mv='nocorrect mv' -alias mysql='nocorrect mysql' -alias mkdir='nocorrect mkdir' -alias gist='nocorrect gist' -alias heroku='nocorrect heroku' -alias ebuild='nocorrect ebuild' -alias hpodder='nocorrect hpodder' diff --git a/zsh/lib/directories.zsh b/zsh/lib/directories.zsh deleted file mode 100644 index 56d7a23..0000000 --- a/zsh/lib/directories.zsh +++ /dev/null @@ -1,40 +0,0 @@ -# Changing/making/removing directory -setopt auto_name_dirs -setopt auto_pushd -setopt pushd_ignore_dups - -alias ..='cd ..' -alias cd..='cd ..' -alias cd...='cd ../..' -alias cd....='cd ../../..' -alias cd.....='cd ../../../..' -alias cd/='cd /' - -alias 1='cd -' -alias 2='cd +2' -alias 3='cd +3' -alias 4='cd +4' -alias 5='cd +5' -alias 6='cd +6' -alias 7='cd +7' -alias 8='cd +8' -alias 9='cd +9' - -cd () { - if [[ "x$*" == "x..." ]]; then - cd ../.. - elif [[ "x$*" == "x...." ]]; then - cd ../../.. - elif [[ "x$*" == "x....." ]]; then - cd ../../.. - elif [[ "x$*" == "x......" ]]; then - cd ../../../.. - else - builtin cd "$@" - fi -} - -alias md='mkdir -p' -alias rd=rmdir - -alias d='dirs -v' \ No newline at end of file diff --git a/zsh/lib/editor.zsh b/zsh/lib/editor.zsh deleted file mode 100644 index 72244f0..0000000 --- a/zsh/lib/editor.zsh +++ /dev/null @@ -1,2 +0,0 @@ -export EDITOR=vim -alias e=$EDITOR diff --git a/zsh/lib/functions.zsh b/zsh/lib/functions.zsh deleted file mode 100644 index e3c0de4..0000000 --- a/zsh/lib/functions.zsh +++ /dev/null @@ -1,39 +0,0 @@ -## fixme, i duplicated this in xterms - oops -function title { - if [[ $TERM == "screen" ]]; then - # Use these two for GNU Screen: - print -nR $'\033k'$1$'\033'\\\ - - print -nR $'\033]0;'$2$'\a' - elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]]; then - # Use this one instead for XTerms: - print -nR $'\033]0;'$*$'\a' - fi -} - -function precmd { - title zsh "$PWD" -} - -function preexec { - emulate -L zsh - local -a cmd; cmd=(${(z)1}) - title $cmd[1]:t "$cmd[2,-1]" -} - -function zsh_stats() { - history | awk '{print $2}' | sort | uniq -c | sort -rn | head -} - -function uninstall_oh_my_zsh() { - /bin/sh $ZSH/tools/uninstall.sh -} - -function upgrade_oh_my_zsh() { - /bin/sh $ZSH/tools/upgrade.sh -} - -function take() { - mkdir -p $1 - cd $1 -} diff --git a/zsh/lib/git.zsh b/zsh/lib/git.zsh deleted file mode 100644 index 75fdc1f..0000000 --- a/zsh/lib/git.zsh +++ /dev/null @@ -1,40 +0,0 @@ -# get the name of the branch we are on -function git_prompt_info() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return - echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" -} - -parse_git_dirty () { - if [[ -n $(git status -s 2> /dev/null) ]]; then - echo "$ZSH_THEME_GIT_PROMPT_DIRTY" - else - echo "$ZSH_THEME_GIT_PROMPT_CLEAN" - fi -} - -# get the status of the working tree -git_prompt_status() { - INDEX=$(git status --porcelain 2> /dev/null) - STATUS="" - if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then - STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" - fi - if $(echo "$INDEX" | grep '^A ' &> /dev/null); then - STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" - elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then - STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" - fi - if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then - STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" - fi - if $(echo "$INDEX" | grep '^R ' &> /dev/null); then - STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS" - fi - if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then - STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" - fi - if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then - STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" - fi - echo $STATUS -} diff --git a/zsh/lib/grep.zsh b/zsh/lib/grep.zsh deleted file mode 100644 index 93c4270..0000000 --- a/zsh/lib/grep.zsh +++ /dev/null @@ -1,6 +0,0 @@ -# -# Color grep results -# Examples: http://rubyurl.com/ZXv -# -export GREP_OPTIONS='--color=auto' -export GREP_COLOR='1;32' \ No newline at end of file diff --git a/zsh/lib/history.zsh b/zsh/lib/history.zsh deleted file mode 100644 index ca6f570..0000000 --- a/zsh/lib/history.zsh +++ /dev/null @@ -1,16 +0,0 @@ -## Command history configuration -HISTFILE=$HOME/.zsh_history -HISTSIZE=10000 -SAVEHIST=10000 - -setopt hist_ignore_dups # ignore duplication command history list -setopt share_history # share command history data - -setopt hist_verify -setopt inc_append_history -setopt extended_history -setopt hist_expire_dups_first -setopt hist_ignore_space - -setopt SHARE_HISTORY -setopt APPEND_HISTORY diff --git a/zsh/lib/key-bindings.zsh b/zsh/lib/key-bindings.zsh deleted file mode 100644 index 7196a88..0000000 --- a/zsh/lib/key-bindings.zsh +++ /dev/null @@ -1,42 +0,0 @@ -# TODO: Explain what some of this does.. -autoload -U compinit -compinit -i - -bindkey -e -bindkey '\ew' kill-region -bindkey -s '\el' "ls\n" -bindkey -s '\e.' "..\n" -bindkey '^r' history-incremental-search-backward -bindkey "^[[5~" up-line-or-history -bindkey "^[[6~" down-line-or-history - -# make search up and down work, so partially type and hit up/down to find relevant stuff -bindkey '^[[A' up-line-or-search -bindkey '^[[B' down-line-or-search - -bindkey "^[[H" beginning-of-line -bindkey "^[[1~" beginning-of-line -bindkey "^[[F" end-of-line -bindkey "^[[4~" end-of-line -bindkey ' ' magic-space # also do history expansion on space - -bindkey '^[[Z' reverse-menu-complete - -# consider emacs keybindings: - -#bindkey -e ## emacs key bindings -# -#bindkey '^[[A' up-line-or-search -#bindkey '^[[B' down-line-or-search -#bindkey '^[^[[C' emacs-forward-word -#bindkey '^[^[[D' emacs-backward-word -# -#bindkey -s '^X^Z' '%-^M' -#bindkey '^[e' expand-cmd-path -#bindkey '^[^I' reverse-menu-complete -#bindkey '^X^N' accept-and-infer-next-history -#bindkey '^W' kill-region -#bindkey '^I' complete-word -## Fix weird sequence that rxvt produces -#bindkey -s '^[[Z' '\t' -# diff --git a/zsh/lib/misc.zsh b/zsh/lib/misc.zsh deleted file mode 100644 index 4c17436..0000000 --- a/zsh/lib/misc.zsh +++ /dev/null @@ -1,13 +0,0 @@ -## smart urls -autoload -U url-quote-magic -zle -N self-insert url-quote-magic - -## file rename magick -bindkey "^[m" copy-prev-shell-word - -## jobs -setopt long_list_jobs - -## pager -export PAGER=less -export LC_CTYPE=en_US.UTF-8 diff --git a/zsh/lib/path.zsh b/zsh/lib/path.zsh deleted file mode 100644 index 8bd9f35..0000000 --- a/zsh/lib/path.zsh +++ /dev/null @@ -1,2 +0,0 @@ -export PATH=$HOME/bin:$HOME/local/bin::$PATH - diff --git a/zsh/lib/paths.zsh b/zsh/lib/paths.zsh deleted file mode 100644 index 1d07be7..0000000 --- a/zsh/lib/paths.zsh +++ /dev/null @@ -1 +0,0 @@ -inbox="$HOME/Desktop/Inbox" diff --git a/zsh/lib/spectrum.zsh b/zsh/lib/spectrum.zsh deleted file mode 100644 index 4006a7f..0000000 --- a/zsh/lib/spectrum.zsh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/zsh -# A script to make using 256 colors in zsh less painful. -# P.C. Shyamshankar -# Copied from http://github.com/sykora/etc/blob/master/zsh/functions/spectrum/ - -typeset -Ag FX FG BG - -FX=( - reset "%{%}" - bold "%{%}" no-bold "%{%}" - italic "%{%}" no-italic "%{%}" - underline "%{%}" no-underline "%{%}" - blink "%{%}" no-blink "%{%}" - reverse "%{%}" no-reverse "%{%}" -) - -for color in {000..255}; do - FG[$color]="%{[38;5;${color}m%}" - BG[$color]="%{[48;5;${color}m%}" -done diff --git a/zsh/lib/termsupport.zsh b/zsh/lib/termsupport.zsh deleted file mode 100644 index fef9787..0000000 --- a/zsh/lib/termsupport.zsh +++ /dev/null @@ -1,21 +0,0 @@ -case "$TERM" in - xterm*|rxvt*) - preexec () { - print -Pn "\e]0;%n@%m: $1\a" # xterm - } - precmd () { - print -Pn "\e]0;%n@%m: %~\a" # xterm - } - ;; - screen*) - preexec () { - local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} - echo -ne "\ek$CMD\e\\" - print -Pn "\e]0;%n@%m: $1\a" # xterm - } - precmd () { - echo -ne "\ekzsh\e\\" - print -Pn "\e]0;%n@%m: %~\a" # xterm - } - ;; -esac \ No newline at end of file diff --git a/zsh/log/.easter-egg b/zsh/log/.easter-egg deleted file mode 100644 index 2533149..0000000 --- a/zsh/log/.easter-egg +++ /dev/null @@ -1,4 +0,0 @@ -This file is only here so that Git will keep a log directory as .gitignore is ignoring all the log files within it. - -feel free to add love notes for people here. - diff --git a/zsh/plugins/cap/cap.plugin.zsh b/zsh/plugins/cap/cap.plugin.zsh deleted file mode 100644 index a0fa21d..0000000 --- a/zsh/plugins/cap/cap.plugin.zsh +++ /dev/null @@ -1,21 +0,0 @@ -function _cap_does_task_list_need_generating () { - if [ ! -f .cap_tasks~ ]; then return 0; - else - accurate=$(stat -f%m .cap_tasks~) - changed=$(stat -f%m config/deploy.rb) - return $(expr $accurate '>=' $changed) - fi -} - -function _cap () { - if [ -f config/deploy.rb ]; then - if _cap_does_task_list_need_generating; then - echo "\nGenerating .cap_tasks~..." > /dev/stderr - cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D' -> .cap_tasks~ - fi - compadd `cat .cap_tasks~` - fi -} - -compctl -K _cap cap \ No newline at end of file diff --git a/zsh/plugins/dirpersist/dirpersist.plugin.zsh b/zsh/plugins/dirpersist/dirpersist.plugin.zsh deleted file mode 100644 index 6a2b289..0000000 --- a/zsh/plugins/dirpersist/dirpersist.plugin.zsh +++ /dev/null @@ -1,39 +0,0 @@ -#!/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 ) {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/zsh/plugins/gem/_gem b/zsh/plugins/gem/_gem deleted file mode 100644 index 83cba40..0000000 --- a/zsh/plugins/gem/_gem +++ /dev/null @@ -1,64 +0,0 @@ -#compdef gem -#autoload - -# gem zsh completion, based on homebrew completion - -_gem_installed() { - installed_gems=(`gem list --local --no-versions`) -} - -local -a _1st_arguments -_1st_arguments=( - 'cert:Manage RubyGems certificates and signing settings' - 'check:Check installed gems' - 'cleanup:Clean up old versions of installed gems in the local repository' - 'contents:Display the contents of the installed gems' - 'dependency:Show the dependencies of an installed gem' - 'environment:Display information about the RubyGems environment' - 'fetch:Download a gem and place it in the current directory' - 'generate_index:Generates the index files for a gem server directory' - 'help:Provide help on the `gem` command' - 'install:Install a gem into the local repository' - 'list:Display gems whose name starts with STRING' - 'lock:Generate a lockdown list of gems' - 'mirror:Mirror a gem repository' - 'outdated:Display all gems that need updates' - 'owner:Manage gem owners on RubyGems.org.' - 'pristine:Restores installed gems to pristine condition from files located in the gem cache' - 'push:Push a gem up to RubyGems.org' - 'query:Query gem information in local or remote repositories' - 'rdoc:Generates RDoc for pre-installed gems' - 'search:Display all gems whose name contains STRING' - 'server:Documentation and gem repository HTTP server' - 'sources:Manage the sources and cache file RubyGems uses to search for gems' - 'specification:Display gem specification (in yaml)' - 'stale:List gems along with access times' - 'uninstall:Uninstall gems from the local repository' - 'unpack:Unpack an installed gem to the current directory' - 'update:Update the named gems (or all installed gems) in the local repository' - 'which:Find the location of a library file you can require' -) - -local expl -local -a gems installed_gems - -_arguments \ - '(-v --version)'{-v,--version}'[show version]' \ - '(-h --help)'{-h,--help}'[show help]' \ - '*:: :->subcmds' && return 0 - -if (( CURRENT == 1 )); then - _describe -t commands "gem subcommand" _1st_arguments - return -fi - -case "$words[1]" in - list) - if [[ "$state" == forms ]]; then - _gem_installed - _requested installed_gems expl 'installed gems' compadd -a installed_gems - fi ;; - uninstall|update) - _gem_installed - _wanted installed_gems expl 'installed gems' compadd -a installed_gems ;; -esac diff --git a/zsh/plugins/gem/gem.plugin.zsh b/zsh/plugins/gem/gem.plugin.zsh deleted file mode 100644 index 65d3766..0000000 --- a/zsh/plugins/gem/gem.plugin.zsh +++ /dev/null @@ -1,4 +0,0 @@ -# add brew completion function to path -fpath=($ZSH/plugins/gem $fpath) -autoload -U compinit -compinit -i diff --git a/zsh/plugins/git/git.plugin.zsh b/zsh/plugins/git/git.plugin.zsh deleted file mode 100644 index d317d17..0000000 --- a/zsh/plugins/git/git.plugin.zsh +++ /dev/null @@ -1,32 +0,0 @@ -# Aliases -alias g='git' -alias gst='git status' -alias gl='git pull' -alias gup='git fetch && git rebase' -alias gp='git push' -alias gd='git diff | mate' -alias gdv='git diff -w "$@" | vim -R -' -alias gc='git commit -v' -alias gca='git commit -v -a' -alias gb='git branch' -alias gba='git branch -a' -alias gcount='git shortlog -sn' -alias gcp='git cherry-pick' -alias glg='git log --stat --max-count=5' - -# Git and svn mix -alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' - -# -# Will return the current branch name -# Usage example: git pull origin $(current_branch) -# -function current_branch() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return - echo ${ref#refs/heads/} -} - -# these aliases take advangate of the previous function -alias ggpull='git pull origin $(current_branch)' -alias ggpush='git push origin $(current_branch)' -alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' \ No newline at end of file diff --git a/zsh/plugins/github/_github b/zsh/plugins/github/_github deleted file mode 100644 index 83e1713..0000000 --- a/zsh/plugins/github/_github +++ /dev/null @@ -1,40 +0,0 @@ -#compdef github -#autoload - -# in order to make this work, you will need to have the github gem installed -# http://github.com/defunkt/github-gem - -# github zsh completion, based on homebrew completion - -local -a _1st_arguments -_1st_arguments=( - 'browse:Open this repo in a web browser' - 'clone:Clone a repo' - 'config:Automatically set configuration info, or pass args to specify' - 'create-from-local:Create a new GitHub repository from the current local repository' - 'create:Create a new empty GitHub repository' - 'fetch:Fetch from a remote to a local branch' - 'fetch_all:Fetch all refs from a user' - 'fork:Forks a GitHub repository' - 'home:Open this repos master branch in a web browser' - 'ignore:Ignore a SHA from github network commits' - 'info:Info about this project' - 'issues:Project issues tools' - 'network:Project network tools - sub-commands : web [user], list, fetch, commits' - 'open:Open the given user/project in a web browser' - 'pull-request:Generate the text for a pull request' - 'pull:Pull from a remote' - 'search:Search GitHub for the given repository name' - 'track:Track another users repository' -) - -local expl -local -a pkgs installed_pkgs - -_arguments \ - '*:: :->subcmds' && return 0 - -if (( CURRENT == 1 )); then - _describe -t commands "github subcommand" _1st_arguments - return -fi diff --git a/zsh/plugins/github/github.plugin.zsh b/zsh/plugins/github/github.plugin.zsh deleted file mode 100644 index c23504b..0000000 --- a/zsh/plugins/github/github.plugin.zsh +++ /dev/null @@ -1,4 +0,0 @@ -# add github completion function to path -fpath=($ZSH/plugins/github $fpath) -autoload -U compinit -compinit -i diff --git a/zsh/plugins/lighthouse/lighthouse.plugin.zsh b/zsh/plugins/lighthouse/lighthouse.plugin.zsh deleted file mode 100644 index 4eb06a9..0000000 --- a/zsh/plugins/lighthouse/lighthouse.plugin.zsh +++ /dev/null @@ -1,16 +0,0 @@ -# To use: add a .lighthouse file into your directory with the URL to the -# individual project. For example: -# https://rails.lighthouseapp.com/projects/8994 -# Example usage: http://screencast.com/t/ZDgwNDUwNT -open_lighthouse_ticket () { - if [ ! -f .lighthouse-url ]; then - echo "There is no .lighthouse file in the current directory..." - return 0; - else - lighthouse_url=$(cat .lighthouse-url); - echo "Opening ticket #$1"; - `open $lighthouse_url/tickets/$1`; - fi -} - -alias lho='open_lighthouse_ticket' \ No newline at end of file diff --git a/zsh/plugins/mysql/mysql-macports.plugin.zsh b/zsh/plugins/mysql/mysql-macports.plugin.zsh deleted file mode 100644 index 63b881c..0000000 --- a/zsh/plugins/mysql/mysql-macports.plugin.zsh +++ /dev/null @@ -1,6 +0,0 @@ -# commands to control local mysql-server installation -# paths are for osx installtion via macports - -alias mysqlstart='sudo /opt/local/bin/mysqld_safe5' -alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown' -alias mysqlstatus='mysqladmin5 -u root -p ping' \ No newline at end of file diff --git a/zsh/plugins/pip/_pip b/zsh/plugins/pip/_pip deleted file mode 100644 index b580101..0000000 --- a/zsh/plugins/pip/_pip +++ /dev/null @@ -1,46 +0,0 @@ -#compdef pip -#autoload - -# pip zsh completion, based on homebrew completion - -_pip_installed() { - installed_pkgs=(`pip freeze`) -} - -local -a _1st_arguments -_1st_arguments=( - 'bundle:Create pybundles (archives containing multiple packages)' - 'freeze:Output all currently installed packages (exact versions) to stdout' - 'help:Show available commands' - 'install:Install packages' - 'search:Search PyPI' - 'uninstall:Uninstall packages' - 'unzip:Unzip individual packages' - 'zip:Zip individual packages' -) - -local expl -local -a pkgs installed_pkgs - -_arguments \ - '(--version)--version[Show version number of program and exit]' \ - '(-v --verbose)'{-v,--verbose}'[Give more output]' \ - '(-q --quiet)'{-q,--quiet}'[Give less output]' \ - '(-h --help)'{-h,--help}'[Show help]' \ - '*:: :->subcmds' && return 0 - -if (( CURRENT == 1 )); then - _describe -t commands "pip subcommand" _1st_arguments - return -fi - -case "$words[1]" in - list) - if [[ "$state" == forms ]]; then - _pip_installed - _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs - fi ;; - uninstall) - _pip_installed - _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;; -esac diff --git a/zsh/plugins/pip/pip.plugin.zsh b/zsh/plugins/pip/pip.plugin.zsh deleted file mode 100644 index bf9f239..0000000 --- a/zsh/plugins/pip/pip.plugin.zsh +++ /dev/null @@ -1,4 +0,0 @@ -# add brew completion function to path -fpath=($ZSH/plugins/pip $fpath) -autoload -U compinit -compinit -i diff --git a/zsh/plugins/rails/rails.plugin.zsh b/zsh/plugins/rails/rails.plugin.zsh deleted file mode 100644 index ac8119e..0000000 --- a/zsh/plugins/rails/rails.plugin.zsh +++ /dev/null @@ -1,13 +0,0 @@ -alias ss='thin --stats "/thin/stats" start' -alias sg='ruby script/generate' -alias sd='ruby script/destroy' -alias sp='ruby script/plugin' -alias ssp='ruby script/spec' -alias rdbm='rake db:migrate' -alias sc='ruby script/console' -alias sd='ruby script/server --debugger' -alias devlog='tail -f log/development.log' - -function remote_console() { - /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )" -} diff --git a/zsh/plugins/ruby/ruby.plugin.zsh b/zsh/plugins/ruby/ruby.plugin.zsh deleted file mode 100644 index 82bf5d4..0000000 --- a/zsh/plugins/ruby/ruby.plugin.zsh +++ /dev/null @@ -1,4 +0,0 @@ -alias sgem='sudo gem' - -# Find ruby file -alias rfind='find . -name *.rb | xargs grep -n' \ No newline at end of file diff --git a/zsh/plugins/ssh-agent/ssh-agent.plugin.zsh b/zsh/plugins/ssh-agent/ssh-agent.plugin.zsh deleted file mode 100644 index ce0d645..0000000 --- a/zsh/plugins/ssh-agent/ssh-agent.plugin.zsh +++ /dev/null @@ -1,23 +0,0 @@ -# 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/zsh/plugins/textmate/textmate.plugin.zsh b/zsh/plugins/textmate/textmate.plugin.zsh deleted file mode 100644 index 7b73e27..0000000 --- a/zsh/plugins/textmate/textmate.plugin.zsh +++ /dev/null @@ -1,14 +0,0 @@ - -# TextMate -alias et='mate . &' -alias ett='mate app config lib db public spec test Rakefile Capfile Todo &' -alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' -alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' - -# Editor Ruby file in TextMate -alias mr='mate CHANGELOG app config db lib public script spec test' - -function tm() { - cd $1 - mate $1 -} diff --git a/zsh/plugins/vi-mode/vi-mode.plugin.zsh b/zsh/plugins/vi-mode/vi-mode.plugin.zsh deleted file mode 100644 index c47ab72..0000000 --- a/zsh/plugins/vi-mode/vi-mode.plugin.zsh +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/zsh/themes/Soliah.zsh-theme b/zsh/themes/Soliah.zsh-theme deleted file mode 100644 index 7ad876d..0000000 --- a/zsh/themes/Soliah.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -PROMPT='%{$fg[blue]%}%B%20~%b%{$reset_color%}%{$(git_prompt_info)%} $ ' - -ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[green]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})" -ZSH_THEME_GIT_PROMPT_DIRTY="*%{$reset_color%}" - diff --git a/zsh/themes/afowler.zsh-theme b/zsh/themes/afowler.zsh-theme deleted file mode 100644 index b5a9bb1..0000000 --- a/zsh/themes/afowler.zsh-theme +++ /dev/null @@ -1,10 +0,0 @@ -if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi - -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - -PROMPT='%m %{${fg_bold[blue]}%}:: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} ' - -RPS1="${return_code}" - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" -ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/zsh/themes/arrow.zsh-theme b/zsh/themes/arrow.zsh-theme deleted file mode 100644 index a23efd1..0000000 --- a/zsh/themes/arrow.zsh-theme +++ /dev/null @@ -1,14 +0,0 @@ -if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="yellow"; fi - -PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}' -RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="git:" -ZSH_THEME_GIT_PROMPT_SUFFIX="" -ZSH_THEME_GIT_PROMPT_DIRTY="*" -ZSH_THEME_GIT_PROMPT_CLEAN="" - -# See http://geoff.greer.fm/lscolors/ -export LSCOLORS="exfxcxdxbxbxbxbxbxbxbx" -export LS_COLORS="di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=31;40:cd=31;40:su=31;40:sg=31;40:tw=31;40:ow=31;40:" - diff --git a/zsh/themes/aussiegeek.zsh-theme b/zsh/themes/aussiegeek.zsh-theme deleted file mode 100644 index c2c7f65..0000000 --- a/zsh/themes/aussiegeek.zsh-theme +++ /dev/null @@ -1,8 +0,0 @@ - -PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color - $ ' -# git theming -ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green](" -ZSH_THEME_GIT_PROMPT_SUFFIX=")" -ZSH_THEME_GIT_PROMPT_CLEAN="✔" -ZSH_THEME_GIT_PROMPT_DIRTY="✗" diff --git a/zsh/themes/candy.zsh-theme b/zsh/themes/candy.zsh-theme deleted file mode 100644 index bc125c5..0000000 --- a/zsh/themes/candy.zsh-theme +++ /dev/null @@ -1,7 +0,0 @@ -PROMPT=$'%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\ -%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} ' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[" -ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}" -ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/zsh/themes/clean.zsh-theme b/zsh/themes/clean.zsh-theme deleted file mode 100644 index 95f532a..0000000 --- a/zsh/themes/clean.zsh-theme +++ /dev/null @@ -1,14 +0,0 @@ -if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="white"; fi - -PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) ' -RPROMPT='[%*]' - -# git theming -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[yellow]%}%B" -ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_CLEAN="" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗" - -# LS colors, made with http://geoff.greer.fm/lscolors/ -export LSCOLORS="Gxfxcxdxbxegedabagacad" -export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/zsh/themes/cloud.zsh-theme b/zsh/themes/cloud.zsh-theme deleted file mode 100644 index ad5e283..0000000 --- a/zsh/themes/cloud.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -PROMPT='%{$fg_bold[cyan]%}☁ %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}] %{$fg[yellow]%}⚡%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}]" \ No newline at end of file diff --git a/zsh/themes/cypher.zsh-theme b/zsh/themes/cypher.zsh-theme deleted file mode 100644 index 45df53d..0000000 --- a/zsh/themes/cypher.zsh-theme +++ /dev/null @@ -1,4 +0,0 @@ -# Based on evan's prompt -# Shows the exit status of the last command if non-zero -# Uses "#" instead of "»" when running with elevated privileges -PROMPT="%m %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . ${fg[red]}%? )%{${fg[blue]}%}»%{${reset_color}%} " diff --git a/zsh/themes/dallas.zsh-theme b/zsh/themes/dallas.zsh-theme deleted file mode 100644 index eef32e9..0000000 --- a/zsh/themes/dallas.zsh-theme +++ /dev/null @@ -1,26 +0,0 @@ -# Personalized! - -# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T} -DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}" -# Grab the current version of ruby in use (via RVM): [ruby-1.8.7] -DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}" -# Grab the current machine name: muscato -DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}" -# Grab the current filepath, use shortcuts: ~/Desktop -# Append the current git branch, if in a git repository: ~aw@master -DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}" -# Grab the current username: dallas -DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}" -# Use a % for normal users and a # for privelaged (root) users. -DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}" -# For the git prompt, use a white @ and blue text for the branch name -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}" -# Close it all off by resetting the color and styles. -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -# Do nothing if the branch is clean (no changes). -ZSH_THEME_GIT_PROMPT_CLEAN="" -# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch! -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗" - -# Put it all together! -PROMPT="$DALLAS_CURRENT_TIME_$DALLAS_CURRENT_RUBY_$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ " diff --git a/zsh/themes/darkblood.zsh-theme b/zsh/themes/darkblood.zsh-theme deleted file mode 100644 index 33508fb..0000000 --- a/zsh/themes/darkblood.zsh-theme +++ /dev/null @@ -1,9 +0,0 @@ -# meh. Dark Blood Rewind, a new beginning. - -PROMPT=$'%{$fg[red]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[red]%}@%{$fg_bold[white]%}%m%{$reset_color%}%{$fg[red]%}] [%{$fg_bold[white]%}/dev/%y%{$reset_color%}%{$fg[red]%}] %{$(git_prompt_info)%}%(?,,%{$fg[red]%}[%{$fg_bold[white]%}%?%{$reset_color%}%{$fg[red]%}]) -%{$fg[red]%}└[%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[red]%}]>%{$reset_color%} ' -PS2=$' %{$fg[red]%}|>%{$reset_color%} ' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}[%{$fg_bold[white]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg[red]%}] " -ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡%{$reset_color%}" diff --git a/zsh/themes/daveverwer.zsh-theme b/zsh/themes/daveverwer.zsh-theme deleted file mode 100644 index 89aef92..0000000 --- a/zsh/themes/daveverwer.zsh-theme +++ /dev/null @@ -1,7 +0,0 @@ -# Copied and modified from the oh-my-zsh theme from geoffgarside -# Red server name, green cwd, blue git status - -PROMPT='%{$fg[red]%}%m%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) ' - -ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}(" -ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" diff --git a/zsh/themes/dst.zsh-theme b/zsh/themes/dst.zsh-theme deleted file mode 100644 index fa0d9cb..0000000 --- a/zsh/themes/dst.zsh-theme +++ /dev/null @@ -1,16 +0,0 @@ - -ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!" -ZSH_THEME_GIT_PROMPT_CLEAN="" - -function prompt_char { - if [ "$(whoami)" = "root" ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi -} - -PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%} -) -%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info) -%_ $(prompt_char) ' - -RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}' diff --git a/zsh/themes/dstufft.zsh-theme b/zsh/themes/dstufft.zsh-theme deleted file mode 100644 index 5a23fce..0000000 --- a/zsh/themes/dstufft.zsh-theme +++ /dev/null @@ -1,19 +0,0 @@ -function prompt_char { - git branch >/dev/null 2>/dev/null && echo '±' && return - hg root >/dev/null 2>/dev/null && echo 'Hg' && return - echo '○' -} - -function virtualenv_info { - [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' -} - -PROMPT=' -%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) -$(virtualenv_info)$(prompt_char) ' - -ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!" -ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?" -ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/zsh/themes/duellj.zsh-theme b/zsh/themes/duellj.zsh-theme deleted file mode 100644 index 7350b43..0000000 --- a/zsh/themes/duellj.zsh-theme +++ /dev/null @@ -1,8 +0,0 @@ - -# user, host, full path, and time/date -# on two lines for easier vgrepping -# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 -PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;34m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}%!%{\e[0;34m%}%B]%b%{\e[0m%} -%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b ' -RPROMPT='[%*]' -PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' diff --git a/zsh/themes/eastwood.zsh-theme b/zsh/themes/eastwood.zsh-theme deleted file mode 100644 index 8366451..0000000 --- a/zsh/themes/eastwood.zsh-theme +++ /dev/null @@ -1,19 +0,0 @@ -#RVM settings -if [[ -s ~/.rvm/scripts/rvm ]] ; then - RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1" -fi - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}[" -ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="" - -#Customized git status, oh-my-zsh currently does not allow render dirty status before branch -git_custom_status() { - local cb=$(current_branch) - if [ -n "$cb" ]; then - echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" - fi -} - -PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b ' diff --git a/zsh/themes/edvardm.zsh-theme b/zsh/themes/edvardm.zsh-theme deleted file mode 100644 index f9ca1a9..0000000 --- a/zsh/themes/edvardm.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/zsh/themes/evan.zsh-theme b/zsh/themes/evan.zsh-theme deleted file mode 100644 index 5ef1f40..0000000 --- a/zsh/themes/evan.zsh-theme +++ /dev/null @@ -1,2 +0,0 @@ -# Evan describes this sexy prompt as: "a skinny, topless prompt" -PROMPT='%m :: %2~ %B»%b ' \ No newline at end of file diff --git a/zsh/themes/example.zsh-theme b/zsh/themes/example.zsh-theme deleted file mode 100644 index dbd9dc9..0000000 --- a/zsh/themes/example.zsh-theme +++ /dev/null @@ -1,5 +0,0 @@ -# Found on the ZshWiki -# http://zshwiki.org/home/config/prompt -# - -PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% " \ No newline at end of file diff --git a/zsh/themes/fletcherm.zsh-theme b/zsh/themes/fletcherm.zsh-theme deleted file mode 100644 index e961885..0000000 --- a/zsh/themes/fletcherm.zsh-theme +++ /dev/null @@ -1,12 +0,0 @@ -# Copied from old version of tonotdo's theme. LSCOLORS modified. -PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}•%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» ' -RPROMPT='[%*]' - -# git theming -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}⚡%{$fg_bold[blue]%})" - -export LSCOLORS="exfxcxdxbxegedabagacad" -export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/zsh/themes/funky.zsh-theme b/zsh/themes/funky.zsh-theme deleted file mode 100644 index 2451296..0000000 --- a/zsh/themes/funky.zsh-theme +++ /dev/null @@ -1,14 +0,0 @@ -# Taken from Tassilo's Blog -# http://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/ - -local blue_op="%{$fg[blue]%}[%{$reset_color%}" -local blue_cp="%{$fg[blue]%}]%{$reset_color%}" -local path_p="${blue_op}%~${blue_cp}" -local user_host="${blue_op}%n@%m${blue_cp}" -local ret_status="${blue_op}%?${blue_cp}" -local hist_no="${blue_op}%h${blue_cp}" -local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color%})" -PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no} -╰─${blue_op}${smiley}${blue_cp} %# " -local cur_cmd="${blue_op}%_${blue_cp}" -PROMPT2="${cur_cmd}> " \ No newline at end of file diff --git a/zsh/themes/gallifrey.zsh-theme b/zsh/themes/gallifrey.zsh-theme deleted file mode 100644 index fce7cb9..0000000 --- a/zsh/themes/gallifrey.zsh-theme +++ /dev/null @@ -1,8 +0,0 @@ -# ZSH Theme - Preview: http://img.skitch.com/20091113-qqtd3j8xinysujg5ugrsbr7x1y.jpg -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - -PROMPT='%{$fg[green]%}%m%{$reset_color%} %2~ $(git_prompt_info)%{$reset_color%}%B»%b ' -RPS1="${return_code}" - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" -ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/zsh/themes/garyblessington.zsh-theme b/zsh/themes/garyblessington.zsh-theme deleted file mode 100644 index b4f84a7..0000000 --- a/zsh/themes/garyblessington.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -PROMPT='%{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}% %{$reset_color%}: ' - -ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[blue]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[red]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/zsh/themes/geoffgarside.zsh-theme b/zsh/themes/geoffgarside.zsh-theme deleted file mode 100644 index 675ec72..0000000 --- a/zsh/themes/geoffgarside.zsh-theme +++ /dev/null @@ -1,5 +0,0 @@ -# PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) " -PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) ' - -ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}git:(" -ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" diff --git a/zsh/themes/gozilla.zsh-theme b/zsh/themes/gozilla.zsh-theme deleted file mode 100644 index c6b752e..0000000 --- a/zsh/themes/gozilla.zsh-theme +++ /dev/null @@ -1,15 +0,0 @@ -PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="(" -ZSH_THEME_GIT_PROMPT_SUFFIX=")" -ZSH_THEME_GIT_PROMPT_DIRTY="" -ZSH_THEME_GIT_PROMPT_CLEAN="" - -RPROMPT='$(git_prompt_status)%{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈" -ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭" -ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗" -ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦" -ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂" -ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱" diff --git a/zsh/themes/imajes.zsh-theme b/zsh/themes/imajes.zsh-theme deleted file mode 100644 index 88c35b6..0000000 --- a/zsh/themes/imajes.zsh-theme +++ /dev/null @@ -1,5 +0,0 @@ -# Found on the ZshWiki -# http://zshwiki.org/home/config/prompt -# - -PROMPT="%{$fg[red]%}%%%{$reset_color%} " \ No newline at end of file diff --git a/zsh/themes/jbergantine.zsh-theme b/zsh/themes/jbergantine.zsh-theme deleted file mode 100644 index d84247c..0000000 --- a/zsh/themes/jbergantine.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}) %{$fg[yellow]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%})" diff --git a/zsh/themes/jnrowe.zsh-theme b/zsh/themes/jnrowe.zsh-theme deleted file mode 100644 index 7c8a708..0000000 --- a/zsh/themes/jnrowe.zsh-theme +++ /dev/null @@ -1,31 +0,0 @@ -autoload -U add-zsh-hook -autoload -Uz vcs_info - -zstyle ':vcs_info:*' actionformats \ - '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' -zstyle ':vcs_info:*' formats \ - '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f ' -zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' -zstyle ':vcs_info:*' enable git - -add-zsh-hook precmd prompt_jnrowe_precmd - -prompt_jnrowe_precmd () { - vcs_info - - if [ "${vcs_info_msg_0_}" = "" ]; then - dir_status="%F{2}→%f" - elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then - dir_status="%F{1}▶%f" - elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then - dir_status="%F{3}▶%f" - else - dir_status="%F{2}▶%f" - fi -} - -local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)" - -PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} ' - -# vim: set ft=zsh ts=4 sw=4 et: diff --git a/zsh/themes/josh.zsh-theme b/zsh/themes/josh.zsh-theme deleted file mode 100644 index 6bed1a7..0000000 --- a/zsh/themes/josh.zsh-theme +++ /dev/null @@ -1,43 +0,0 @@ -grey='\e[0;90m' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}(" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})" - -function josh_prompt { - (( spare_width = ${COLUMNS} )) - prompt=" " - - branch=$(current_branch) - ruby_version=$(rvm_prompt_info) - path_size=${#PWD} - branch_size=${#branch} - ruby_size=${#ruby_version} - user_machine_size=${#${(%):-%n@%m-}} - - if [[ ${#branch} -eq 0 ]] - then (( ruby_size = ruby_size + 1 )) - else - (( branch_size = branch_size + 4 )) - if [[ -n $(git status -s 2> /dev/null) ]]; then - (( branch_size = branch_size + 2 )) - fi - fi - - (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) )) - - while [ ${#prompt} -lt $spare_width ]; do - prompt=" $prompt" - done - - prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)" - - echo $prompt -} - -setopt prompt_subst - -PROMPT=' -%n@%m $(josh_prompt) -%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} ' diff --git a/zsh/themes/jreese.zsh-theme b/zsh/themes/jreese.zsh-theme deleted file mode 100644 index 534664f..0000000 --- a/zsh/themes/jreese.zsh-theme +++ /dev/null @@ -1,16 +0,0 @@ -# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png - -if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - -PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \ -$(git_prompt_info)\ -%{$fg[red]%}%(!.#.»)%{$reset_color%} ' -PROMPT2='%{$fg[red]%}\ %{$reset_color%}' -RPS1='${return_code}' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_CLEAN="" -ZSH_THEME_GIT_PROMPT_DIRTY="⚡" - diff --git a/zsh/themes/kennethreitz.zsh-theme b/zsh/themes/kennethreitz.zsh-theme deleted file mode 100644 index 109be0c..0000000 --- a/zsh/themes/kennethreitz.zsh-theme +++ /dev/null @@ -1,13 +0,0 @@ -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - -PROMPT='%{$fg[green]%}%c \ -$(git_prompt_info)\ -%{$fg[red]%}%(!.#.»)%{$reset_color%} ' -PROMPT2='%{$fg[red]%}\ %{$reset_color%}' -RPS1='%{$fg[blue]%}%~%{$reset_color%} ${return_code} ' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}:: %{$fg[yellow]%}(" -ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_CLEAN="" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$fg[yellow]%}" - diff --git a/zsh/themes/linuxonly b/zsh/themes/linuxonly deleted file mode 100644 index a11b80d..0000000 --- a/zsh/themes/linuxonly +++ /dev/null @@ -1,80 +0,0 @@ -# vim: set ts=2 textwidth=0 - -autoload -U add-zsh-hook -autoload -Uz vcs_info -local c0=$(printf "\033[0m") -local c1=$(printf "\033[38;5;215m") -local c2=$(printf "\033[38;5;209m") -local c3=$(printf "\033[38;5;203m") -local c4=$(printf "\033[33;4m") -local c5=$(printf "\033[38;5;137m") -local c6=$(printf "\033[38;5;240m") -local c7=$(printf "\033[38;5;149m") -local c8=$(printf "\033[38;5;126m") -local c9=$(printf "\033[38;5;162m") - -local foopath=$(perl /home/scp1/bin/foopath) - -if [ "$TERM" = "linux" ]; then - c1=$(printf "\033[34;1m") - c2=$(printf "\033[35m") - c3=$(printf "\033[31m") - c4=$(printf "\033[31;1m") - c5=$(printf "\033[32m") - c6=$(printf "\033[32;1m") - c7=$(printf "\033[33m") - c8=$(printf "\033[33;1m") - c9=$(printf "\033[34m") -fi - -#local newtv=$(perl $HOME/devel/newtv.pl) -local newtv='' - -zstyle ':vcs_info:*' actionformats \ - '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' -zstyle ':vcs_info:*' formats \ - "%{$c8%}%s%{$c7%}:%{$c7%}(%{$c9%}%b%{$c7%})%f " -zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' -zstyle ':vcs_info:*' enable git - -add-zsh-hook precmd prompt_jnrowe_precmd - -prompt_jnrowe_precmd () { - vcs_info - - if [ "${vcs_info_msg_0_}" = "" ]; then - #dir_status="|%F{3}%n%F{7}@%F{3}%m%F{7}:%F{9}%l%f" - #dir_status="$c1%n%F{7}@%F{9}%m%F{7}:%F{12}%/" - dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" - #dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$foopath%} %{$c0%}(%{$c5%}%?%{$c0%})" - - PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%} -> ' - elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then - dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" - PROMPT='${vcs_info_msg_0_} -%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%} -> ' - - elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then - dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" - - PROMPT='${vcs_info_msg_0_} -%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%} -%{$c9%}·>%{$c0%} ' - else - dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" - PROMPT='${vcs_info_msg_0_} -%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%} -> ' - - fi -} - - -#PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$reset_color%} ${vcs_info_msg_0_}${dir_status}%{$reset_color%} -#> ' - -# vim: set ft=zsh ts=4 sw=4 et: - - diff --git a/zsh/themes/lukerandall.zsh-theme b/zsh/themes/lukerandall.zsh-theme deleted file mode 100644 index 24a0612..0000000 --- a/zsh/themes/lukerandall.zsh-theme +++ /dev/null @@ -1,10 +0,0 @@ -# ZSH Theme - Preview: http://cl.ly/f701d00760f8059e06dc -# Thanks to gallifrey, upon whose theme this is based - -local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})" - -PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(git_prompt_info)%{$reset_color%}%B»%b ' -RPS1="${return_code}" - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}(" -ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" diff --git a/zsh/themes/macovsky-modified-mine.zsh-theme b/zsh/themes/macovsky-modified-mine.zsh-theme deleted file mode 100644 index f856912..0000000 --- a/zsh/themes/macovsky-modified-mine.zsh-theme +++ /dev/null @@ -1,11 +0,0 @@ -# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - -PROMPT='%{$fg[green]%}%~%{$reset_color%}$(git_prompt_info)%{$reset_color%}%B$%b ' - -if [ -n $EMACS ]; then - RPS1="${return_code}" -fi - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" -ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/zsh/themes/macovsky-ruby.zsh-theme b/zsh/themes/macovsky-ruby.zsh-theme deleted file mode 100644 index 4eb4102..0000000 --- a/zsh/themes/macovsky-ruby.zsh-theme +++ /dev/null @@ -1,8 +0,0 @@ -# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - -PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' -RPS1="${return_code}" - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" -ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/zsh/themes/macovsky.zsh-theme b/zsh/themes/macovsky.zsh-theme deleted file mode 100644 index 4eb4102..0000000 --- a/zsh/themes/macovsky.zsh-theme +++ /dev/null @@ -1,8 +0,0 @@ -# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - -PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' -RPS1="${return_code}" - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" -ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/zsh/themes/maran.zsh-theme b/zsh/themes/maran.zsh-theme deleted file mode 100644 index 6fba046..0000000 --- a/zsh/themes/maran.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -# Theme with full path names and hostname -# Handy if you work on different servers all the time; -PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%} $(git_prompt_info) %(!.#.$) ' - -ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}git:(" -ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" diff --git a/zsh/themes/mgutz.zsh-theme b/zsh/themes/mgutz.zsh-theme deleted file mode 100644 index dcf3270..0000000 --- a/zsh/themes/mgutz.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -PROMPT='%{$fg_bold[magenta]%}%1~$(git_prompt_info) %{$fg_bold[magenta]%}%# %{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}[" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="*]" -ZSH_THEME_GIT_PROMPT_CLEAN="]" diff --git a/zsh/themes/mikeh.zsh-theme b/zsh/themes/mikeh.zsh-theme deleted file mode 100644 index 943f04d..0000000 --- a/zsh/themes/mikeh.zsh-theme +++ /dev/null @@ -1,23 +0,0 @@ -setopt prompt_subst -autoload colors -colors - -autoload -U add-zsh-hook -autoload -Uz vcs_info - -# check-for-changes can be really slow. -# you should disable it, if you work with large repositories -zstyle ':vcs_info:*:prompt:*' check-for-changes true - -add-zsh-hook precmd mikeh_precmd - -mikeh_precmd() { - vcs_info -} - -# user, host, full path, and time/date -# on two lines for easier vgrepping -# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 -PROMPT=$'%{\e[0;34m%}%B..[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} -%{\e[0;34m%}%B..%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <($vcs_info_msg_0_)>%{\e[0m%}%b ' -PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' \ No newline at end of file diff --git a/zsh/themes/mine.zsh-theme b/zsh/themes/mine.zsh-theme deleted file mode 100644 index c458240..0000000 --- a/zsh/themes/mine.zsh-theme +++ /dev/null @@ -1,10 +0,0 @@ -local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" -PROMPT='%{$fg[blue]%}%B%20~%b%{$reset_color%}$(git_prompt_info)%{$reset_color%} %B$%b ' - -if [ -n $EMACS ]; then - RPS1="${return_code}" -fi - -ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[green]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})" -ZSH_THEME_GIT_PROMPT_DIRTY="*%{$reset_color%}" diff --git a/zsh/themes/mrtazz.zsh-theme b/zsh/themes/mrtazz.zsh-theme deleted file mode 100644 index 214ba5a..0000000 --- a/zsh/themes/mrtazz.zsh-theme +++ /dev/null @@ -1,7 +0,0 @@ -PROMPT='%{$fg_bold[red]%}%m%{$reset_color%}:%{$fg[cyan]%}%c%{$reset_color%}:%# ' -RPROMPT='%{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}% ' - -ZSH_THEME_GIT_PROMPT_PREFIX="<%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$fg[green]%}>%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}>" diff --git a/zsh/themes/philips.zsh-theme b/zsh/themes/philips.zsh-theme deleted file mode 100644 index fa7c590..0000000 --- a/zsh/themes/philips.zsh-theme +++ /dev/null @@ -1,14 +0,0 @@ -if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi - -PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) ' -RPROMPT='[%*]' - -# git theming -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B" -ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_CLEAN="" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}" - -# LS colors, made with http://geoff.greer.fm/lscolors/ -export LSCOLORS="Gxfxcxdxbxegedabagacad" -export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/zsh/themes/pmcgee.zsh-theme b/zsh/themes/pmcgee.zsh-theme deleted file mode 100644 index 4eb54df..0000000 --- a/zsh/themes/pmcgee.zsh-theme +++ /dev/null @@ -1,16 +0,0 @@ -if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi - -PROMPT=' -%{$fg[$NCOLOR]%}%B%n@%m%b%{$reset_color%} %{$fg[white]%}%B${PWD/#$HOME/~}%b%{$reset_color%} -$(git_prompt_info)%(!.#.$) ' -RPROMPT='[%*]' - -# git theming -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[yellow]%}%B" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_CLEAN="" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}*" - -# LS colors, made with http://geoff.greer.fm/lscolors/ -export LSCOLORS="Gxfxcxdxbxegedabagacad" -export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/zsh/themes/rgm.zsh-theme b/zsh/themes/rgm.zsh-theme deleted file mode 100644 index 9452a8b..0000000 --- a/zsh/themes/rgm.zsh-theme +++ /dev/null @@ -1,8 +0,0 @@ -PROMPT=' -%n@%m %{$fg[cyan]%}%~ -%? $(git_prompt_info)%{$fg_bold[blue]%}%% %{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}" diff --git a/zsh/themes/risto.zsh-theme b/zsh/themes/risto.zsh-theme deleted file mode 100644 index cb773a6..0000000 --- a/zsh/themes/risto.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -# -*- sh -*- vim:set ft=sh ai et sw=4 sts=4: -# It might be bash like, but I can't have my co-workers knowing I use zsh -PROMPT='%{$fg[green]%}%n@%m:%{$fg_bold[blue]%}%2~ $(git_prompt_info)%{$reset_color%}%(!.#.$) ' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹" -ZSH_THEME_GIT_PROMPT_SUFFIX="›%{$reset_color%}" diff --git a/zsh/themes/robbyrussell.zsh-theme b/zsh/themes/robbyrussell.zsh-theme deleted file mode 100644 index 7b524e8..0000000 --- a/zsh/themes/robbyrussell.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/zsh/themes/skaro.zsh-theme b/zsh/themes/skaro.zsh-theme deleted file mode 100644 index 84b7b11..0000000 --- a/zsh/themes/skaro.zsh-theme +++ /dev/null @@ -1,7 +0,0 @@ -PROMPT='%{$fg_bold[green]%}%h %{$fg[cyan]%}%2~ %{$fg_bold[blue]%}$(git_prompt_info) %{$reset_color%}» ' - -ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" - diff --git a/zsh/themes/sporty_256.zsh-theme b/zsh/themes/sporty_256.zsh-theme deleted file mode 100644 index db0fc42..0000000 --- a/zsh/themes/sporty_256.zsh-theme +++ /dev/null @@ -1,13 +0,0 @@ -# zsh theme requires 256 color enabled terminal -# i.e TERM=xterm-256color -# Preview - http://www.flickr.com/photos/adelcampo/4556482563/sizes/o/ -# based on robbyrussell's shell but louder! - -PROMPT='%{$fg_bold[blue]%}$(git_prompt_info) %F{208}%c%f -%{$fg_bold[white]%}%# %{$reset_color%}' -RPROMPT='%B%F{208}%n%f%{$fg_bold[white]%}@%F{039}%m%f%{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="%F{154}±|%f%F{124}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}%B✘%b%F{154}|%f%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%F{154}|" diff --git a/zsh/themes/takashiyoshida.zsh-theme b/zsh/themes/takashiyoshida.zsh-theme deleted file mode 100644 index 419a8cf..0000000 --- a/zsh/themes/takashiyoshida.zsh-theme +++ /dev/null @@ -1,27 +0,0 @@ -# -# PROMPT -# -PROMPT_BRACKET_BEGIN='%{$fg_bold[white]%}[' -PROMPT_HOST='%{$fg_bold[cyan]%}%m' -PROMPT_SEPARATOR='%{$reset_color%}:' -PROMPT_DIR='%{$fg_bold[yellow]%}%c' -PROMPT_BRACKET_END='%{$fg_bold[white]%}]' - -PROMPT_USER='%{$fg_bold[white]%}%n' -PROMPT_SIGN='%{$reset_color%}%#' - -GIT_PROMPT_INFO='$(git_prompt_info)' - -# My current prompt looks like: -# [host:current_dir] (git_prompt_info) -# [username]% -PROMPT="${PROMPT_BRACKET_BEGIN}${PROMPT_HOST}${PROMPT_SEPARATOR}${PROMPT_DIR}${PROMPT_BRACKET_END}${GIT_PROMPT_INFO} -${PROMPT_BRACKET_BEGIN}${PROMPT_USER}${PROMPT_BRACKET_END}${PROMPT_SIGN} " - -# -# Git repository -# -ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!" -ZSH_THEME_GIT_PROMPT_CLEAN='' diff --git a/zsh/themes/theunraveler.zsh-theme b/zsh/themes/theunraveler.zsh-theme deleted file mode 100644 index 4eec8e8..0000000 --- a/zsh/themes/theunraveler.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -# Comment - -ZSH_THEME_GIT_PROMPT_PREFIX=' (git:' -ZSH_THEME_GIT_PROMPT_SUFFIX=')' - -PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}' \ No newline at end of file diff --git a/zsh/themes/thomasjbradley.zsh-theme b/zsh/themes/thomasjbradley.zsh-theme deleted file mode 100644 index 857301d..0000000 --- a/zsh/themes/thomasjbradley.zsh-theme +++ /dev/null @@ -1,29 +0,0 @@ -function prompt_char { - git branch >/dev/null 2>/dev/null && echo '±' && return - hg root >/dev/null 2>/dev/null && echo '☿' && return - echo '○' -} - -function virtualenv_info { - [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' -} - -function hg_prompt_info { - hg prompt --angle-brackets "\ -< on %{$fg[magenta]%}%{$reset_color%}>\ -< at %{$fg[yellow]%}%{$reset_color%}>\ -%{$fg[green]%}%{$reset_color%}< -patches: >" 2>/dev/null -} - -PROMPT=' -%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info) -$(virtualenv_info)$(prompt_char) ' - -ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!" -ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?" -ZSH_THEME_GIT_PROMPT_CLEAN="" - -. ~/bin/dotfiles/zsh/aliases diff --git a/zsh/themes/tonotdo.zsh-theme b/zsh/themes/tonotdo.zsh-theme deleted file mode 100644 index a640703..0000000 --- a/zsh/themes/tonotdo.zsh-theme +++ /dev/null @@ -1,12 +0,0 @@ -PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}➜%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» ' -RPROMPT='[%*]' - -# git theming -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}✗%{$fg_bold[blue]%})" - -# LS colors, made with http://geoff.greer.fm/lscolors/ -export LSCOLORS="Gxfxcxdxbxegedabagacad" -export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' \ No newline at end of file diff --git a/zsh/themes/wezm+.zsh-theme b/zsh/themes/wezm+.zsh-theme deleted file mode 100644 index fee3eb0..0000000 --- a/zsh/themes/wezm+.zsh-theme +++ /dev/null @@ -1,7 +0,0 @@ -PROMPT='%{${fg_bold[yellow]}%}%n%{$reset_color%}%{${fg[yellow]}%}@%m%{$reset_color%} $(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} ' -RPROMPT='%{$fg[green]%}%~%{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}(" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/zsh/themes/wezm.zsh-theme b/zsh/themes/wezm.zsh-theme deleted file mode 100644 index 1881343..0000000 --- a/zsh/themes/wezm.zsh-theme +++ /dev/null @@ -1,7 +0,0 @@ -PROMPT='$(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} ' -RPROMPT='%{$fg[green]%}%~%{$reset_color%}' - -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}(" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}⚡%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/zsh/themes/xiong-chiamiov-plus.zsh-theme b/zsh/themes/xiong-chiamiov-plus.zsh-theme deleted file mode 100644 index 095dae2..0000000 --- a/zsh/themes/xiong-chiamiov-plus.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -# user, host, full path, and time/date -# on two lines for easier vgrepping -# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 -PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} -%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(git_prompt_info)>%{\e[0m%}%b ' -PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' diff --git a/zsh/themes/xiong-chiamiov.zsh-theme b/zsh/themes/xiong-chiamiov.zsh-theme deleted file mode 100644 index 7c4c2e4..0000000 --- a/zsh/themes/xiong-chiamiov.zsh-theme +++ /dev/null @@ -1,6 +0,0 @@ -# user, host, full path, and time/date -# on two lines for easier vgrepping -# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 -PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} -%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]>%{\e[0m%}%b ' -PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' diff --git a/zsh/zsh.sh b/zsh/zsh.sh deleted file mode 100644 index da88086..0000000 --- a/zsh/zsh.sh +++ /dev/null @@ -1,15 +0,0 @@ -# Initializes Oh My Zsh - -# add a function path -fpath=($ZSH/functions $fpath) - -# Load all of the config files in ~/oh-my-zsh that end in .zsh -# TIP: Add files you don't want in git to .gitignore -for config_file ($ZSH/lib/*.zsh) source $config_file - -# Load all of your custom configurations from custom/ -for config_file ($ZSH/custom/*.zsh) source $config_file - -# Load all of the plugins that were defined in ~/.zshrc -plugin=${plugin:=()} -for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh