Permalink
Browse files

Merge branch 'master' into custom

Conflicts:
	.gitignore
	lib/misc.zsh
	plugins/osx/osx.plugin.zsh
  • Loading branch information...
gwjo committed Aug 3, 2011
2 parents b6d2f3c + a738ca9 commit f42deeb3590467a0171bea82379c9107d2b67eb0
Showing with 2,098 additions and 111 deletions.
  1. +1 −1 .gitignore
  2. +0 −1 lib/aliases.zsh
  3. +3 −0 lib/edit-command-line.zsh
  4. +0 −35 lib/functions.zsh
  5. +3 −1 lib/git.zsh
  6. +1 −0 lib/key-bindings.zsh
  7. +8 −0 lib/spectrum.zsh
  8. +76 −0 plugins/archlinux/archlinux.plugin.zsh
  9. +34 −0 plugins/bundler/bundler.plugin.zsh
  10. +32 −0 plugins/cake/cake.plugin.zsh
  11. +2 −0 plugins/cloudapp/cloudapp.plugin.zsh
  12. +60 −0 plugins/cloudapp/cloudapp.rb
  13. +222 −0 plugins/django/django.plugin.zsh
  14. +8 −0 plugins/extract/_extract
  15. +85 −0 plugins/extract/extract.plugin.zsh
  16. +34 −0 plugins/gas/_gas
  17. +4 −0 plugins/git/git.plugin.zsh
  18. +7 −0 plugins/history-substring-search/README
  19. +12 −0 plugins/history-substring-search/history-substring-search.plugin.zsh
  20. +642 −0 plugins/history-substring-search/history-substring-search.zsh
  21. +9 −0 plugins/kate/kate.plugin.zsh
  22. +174 −0 plugins/knife/_knife
  23. +5 −0 plugins/osx/_man-preview
  24. +84 −49 plugins/osx/osx.plugin.zsh
  25. +0 −11 plugins/rails3/rails3.plugin.zsh
  26. +1 −1 plugins/redis-cli/_redis-cli
  27. +2 −2 plugins/svn/svn.plugin.zsh
  28. +280 −0 plugins/taskwarrior/_task
  29. +21 −0 plugins/taskwarrior/taskwarrior.plugin.zsh
  30. +6 −6 templates/zshrc.zsh-template
  31. +20 −0 themes/blinks.zsh-theme
  32. +14 −0 themes/dpoggi.zsh-theme
  33. +15 −1 themes/lukerandall.zsh-theme
  34. +2 −2 themes/philips.zsh-theme
  35. +96 −0 themes/sunrise.zsh-theme
  36. +18 −0 themes/superjarin.zsh-theme
  37. +9 −0 themes/terminalparty.zsh-theme
  38. +107 −0 themes/wedisagree.zsh-theme
  39. +1 −1 tools/upgrade.sh
View
@@ -5,4 +5,4 @@ projects.zsh
!custom/example
!custom/example.zsh
cache
-
+*.swp
View
@@ -22,4 +22,3 @@ alias sl=ls # often screw this up
alias afind='ack-grep -il'
-alias x=extract
@@ -0,0 +1,3 @@
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line
View
@@ -15,38 +15,3 @@ function take() {
cd $1
}
-function extract() {
- unset REMOVE_ARCHIVE
-
- if test "$1" = "-r"; then
- REMOVE=1
- shift
- fi
- if [[ -f $1 ]]; then
- case $1 in
- *.tar.bz2) tar xvjf $1;;
- *.tar.gz) tar xvzf $1;;
- *.tar.xz) tar xvJf $1;;
- *.tar.lzma) tar --lzma -xvf $1;;
- *.bz2) bunzip $1;;
- *.rar) unrar x $1;;
- *.gz) gunzip $1;;
- *.tar) tar xvf $1;;
- *.tbz2) tar xvjf $1;;
- *.tgz) tar xvzf $1;;
- *.zip) unzip $1;;
- *.Z) uncompress $1;;
- *.7z) 7z x $1;;
- *) echo "'$1' cannot be extracted via >extract<";;
- esac
-
- if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
- echo removing "$1";
- /bin/rm "$1";
- fi
-
- else
- echo "'$1' is not a valid file"
- fi
-}
-
View
@@ -52,7 +52,9 @@ git_prompt_status() {
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
fi
- if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
+ if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+ STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+ elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
fi
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
View
@@ -21,6 +21,7 @@ bindkey ' ' magic-space # also do history expansion on space
bindkey '^[[Z' reverse-menu-complete
# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
+bindkey '^?' backward-delete-char
bindkey "^[[3~" delete-char
bindkey "^[3;5~" delete-char
bindkey "\e[3~" delete-char
View
@@ -18,3 +18,11 @@ for color in {000..255}; do
FG[$color]="%{[38;5;${color}m%}"
BG[$color]="%{[48;5;${color}m%}"
done
+
+# Show all 256 colors with color number
+function spectrum_ls() {
+ for code in {000..255}; do
+ print -P -- "$code: %F{$code}Test%f"
+ done
+}
+
@@ -0,0 +1,76 @@
+# Archlinux zsh aliases and functions
+# Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins
+
+# Look for yaourt, and add some useful functions if we have it.
+if [[ -x `which yaourt` ]]; then
+ upgrade () {
+ yaourt -Syu
+ }
+ alias yaconf='yaourt -C' # Fix all configuration files with vimdiff
+ # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
+ alias yaupg='yaourt -Syu' # Synchronize with repositories before upgrading packages that are out of date on the local system.
+ alias yain='yaourt -S' # Install specific package(s) from the repositories
+ alias yains='yaourt -U' # Install specific package not from the repositories but from a file
+ alias yare='yaourt -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies
+ alias yarem='yaourt -Rns' # Remove the specified package(s), its configuration(s) and unneeded dependencies
+ alias yarep='yaourt -Si' # Display information about a given package in the repositories
+ alias yareps='yaourt -Ss' # Search for package(s) in the repositories
+ alias yaloc='yaourt -Qi' # Display information about a given package in the local database
+ alias yalocs='yaourt -Qs' # Search for package(s) in the local database
+ # Additional yaourt alias examples
+ if [[ -x `which abs` ]]; then
+ alias yaupd='yaourt -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories
+ else
+ alias yaupd='yaourt -Sy' # Update and refresh the local package and ABS databases against repositories
+ fi
+ alias yainsd='yaourt -S --asdeps' # Install given package(s) as dependencies of another package
+ alias yamir='yaourt -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
+else
+ upgrade() {
+ sudo pacman -Syu
+ }
+fi
+
+# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
+alias pacupg='sudo pacman -Syu' # Synchronize with repositories before upgrading packages that are out of date on the local system.
+alias pacin='sudo pacman -S' # Install specific package(s) from the repositories
+alias pacins='sudo pacman -U' # Install specific package not from the repositories but from a file
+alias pacre='sudo pacman -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies
+alias pacrem='sudo pacman -Rns' # Remove the specified package(s), its configuration(s) and unneeded dependencies
+alias pacrep='pacman -Si' # Display information about a given package in the repositories
+alias pacreps='pacman -Ss' # Search for package(s) in the repositories
+alias pacloc='pacman -Qi' # Display information about a given package in the local database
+alias paclocs='pacman -Qs' # Search for package(s) in the local database
+# Additional pacman alias examples
+if [[ -x `which abs` ]]; then
+ alias pacupd='sudo pacman -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories
+else
+ alias pacupd='sudo pacman -Sy' # Update and refresh the local package and ABS databases against repositories
+fi
+alias pacinsd='sudo pacman -S --asdeps' # Install given package(s) as dependencies of another package
+alias pacmir='sudo pacman -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
+
+# https://bbs.archlinux.org/viewtopic.php?id=93683
+paclist() {
+ sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
+}
+
+alias paclsorphans='sudo pacman -Qdt'
+alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+
+pacdisowned() {
+ tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
+ db=$tmp/db
+ fs=$tmp/fs
+
+ mkdir "$tmp"
+ trap 'rm -rf "$tmp"' EXIT
+
+ pacman -Qlq | sort -u > "$db"
+
+ find /bin /etc /lib /sbin /usr \
+ ! -name lost+found \
+ \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
+
+ comm -23 "$fs" "$db"
+}
@@ -1,3 +1,37 @@
alias be="bundle exec"
alias bi="bundle install"
+alias bl="bundle list"
alias bu="bundle update"
+alias bp="bundle package"
+
+# The following is based on https://github.com/gma/bundler-exec
+
+bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+
+## Functions
+
+_bundler-installed() {
+ which bundle > /dev/null 2>&1
+}
+
+_within-bundled-project() {
+ local check_dir=$PWD
+ while [ "$(dirname $check_dir)" != "/" ]; do
+ [ -f "$check_dir/Gemfile" ] && return
+ check_dir="$(dirname $check_dir)"
+ done
+ false
+}
+
+_run-with-bundler() {
+ if _bundler-installed && _within-bundled-project; then
+ bundle exec $@
+ else
+ $@
+ fi
+}
+
+## Main program
+for cmd in $bundled_commands; do
+ alias $cmd="_run-with-bundler $cmd"
+done
@@ -0,0 +1,32 @@
+# Set this to 1 if you want to cache the tasks
+cache_task_list=1
+
+# Cache filename
+cache_file='.cake_task_cache'
+
+_cake_does_target_list_need_generating () {
+
+ if [ $cache_task_list -eq 0 ]; then
+ return 1;
+ fi
+
+ if [ ! -f $cache_file ]; then return 0;
+ else
+ accurate=$(stat -f%m $cache_file)
+ changed=$(stat -f%m Cakefile)
+ return $(expr $accurate '>=' $changed)
+ fi
+}
+
+_cake () {
+ if [ -f Cakefile ]; then
+ if _cake_does_target_list_need_generating; then
+ cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cache_file
+ compadd `cat $cache_file`
+ else
+ compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'`
+ fi
+ fi
+}
+
+compdef _cake cake
@@ -0,0 +1,2 @@
+#!/bin/zsh
+alias cloudapp=$ZSH/plugins/cloudapp/cloudapp.rb
@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+#
+# cloudapp
+# Zach Holman / @holman
+#
+# Uploads a file from the command line to CloudApp, drops it into your
+# clipboard (on a Mac, at least).
+#
+# Example:
+#
+# cloudapp drunk-blake.png
+#
+# This requires Aaron Russell's cloudapp_api gem:
+#
+# gem install cloudapp_api
+#
+# Requires you set your CloudApp credentials in ~/.cloudapp as a simple file of:
+#
+# email
+# password
+
+require 'rubygems'
+begin
+ require 'cloudapp_api'
+rescue LoadError
+ puts "You need to install cloudapp_api: gem install cloudapp_api"
+ exit!(1)
+end
+
+config_file = "#{ENV['HOME']}/.cloudapp"
+unless File.exist?(config_file)
+ puts "You need to type your email and password (one per line) into "+
+ "`~/.cloudapp`"
+ exit!(1)
+end
+
+email,password = File.read(config_file).split("\n")
+
+class HTTParty::Response
+ # Apparently HTTPOK.ok? IS NOT OKAY WTFFFFFFFFFFUUUUUUUUUUUUUU
+ # LETS MONKEY PATCH IT I FEEL OKAY ABOUT IT
+ def ok? ; true end
+end
+
+if ARGV[0].nil?
+ puts "You need to specify a file to upload."
+ exit!(1)
+end
+
+CloudApp.authenticate(email,password)
+url = CloudApp::Item.create(:upload, {:file => ARGV[0]}).url
+
+# Say it for good measure.
+puts "Uploaded to #{url}."
+
+# Get the embed link.
+url = "#{url}/#{ARGV[0].split('/').last}"
+
+# Copy it to your (Mac's) clipboard.
+`echo '#{url}' | tr -d "\n" | pbcopy`
Oops, something went wrong.

0 comments on commit f42deeb

Please sign in to comment.