mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2025-12-26 02:12:33 +01:00
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into illenseer
This commit is contained in:
Nils Pascal Illenseer
commit
08f748dd23
23 changed files with 1287 additions and 114 deletions
7
README
Normal file
7
README
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
To activate this script, load it into an interactive ZSH session:
|
||||||
|
|
||||||
|
% source history-substring-search.zsh
|
||||||
|
|
||||||
|
See the "history-substring-search.zsh" file for more information:
|
||||||
|
|
||||||
|
% sed -n '2,/^$/s/^#//p' history-substring-search.zsh | more
|
||||||
12
history-substring-search.plugin.zsh
Normal file
12
history-substring-search.plugin.zsh
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
# This file integrates the history-substring-search script into oh-my-zsh.
|
||||||
|
|
||||||
|
source "$ZSH/plugins/history-substring-search/history-substring-search.zsh"
|
||||||
|
|
||||||
|
if test "$CASE_SENSITIVE" = true; then
|
||||||
|
unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$DISABLE_COLOR" = true; then
|
||||||
|
unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
|
||||||
|
fi
|
||||||
642
history-substring-search.zsh
Normal file
642
history-substring-search.zsh
Normal file
|
|
@ -0,0 +1,642 @@
|
||||||
|
#!/usr/bin/env zsh
|
||||||
|
#
|
||||||
|
# This is a clean-room implementation of the Fish[1] shell's history search
|
||||||
|
# feature, where you can type in any part of any previously entered command
|
||||||
|
# and press the UP and DOWN arrow keys to cycle through the matching commands.
|
||||||
|
#
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# Usage
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# 1. Load this script into your interactive ZSH session:
|
||||||
|
#
|
||||||
|
# % source history-substring-search.zsh
|
||||||
|
#
|
||||||
|
# If you want to use the zsh-syntax-highlighting[6] script along with this
|
||||||
|
# script, then make sure that you load it *before* you load this script:
|
||||||
|
#
|
||||||
|
# % source zsh-syntax-highlighting.zsh
|
||||||
|
# % source history-substring-search.zsh
|
||||||
|
#
|
||||||
|
# 2. Type any part of any previous command and then:
|
||||||
|
#
|
||||||
|
# * Press the UP arrow key to select the nearest command that (1) contains
|
||||||
|
# your query and (2) is older than the current command in the command
|
||||||
|
# history.
|
||||||
|
#
|
||||||
|
# * Press the DOWN arrow key to select the nearest command that (1)
|
||||||
|
# contains your query and (2) is newer than the current command in the
|
||||||
|
# command history.
|
||||||
|
#
|
||||||
|
# * Press ^U (the Control and U keys simultaneously) to abort the search.
|
||||||
|
#
|
||||||
|
# 3. If a matching command spans more than one line of text, press the LEFT
|
||||||
|
# arrow key to move the cursor away from the end of the command, and then:
|
||||||
|
#
|
||||||
|
# * Press the UP arrow key to move the cursor to the line above. When the
|
||||||
|
# cursor reaches the first line of the command, pressing the UP arrow
|
||||||
|
# key again will cause this script to perform another search.
|
||||||
|
#
|
||||||
|
# * Press the DOWN arrow key to move the cursor to the line below. When
|
||||||
|
# the cursor reaches the last line of the command, pressing the DOWN
|
||||||
|
# arrow key again will cause this script to perform another search.
|
||||||
|
#
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# Configuration
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# This script defines the following global variables. You may override their
|
||||||
|
# default values only after having loaded this script into your ZSH session.
|
||||||
|
#
|
||||||
|
# * HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND is a global variable that defines
|
||||||
|
# how the query should be highlighted inside a matching command. Its default
|
||||||
|
# value causes this script to highlight using bold, white text on a magenta
|
||||||
|
# background. See the "Character Highlighting" section in the zshzle(1) man
|
||||||
|
# page to learn about the kinds of values you may assign to this variable.
|
||||||
|
#
|
||||||
|
# * HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND is a global variable that
|
||||||
|
# defines how the query should be highlighted when no commands in the
|
||||||
|
# history match it. Its default value causes this script to highlight using
|
||||||
|
# bold, white text on a red background. See the "Character Highlighting"
|
||||||
|
# section in the zshzle(1) man page to learn about the kinds of values you
|
||||||
|
# may assign to this variable.
|
||||||
|
#
|
||||||
|
# * HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS is a global variable that defines
|
||||||
|
# how the command history will be searched for your query. Its default value
|
||||||
|
# causes this script to perform a case-insensitive search. See the "Globbing
|
||||||
|
# Flags" section in the zshexpn(1) man page to learn about the kinds of
|
||||||
|
# values you may assign to this variable.
|
||||||
|
#
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# History
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# This script was originally written by Peter Stephenson[2], who published it
|
||||||
|
# to the ZSH users mailing list (thereby making it public domain) in September
|
||||||
|
# 2009. It was later revised by Guido van Steen and released under the BSD
|
||||||
|
# license (see below) as part of the fizsh[3] project in January 2011.
|
||||||
|
#
|
||||||
|
# It was later extracted from fizsh[3] release 1.0.1, refactored heavily, and
|
||||||
|
# repackaged as both an oh-my-zsh plugin[4] and as an independently loadable
|
||||||
|
# ZSH script[5] by Suraj N. Kurapati in 2011.
|
||||||
|
#
|
||||||
|
# It was further developed[4] by Guido van Steen, Suraj N. Kurapati, Sorin
|
||||||
|
# Ionescu, and Vincent Guerci in 2011.
|
||||||
|
#
|
||||||
|
# [1]: http://fishshell.com
|
||||||
|
# [2]: http://www.zsh.org/mla/users/2009/msg00818.html
|
||||||
|
# [3]: http://sourceforge.net/projects/fizsh/
|
||||||
|
# [4]: https://github.com/robbyrussell/oh-my-zsh/pull/215
|
||||||
|
# [5]: https://github.com/sunaku/zsh-history-substring-search
|
||||||
|
# [6]: https://github.com/nicoulaj/zsh-syntax-highlighting
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
#
|
||||||
|
# Copyright (c) 2009 Peter Stephenson
|
||||||
|
# Copyright (c) 2011 Guido van Steen
|
||||||
|
# Copyright (c) 2011 Suraj N. Kurapati
|
||||||
|
# Copyright (c) 2011 Sorin Ionescu
|
||||||
|
# Copyright (c) 2011 Vincent Guerci
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# Redistribution and use in source and binary forms, with or without
|
||||||
|
# modification, are permitted provided that the following conditions are met:
|
||||||
|
#
|
||||||
|
# * Redistributions of source code must retain the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer.
|
||||||
|
#
|
||||||
|
# * Redistributions in binary form must reproduce the above
|
||||||
|
# copyright notice, this list of conditions and the following
|
||||||
|
# disclaimer in the documentation and/or other materials provided
|
||||||
|
# with the distribution.
|
||||||
|
#
|
||||||
|
# * Neither the name of the FIZSH nor the names of its contributors
|
||||||
|
# may be used to endorse or promote products derived from this
|
||||||
|
# software without specific prior written permission.
|
||||||
|
#
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||||
|
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
# POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# configuration variables
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
|
||||||
|
HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# the main ZLE widgets
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
function history-substring-search-up() {
|
||||||
|
_history-substring-search-begin
|
||||||
|
|
||||||
|
_history-substring-search-up-history ||
|
||||||
|
_history-substring-search-up-buffer ||
|
||||||
|
_history-substring-search-up-search
|
||||||
|
|
||||||
|
_history-substring-search-end
|
||||||
|
}
|
||||||
|
|
||||||
|
function history-substring-search-down() {
|
||||||
|
_history-substring-search-begin
|
||||||
|
|
||||||
|
_history-substring-search-down-history ||
|
||||||
|
_history-substring-search-down-buffer ||
|
||||||
|
_history-substring-search-down-search
|
||||||
|
|
||||||
|
_history-substring-search-end
|
||||||
|
}
|
||||||
|
|
||||||
|
zle -N history-substring-search-up
|
||||||
|
zle -N history-substring-search-down
|
||||||
|
|
||||||
|
bindkey '\e[A' history-substring-search-up
|
||||||
|
bindkey '\e[B' history-substring-search-down
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# implementation details
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
setopt extendedglob
|
||||||
|
zmodload -F zsh/parameter
|
||||||
|
|
||||||
|
#
|
||||||
|
# We have to "override" some keys and widgets if the
|
||||||
|
# zsh-syntax-highlighting plugin has not been loaded:
|
||||||
|
#
|
||||||
|
# https://github.com/nicoulaj/zsh-syntax-highlighting
|
||||||
|
#
|
||||||
|
if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
|
||||||
|
#
|
||||||
|
# Dummy implementation of _zsh_highlight()
|
||||||
|
# that simply removes existing highlights
|
||||||
|
#
|
||||||
|
function _zsh_highlight() {
|
||||||
|
region_highlight=()
|
||||||
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Remove existing highlights when the user
|
||||||
|
# inserts printable characters into $BUFFER
|
||||||
|
#
|
||||||
|
function ordinary-key-press() {
|
||||||
|
if [[ $KEYS == [[:print:]] ]]; then
|
||||||
|
region_highlight=()
|
||||||
|
fi
|
||||||
|
zle .self-insert
|
||||||
|
}
|
||||||
|
zle -N self-insert ordinary-key-press
|
||||||
|
|
||||||
|
#
|
||||||
|
# Override ZLE widgets to invoke _zsh_highlight()
|
||||||
|
#
|
||||||
|
# https://github.com/nicoulaj/zsh-syntax-highlighting/blob/
|
||||||
|
# bb7fcb79fad797a40077bebaf6f4e4a93c9d8163/zsh-syntax-highlighting.zsh#L121
|
||||||
|
#
|
||||||
|
#--------------8<-------------------8<-------------------8<-----------------
|
||||||
|
#
|
||||||
|
# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# Redistribution and use in source and binary forms, with or without
|
||||||
|
# modification, are permitted provided that the following conditions are
|
||||||
|
# met:
|
||||||
|
#
|
||||||
|
# * Redistributions of source code must retain the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer.
|
||||||
|
#
|
||||||
|
# * Redistributions in binary form must reproduce the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer in the
|
||||||
|
# documentation and/or other materials provided with the distribution.
|
||||||
|
#
|
||||||
|
# * Neither the name of the zsh-syntax-highlighting contributors nor the
|
||||||
|
# names of its contributors may be used to endorse or promote products
|
||||||
|
# derived from this software without specific prior written permission.
|
||||||
|
#
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
||||||
|
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||||
|
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
|
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||||
|
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
|
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
# Load ZSH module zsh/zleparameter, needed to override user defined widgets.
|
||||||
|
zmodload zsh/zleparameter 2>/dev/null || {
|
||||||
|
echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter, exiting.' >&2
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Override ZLE widgets to make them invoke _zsh_highlight.
|
||||||
|
for event in ${${(f)"$(zle -la)"}:#(_*|orig-*|.run-help|.which-command)}; do
|
||||||
|
if [[ "$widgets[$event]" == completion:* ]]; then
|
||||||
|
eval "zle -C orig-$event ${${${widgets[$event]}#*:}/:/ } ; $event() { builtin zle orig-$event && _zsh_highlight } ; zle -N $event"
|
||||||
|
else
|
||||||
|
case $event in
|
||||||
|
accept-and-menu-complete)
|
||||||
|
eval "$event() { builtin zle .$event && _zsh_highlight } ; zle -N $event"
|
||||||
|
;;
|
||||||
|
|
||||||
|
# The following widgets should NOT remove any previously
|
||||||
|
# applied highlighting. Therefore we do not remap them.
|
||||||
|
.forward-char|.backward-char|.up-line-or-history|.down-line-or-history)
|
||||||
|
;;
|
||||||
|
|
||||||
|
.*)
|
||||||
|
clean_event=$event[2,${#event}] # Remove the leading dot in the event name
|
||||||
|
case ${widgets[$clean_event]-} in
|
||||||
|
(completion|user):*)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
eval "$clean_event() { builtin zle $event && _zsh_highlight } ; zle -N $clean_event"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
unset event clean_event
|
||||||
|
#-------------->8------------------->8------------------->8-----------------
|
||||||
|
fi
|
||||||
|
|
||||||
|
function _history-substring-search-begin() {
|
||||||
|
_history_substring_search_move_cursor_eol=false
|
||||||
|
_history_substring_search_query_highlight=
|
||||||
|
|
||||||
|
#
|
||||||
|
# Continue using the previous $_history_substring_search_result by default,
|
||||||
|
# unless the current query was cleared or a new/different query was entered.
|
||||||
|
#
|
||||||
|
if [[ -z $BUFFER || $BUFFER != $_history_substring_search_result ]]; then
|
||||||
|
#
|
||||||
|
# For the purpose of highlighting we will also keep
|
||||||
|
# a version without doubly-escaped meta characters.
|
||||||
|
#
|
||||||
|
_history_substring_search_query=$BUFFER
|
||||||
|
|
||||||
|
#
|
||||||
|
# $BUFFER contains the text that is in the command-line currently.
|
||||||
|
# we put an extra "\\" before meta characters such as "\(" and "\)",
|
||||||
|
# so that they become "\\\(" and "\\\)".
|
||||||
|
#
|
||||||
|
_history_substring_search_query_escaped=${BUFFER//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Find all occurrences of the search query in the history file.
|
||||||
|
#
|
||||||
|
# (k) turns it an array of line numbers.
|
||||||
|
#
|
||||||
|
# (on) seems to remove duplicates, which are default
|
||||||
|
# options. They can be turned off by (ON).
|
||||||
|
#
|
||||||
|
_history_substring_search_matches=(${(kon)history[(R)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)*${_history_substring_search_query_escaped}*]})
|
||||||
|
|
||||||
|
#
|
||||||
|
# Define the range of values that $_history_substring_search_match_index
|
||||||
|
# can take: [0, $_history_substring_search_matches_count_plus].
|
||||||
|
#
|
||||||
|
_history_substring_search_matches_count=$#_history_substring_search_matches
|
||||||
|
_history_substring_search_matches_count_plus=$(( _history_substring_search_matches_count + 1 ))
|
||||||
|
_history_substring_search_matches_count_sans=$(( _history_substring_search_matches_count - 1 ))
|
||||||
|
|
||||||
|
#
|
||||||
|
# If $_history_substring_search_match_index is equal to
|
||||||
|
# $_history_substring_search_matches_count_plus, this indicates that we
|
||||||
|
# are beyond the beginning of $_history_substring_search_matches.
|
||||||
|
#
|
||||||
|
# If $_history_substring_search_match_index is equal to 0, this indicates
|
||||||
|
# that we are beyond the end of $_history_substring_search_matches.
|
||||||
|
#
|
||||||
|
# If we have initially pressed "up" we have to initialize
|
||||||
|
# $_history_substring_search_match_index to
|
||||||
|
# $_history_substring_search_matches_count_plus so that it will be
|
||||||
|
# decreased to $_history_substring_search_matches_count.
|
||||||
|
#
|
||||||
|
# If we have initially pressed "down" we have to initialize
|
||||||
|
# $_history_substring_search_match_index to
|
||||||
|
# $_history_substring_search_matches_count so that it will be increased to
|
||||||
|
# $_history_substring_search_matches_count_plus.
|
||||||
|
#
|
||||||
|
if [[ $WIDGET == history-substring-search-down ]]; then
|
||||||
|
_history_substring_search_match_index=$_history_substring_search_matches_count
|
||||||
|
else
|
||||||
|
_history_substring_search_match_index=$_history_substring_search_matches_count_plus
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function _history-substring-search-end() {
|
||||||
|
_history_substring_search_result=$BUFFER
|
||||||
|
|
||||||
|
# move the cursor to the end of the command line
|
||||||
|
if [[ $_history_substring_search_move_cursor_eol == true ]]; then
|
||||||
|
CURSOR=${#BUFFER}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# highlight command line using zsh-syntax-highlighting
|
||||||
|
_zsh_highlight
|
||||||
|
|
||||||
|
# highlight the search query inside the command line
|
||||||
|
if [[ -n $_history_substring_search_query_highlight && -n $_history_substring_search_query ]]; then
|
||||||
|
#
|
||||||
|
# The following expression yields a variable $MBEGIN, which
|
||||||
|
# indicates the begin position + 1 of the first occurrence
|
||||||
|
# of _history_substring_search_query_escaped in $BUFFER.
|
||||||
|
#
|
||||||
|
: ${(S)BUFFER##(#m$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)($_history_substring_search_query##)}
|
||||||
|
local begin=$(( MBEGIN - 1 ))
|
||||||
|
local end=$(( begin + $#_history_substring_search_query ))
|
||||||
|
region_highlight+=("$begin $end $_history_substring_search_query_highlight")
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For debugging purposes:
|
||||||
|
# zle -R "mn: "$_history_substring_search_match_index" m#: "${#_history_substring_search_matches}
|
||||||
|
# read -k -t 200 && zle -U $REPLY
|
||||||
|
|
||||||
|
# Exit successfully from the history-substring-search-* widgets.
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
function _history-substring-search-up-buffer() {
|
||||||
|
#
|
||||||
|
# Check if the UP arrow was pressed to move the cursor within a multi-line
|
||||||
|
# buffer. This amounts to three tests:
|
||||||
|
#
|
||||||
|
# 1. $#buflines -gt 1.
|
||||||
|
#
|
||||||
|
# 2. $CURSOR -ne $#BUFFER.
|
||||||
|
#
|
||||||
|
# 3. Check if we are on the first line of the current multi-line buffer.
|
||||||
|
# If so, pressing UP would amount to leaving the multi-line buffer.
|
||||||
|
#
|
||||||
|
# We check this by adding an extra "x" to $LBUFFER, which makes
|
||||||
|
# sure that xlbuflines is always equal to the number of lines
|
||||||
|
# until $CURSOR (including the line with the cursor on it).
|
||||||
|
#
|
||||||
|
local buflines XLBUFFER xlbuflines
|
||||||
|
buflines=(${(f)BUFFER})
|
||||||
|
XLBUFFER=$LBUFFER"x"
|
||||||
|
xlbuflines=(${(f)XLBUFFER})
|
||||||
|
|
||||||
|
if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xlbuflines -ne 1 ]]; then
|
||||||
|
zle up-line-or-history
|
||||||
|
return true
|
||||||
|
fi
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
function _history-substring-search-down-buffer() {
|
||||||
|
#
|
||||||
|
# Check if the DOWN arrow was pressed to move the cursor within a multi-line
|
||||||
|
# buffer. This amounts to three tests:
|
||||||
|
#
|
||||||
|
# 1. $#buflines -gt 1.
|
||||||
|
#
|
||||||
|
# 2. $CURSOR -ne $#BUFFER.
|
||||||
|
#
|
||||||
|
# 3. Check if we are on the last line of the current multi-line buffer.
|
||||||
|
# If so, pressing DOWN would amount to leaving the multi-line buffer.
|
||||||
|
#
|
||||||
|
# We check this by adding an extra "x" to $RBUFFER, which makes
|
||||||
|
# sure that xrbuflines is always equal to the number of lines
|
||||||
|
# from $CURSOR (including the line with the cursor on it).
|
||||||
|
#
|
||||||
|
local buflines XRBUFFER xrbuflines
|
||||||
|
buflines=(${(f)BUFFER})
|
||||||
|
XRBUFFER="x"$RBUFFER
|
||||||
|
xrbuflines=(${(f)XRBUFFER})
|
||||||
|
|
||||||
|
if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xrbuflines -ne 1 ]]; then
|
||||||
|
zle down-line-or-history
|
||||||
|
return true
|
||||||
|
fi
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
function _history-substring-search-up-history() {
|
||||||
|
#
|
||||||
|
# Behave like up in ZSH, except clear the $BUFFER
|
||||||
|
# when beginning of history is reached like in Fish.
|
||||||
|
#
|
||||||
|
if [[ -z $_history_substring_search_query ]]; then
|
||||||
|
|
||||||
|
# we have reached the absolute top of history
|
||||||
|
if [[ $HISTNO -eq 1 ]]; then
|
||||||
|
BUFFER=
|
||||||
|
|
||||||
|
# going up from somewhere below the top of history
|
||||||
|
else
|
||||||
|
zle up-history
|
||||||
|
fi
|
||||||
|
|
||||||
|
return true
|
||||||
|
fi
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
function _history-substring-search-down-history() {
|
||||||
|
#
|
||||||
|
# Behave like down-history in ZSH, except clear the
|
||||||
|
# $BUFFER when end of history is reached like in Fish.
|
||||||
|
#
|
||||||
|
if [[ -z $_history_substring_search_query ]]; then
|
||||||
|
|
||||||
|
# going down from the absolute top of history
|
||||||
|
if [[ $HISTNO -eq 1 && -z $BUFFER ]]; then
|
||||||
|
BUFFER=${history[1]}
|
||||||
|
_history_substring_search_move_cursor_eol=true
|
||||||
|
|
||||||
|
# going down from somewhere above the bottom of history
|
||||||
|
else
|
||||||
|
zle down-history
|
||||||
|
fi
|
||||||
|
|
||||||
|
return true
|
||||||
|
fi
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
function _history-substring-search-up-search() {
|
||||||
|
_history_substring_search_move_cursor_eol=true
|
||||||
|
|
||||||
|
#
|
||||||
|
# Highlight matches during history-substring-up-search:
|
||||||
|
#
|
||||||
|
# The following constants have been initialized in
|
||||||
|
# _history-substring-search-up/down-search():
|
||||||
|
#
|
||||||
|
# $_history_substring_search_matches is the current list of matches
|
||||||
|
# $_history_substring_search_matches_count is the current number of matches
|
||||||
|
# $_history_substring_search_matches_count_plus is the current number of matches + 1
|
||||||
|
# $_history_substring_search_matches_count_sans is the current number of matches - 1
|
||||||
|
# $_history_substring_search_match_index is the index of the current match
|
||||||
|
#
|
||||||
|
# The range of values that $_history_substring_search_match_index can take
|
||||||
|
# is: [0, $_history_substring_search_matches_count_plus]. A value of 0
|
||||||
|
# indicates that we are beyond the end of
|
||||||
|
# $_history_substring_search_matches. A value of
|
||||||
|
# $_history_substring_search_matches_count_plus indicates that we are beyond
|
||||||
|
# the beginning of $_history_substring_search_matches.
|
||||||
|
#
|
||||||
|
# In _history-substring-search-up-search() the initial value of
|
||||||
|
# $_history_substring_search_match_index is
|
||||||
|
# $_history_substring_search_matches_count_plus. This value is set in
|
||||||
|
# _history-substring-search-begin(). _history-substring-search-up-search()
|
||||||
|
# will initially decrease it to $_history_substring_search_matches_count.
|
||||||
|
#
|
||||||
|
if [[ $_history_substring_search_match_index -ge 2 ]]; then
|
||||||
|
#
|
||||||
|
# Highlight the next match:
|
||||||
|
#
|
||||||
|
# 1. Decrease the value of $_history_substring_search_match_index.
|
||||||
|
#
|
||||||
|
# 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
# to highlight the current buffer.
|
||||||
|
#
|
||||||
|
(( _history_substring_search_match_index-- ))
|
||||||
|
BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
|
||||||
|
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
|
||||||
|
elif [[ $_history_substring_search_match_index -eq 1 ]]; then
|
||||||
|
#
|
||||||
|
# We will move beyond the end of $_history_substring_search_matches:
|
||||||
|
#
|
||||||
|
# 1. Decrease the value of $_history_substring_search_match_index.
|
||||||
|
#
|
||||||
|
# 2. Save the current buffer in $_history_substring_search_old_buffer,
|
||||||
|
# so that it can be retrieved by
|
||||||
|
# _history-substring-search-down-search() later.
|
||||||
|
#
|
||||||
|
# 3. Make $BUFFER equal to $_history_substring_search_query.
|
||||||
|
#
|
||||||
|
# 4. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
|
||||||
|
# to highlight the current buffer.
|
||||||
|
#
|
||||||
|
(( _history_substring_search_match_index-- ))
|
||||||
|
_history_substring_search_old_buffer=$BUFFER
|
||||||
|
BUFFER=$_history_substring_search_query
|
||||||
|
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
|
||||||
|
|
||||||
|
elif [[ $_history_substring_search_match_index -eq $_history_substring_search_matches_count_plus ]]; then
|
||||||
|
#
|
||||||
|
# We were beyond the beginning of $_history_substring_search_matches but
|
||||||
|
# UP makes us move back to $_history_substring_search_matches:
|
||||||
|
#
|
||||||
|
# 1. Decrease the value of $_history_substring_search_match_index.
|
||||||
|
#
|
||||||
|
# 2. Restore $BUFFER from $_history_substring_search_old_buffer.
|
||||||
|
#
|
||||||
|
# 3. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
# to highlight the current buffer.
|
||||||
|
#
|
||||||
|
(( _history_substring_search_match_index-- ))
|
||||||
|
BUFFER=$_history_substring_search_old_buffer
|
||||||
|
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function _history-substring-search-down-search() {
|
||||||
|
_history_substring_search_move_cursor_eol=true
|
||||||
|
|
||||||
|
#
|
||||||
|
# Highlight matches during history-substring-up-search:
|
||||||
|
#
|
||||||
|
# The following constants have been initialized in
|
||||||
|
# _history-substring-search-up/down-search():
|
||||||
|
#
|
||||||
|
# $_history_substring_search_matches is the current list of matches
|
||||||
|
# $_history_substring_search_matches_count is the current number of matches
|
||||||
|
# $_history_substring_search_matches_count_plus is the current number of matches + 1
|
||||||
|
# $_history_substring_search_matches_count_sans is the current number of matches - 1
|
||||||
|
# $_history_substring_search_match_index is the index of the current match
|
||||||
|
#
|
||||||
|
# The range of values that $_history_substring_search_match_index can take
|
||||||
|
# is: [0, $_history_substring_search_matches_count_plus]. A value of 0
|
||||||
|
# indicates that we are beyond the end of
|
||||||
|
# $_history_substring_search_matches. A value of
|
||||||
|
# $_history_substring_search_matches_count_plus indicates that we are beyond
|
||||||
|
# the beginning of $_history_substring_search_matches.
|
||||||
|
#
|
||||||
|
# In _history-substring-search-down-search() the initial value of
|
||||||
|
# $_history_substring_search_match_index is
|
||||||
|
# $_history_substring_search_matches_count. This value is set in
|
||||||
|
# _history-substring-search-begin().
|
||||||
|
# _history-substring-search-down-search() will initially increase it to
|
||||||
|
# $_history_substring_search_matches_count_plus.
|
||||||
|
#
|
||||||
|
if [[ $_history_substring_search_match_index -le $_history_substring_search_matches_count_sans ]]; then
|
||||||
|
#
|
||||||
|
# Highlight the next match:
|
||||||
|
#
|
||||||
|
# 1. Increase $_history_substring_search_match_index by 1.
|
||||||
|
#
|
||||||
|
# 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
# to highlight the current buffer.
|
||||||
|
#
|
||||||
|
(( _history_substring_search_match_index++ ))
|
||||||
|
BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
|
||||||
|
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
|
||||||
|
elif [[ $_history_substring_search_match_index -eq $_history_substring_search_matches_count ]]; then
|
||||||
|
#
|
||||||
|
# We will move beyond the beginning of $_history_substring_search_matches:
|
||||||
|
#
|
||||||
|
# 1. Increase $_history_substring_search_match_index by 1.
|
||||||
|
#
|
||||||
|
# 2. Save the current buffer in $_history_substring_search_old_buffer, so
|
||||||
|
# that it can be retrieved by _history-substring-search-up-search()
|
||||||
|
# later.
|
||||||
|
#
|
||||||
|
# 3. Make $BUFFER equal to $_history_substring_search_query.
|
||||||
|
#
|
||||||
|
# 4. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
|
||||||
|
# to highlight the current buffer.
|
||||||
|
#
|
||||||
|
(( _history_substring_search_match_index++ ))
|
||||||
|
_history_substring_search_old_buffer=$BUFFER
|
||||||
|
BUFFER=$_history_substring_search_query
|
||||||
|
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
|
||||||
|
|
||||||
|
elif [[ $_history_substring_search_match_index -eq 0 ]]; then
|
||||||
|
#
|
||||||
|
# We were beyond the end of $_history_substring_search_matches but DOWN
|
||||||
|
# makes us move back to the $_history_substring_search_matches:
|
||||||
|
#
|
||||||
|
# 1. Increase $_history_substring_search_match_index by 1.
|
||||||
|
#
|
||||||
|
# 2. Restore $BUFFER from $_history_substring_search_old_buffer.
|
||||||
|
#
|
||||||
|
# 3. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
# to highlight the current buffer.
|
||||||
|
#
|
||||||
|
(( _history_substring_search_match_index++ ))
|
||||||
|
BUFFER=$_history_substring_search_old_buffer
|
||||||
|
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
|
||||||
|
# vim: ft=zsh sw=2 ts=2 et
|
||||||
|
|
@ -22,4 +22,3 @@ alias sl=ls # often screw this up
|
||||||
|
|
||||||
alias afind='ack-grep -il'
|
alias afind='ack-grep -il'
|
||||||
|
|
||||||
alias x=extract
|
|
||||||
|
|
|
||||||
|
|
@ -15,38 +15,3 @@ function take() {
|
||||||
cd $1
|
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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ bindkey ' ' magic-space # also do history expansion on space
|
||||||
bindkey '^[[Z' reverse-menu-complete
|
bindkey '^[[Z' reverse-menu-complete
|
||||||
|
|
||||||
# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
|
# 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~" delete-char
|
||||||
bindkey "^[3;5~" delete-char
|
bindkey "^[3;5~" delete-char
|
||||||
bindkey "\e[3~" delete-char
|
bindkey "\e[3~" delete-char
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@ setopt long_list_jobs
|
||||||
|
|
||||||
## pager
|
## pager
|
||||||
export PAGER=less
|
export PAGER=less
|
||||||
export LC_CTYPE=en_US.UTF-8
|
export LC_CTYPE=$LANG
|
||||||
|
|
|
||||||
|
|
@ -18,3 +18,11 @@ for color in {000..255}; do
|
||||||
FG[$color]="%{[38;5;${color}m%}"
|
FG[$color]="%{[38;5;${color}m%}"
|
||||||
BG[$color]="%{[48;5;${color}m%}"
|
BG[$color]="%{[48;5;${color}m%}"
|
||||||
done
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,30 @@
|
||||||
# Archlinux zsh aliases and functions for zsh
|
# Archlinux zsh aliases and functions
|
||||||
|
# Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins
|
||||||
# Aliases ###################################################################
|
|
||||||
|
|
||||||
# Look for yaourt, and add some useful functions if we have it.
|
# Look for yaourt, and add some useful functions if we have it.
|
||||||
if [[ -x `which yaourt` ]]; then
|
if [[ -x `which yaourt` ]]; then
|
||||||
upgrade () {
|
upgrade () {
|
||||||
yaourt -Syu -C
|
yaourt -Syu
|
||||||
}
|
}
|
||||||
|
alias yaconf='yaourt -C' # Fix all configuration files with vimdiff
|
||||||
# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
|
# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
|
||||||
alias yaupg='sudo yaourt -Syu' # Synchronize with repositories before upgrading packages that are out of date on the local system.
|
alias yaupg='yaourt -Syu' # Synchronize with repositories before upgrading packages that are out of date on the local system.
|
||||||
alias yain='sudo yaourt -S' # Install specific package(s) from the repositories
|
alias yain='yaourt -S' # Install specific package(s) from the repositories
|
||||||
alias yains='sudo yaourt -U' # Install specific package not from the repositories but from a file
|
alias yains='yaourt -U' # Install specific package not from the repositories but from a file
|
||||||
alias yare='sudo yaourt -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies
|
alias yare='yaourt -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies
|
||||||
alias yarem='sudo yaourt -Rns' # Remove the specified package(s), its configuration(s) and unneeded 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 yarep='yaourt -Si' # Display information about a given package in the repositories
|
||||||
alias yareps='yaourt -Ss' # Search for package(s) 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 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
|
alias yalocs='yaourt -Qs' # Search for package(s) in the local database
|
||||||
# Additional yaourt alias examples
|
# Additional yaourt alias examples
|
||||||
alias yaupd='sudo yaourt -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories
|
if [[ -x `which abs` ]]; then
|
||||||
alias yainsd='sudo yaourt -S --asdeps' # Install given package(s) as dependencies of another package
|
alias yaupd='yaourt -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories
|
||||||
alias yamir='sudo yaourt -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
|
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
|
else
|
||||||
upgrade() {
|
upgrade() {
|
||||||
sudo pacman -Syu
|
sudo pacman -Syu
|
||||||
|
|
@ -38,7 +42,11 @@ alias pacreps='pacman -Ss' # Search for package(s) in the repositori
|
||||||
alias pacloc='pacman -Qi' # Display information about a given package in the local database
|
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
|
alias paclocs='pacman -Qs' # Search for package(s) in the local database
|
||||||
# Additional pacman alias examples
|
# Additional pacman alias examples
|
||||||
alias pacupd='sudo pacman -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories
|
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 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
|
alias pacmir='sudo pacman -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
|
|
||||||
222
plugins/django/django.plugin.zsh
Normal file
222
plugins/django/django.plugin.zsh
Normal file
|
|
@ -0,0 +1,222 @@
|
||||||
|
#compdef manage.py
|
||||||
|
|
||||||
|
typeset -ga nul_args
|
||||||
|
nul_args=(
|
||||||
|
'--settings=-[the Python path to a settings module.]:file:_files'
|
||||||
|
'--pythonpath=-[a directory to add to the Python path.]::directory:_directories'
|
||||||
|
'--traceback[print traceback on exception.]'
|
||||||
|
"--version[show program's version number and exit.]"
|
||||||
|
{-h,--help}'[show this help message and exit.]'
|
||||||
|
)
|
||||||
|
|
||||||
|
_managepy-adminindex(){
|
||||||
|
_arguments -s : \
|
||||||
|
$nul_args \
|
||||||
|
'*::directory:_directories' && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-createcachetable(){
|
||||||
|
_arguments -s : \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-dbshell(){
|
||||||
|
_arguments -s : \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-diffsettings(){
|
||||||
|
_arguments -s : \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-dumpdata(){
|
||||||
|
_arguments -s : \
|
||||||
|
'--format=-[specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
|
||||||
|
'--indent=-[specifies the indent level to use when pretty-printing output.]:' \
|
||||||
|
$nul_args \
|
||||||
|
'*::appname:_applist' && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-flush(){
|
||||||
|
_arguments -s : \
|
||||||
|
'--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
|
||||||
|
'--noinput[tells Django to NOT prompt the user for input of any kind.]' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-help(){
|
||||||
|
_arguments -s : \
|
||||||
|
'*:command:_managepy_cmds' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy_cmds(){
|
||||||
|
local line
|
||||||
|
local -a cmd
|
||||||
|
_call_program help-command ./manage.py help \
|
||||||
|
|& sed -n '/^ /s/[(), ]/ /gp' \
|
||||||
|
| while read -A line; do cmd=($line $cmd) done
|
||||||
|
_describe -t managepy-command 'manage.py command' cmd
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-inspectdb(){
|
||||||
|
_arguments -s : \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-loaddata(){
|
||||||
|
_arguments -s : \
|
||||||
|
'--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
|
||||||
|
'*::file:_files' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-reset(){
|
||||||
|
_arguments -s : \
|
||||||
|
'--noinput[tells Django to NOT prompt the user for input of any kind.]' \
|
||||||
|
'*::appname:_applist' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-runfcgi(){
|
||||||
|
local state
|
||||||
|
|
||||||
|
local fcgi_opts
|
||||||
|
fcgi_opts=(
|
||||||
|
'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
|
||||||
|
'host[hostname to listen on..]:'
|
||||||
|
'port[port to listen on.]:'
|
||||||
|
'socket[UNIX socket to listen on.]::file:_files'
|
||||||
|
'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
|
||||||
|
'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
|
||||||
|
'maxspare[max number of spare processes / threads.]:'
|
||||||
|
'minspare[min number of spare processes / threads.]:'
|
||||||
|
'maxchildren[hard limit number of processes / threads.]:'
|
||||||
|
'daemonize[whether to detach from terminal.]:boolean:(False True)'
|
||||||
|
'pidfile[write the spawned process-id to this file.]:file:_files'
|
||||||
|
'workdir[change to this directory when daemonizing.]:directory:_files'
|
||||||
|
'outlog[write stdout to this file.]:file:_files'
|
||||||
|
'errlog[write stderr to this file.]:file:_files'
|
||||||
|
)
|
||||||
|
|
||||||
|
_arguments -s : \
|
||||||
|
$nul_args \
|
||||||
|
'*: :_values "FCGI Setting" $fcgi_opts' && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-runserver(){
|
||||||
|
_arguments -s : \
|
||||||
|
'--noreload[tells Django to NOT use the auto-reloader.]' \
|
||||||
|
'--adminmedia[specifies the directory from which to serve admin media.]:directory:_files' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-shell(){
|
||||||
|
_arguments -s : \
|
||||||
|
'--plain[tells Django to use plain Python, not IPython.]' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-sql(){}
|
||||||
|
_managepy-sqlall(){}
|
||||||
|
_managepy-sqlclear(){}
|
||||||
|
_managepy-sqlcustom(){}
|
||||||
|
_managepy-sqlflush(){}
|
||||||
|
_managepy-sqlindexes(){}
|
||||||
|
_managepy-sqlinitialdata(){}
|
||||||
|
_managepy-sqlreset(){}
|
||||||
|
_managepy-sqlsequencereset(){}
|
||||||
|
_managepy-startapp(){}
|
||||||
|
|
||||||
|
_managepy-syncdb() {
|
||||||
|
_arguments -s : \
|
||||||
|
'--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
|
||||||
|
'--noinput[tells Django to NOT prompt the user for input of any kind.]' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-test() {
|
||||||
|
_arguments -s : \
|
||||||
|
'--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
|
||||||
|
'--noinput[tells Django to NOT prompt the user for input of any kind.]' \
|
||||||
|
'*::appname:_applist' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-testserver() {
|
||||||
|
_arguments -s : \
|
||||||
|
'--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
|
||||||
|
'--addrport=-[port number or ipaddr:port to run the server on.]' \
|
||||||
|
'*::fixture:_files' \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-validate() {
|
||||||
|
_arguments -s : \
|
||||||
|
$nul_args && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy-commands() {
|
||||||
|
local -a commands
|
||||||
|
|
||||||
|
commands=(
|
||||||
|
'adminindex:prints the admin-index template snippet for the given app name(s).'
|
||||||
|
'createcachetable:creates the table needed to use the SQL cache backend.'
|
||||||
|
'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
|
||||||
|
"diffsettings:displays differences between the current settings.py and Django's default settings."
|
||||||
|
'dumpdata:Output the contents of the database as a fixture of the given format.'
|
||||||
|
'flush:Executes ``sqlflush`` on the current database.'
|
||||||
|
'help:manage.py help.'
|
||||||
|
'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
|
||||||
|
'loaddata:Installs the named fixture(s) in the database.'
|
||||||
|
'reset:Executes ``sqlreset`` for the given app(s) in the current database.'
|
||||||
|
'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
|
||||||
|
'runserver:Starts a lightweight Web server for development.'
|
||||||
|
'shell:Runs a Python interactive interpreter.'
|
||||||
|
'sql:Prints the CREATE TABLE SQL statements for the given app name(s).'
|
||||||
|
'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
|
||||||
|
'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
|
||||||
|
'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
|
||||||
|
'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
|
||||||
|
'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
|
||||||
|
"sqlinitialdata:RENAMED: see 'sqlcustom'"
|
||||||
|
'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
|
||||||
|
'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
|
||||||
|
"startapp:Creates a Django app directory structure for the given app name in this project's directory."
|
||||||
|
"syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
|
||||||
|
'test:Runs the test suite for the specified applications, or the entire site if no apps are specified.'
|
||||||
|
'testserver:Runs a development server with data from the given fixture(s).'
|
||||||
|
'validate:Validates all installed models.'
|
||||||
|
)
|
||||||
|
|
||||||
|
_describe -t commands 'manage.py command' commands && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_applist() {
|
||||||
|
local line
|
||||||
|
local -a apps
|
||||||
|
_call_program help-command "python -c \"import os.path as op, re, django.conf, sys;\\
|
||||||
|
bn=op.basename(op.abspath(op.curdir));[sys\\
|
||||||
|
.stdout.write(str(re.sub(r'^%s\.(.*?)$' %
|
||||||
|
bn, r'\1', i)) + '\n') for i in django.conf.settings.\\
|
||||||
|
INSTALLED_APPS if re.match(r'^%s' % bn, i)]\"" \
|
||||||
|
| while read -A line; do apps=($line $apps) done
|
||||||
|
_values 'Application' $apps && ret=0
|
||||||
|
}
|
||||||
|
|
||||||
|
_managepy() {
|
||||||
|
local curcontext=$curcontext ret=1
|
||||||
|
|
||||||
|
if ((CURRENT == 2)); then
|
||||||
|
_managepy-commands
|
||||||
|
else
|
||||||
|
shift words
|
||||||
|
(( CURRENT -- ))
|
||||||
|
curcontext="${curcontext%:*:*}:managepy-$words[1]:"
|
||||||
|
_call_function ret _managepy-$words[1]
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
compdef _managepy manage.py
|
||||||
|
compdef _managepy django
|
||||||
8
plugins/extract/_extract
Normal file
8
plugins/extract/_extract
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
#compdef extract
|
||||||
|
#autoload
|
||||||
|
|
||||||
|
_arguments \
|
||||||
|
'(-r --remove)'{-r,--remove}'[Remove archive.]' \
|
||||||
|
"*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0
|
||||||
|
|
||||||
|
|
||||||
85
plugins/extract/extract.plugin.zsh
Normal file
85
plugins/extract/extract.plugin.zsh
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
# FILE: extract.plugin.zsh
|
||||||
|
# DESCRIPTION: oh-my-zsh plugin file.
|
||||||
|
# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com)
|
||||||
|
# VERSION: 1.0.1
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
function extract() {
|
||||||
|
local remove_archive
|
||||||
|
local success
|
||||||
|
local file_name
|
||||||
|
local extract_dir
|
||||||
|
|
||||||
|
if (( $# == 0 )); then
|
||||||
|
echo "Usage: extract [-option] [file ...]"
|
||||||
|
echo
|
||||||
|
echo Options:
|
||||||
|
echo " -r, --remove Remove archive."
|
||||||
|
echo
|
||||||
|
echo "Report bugs to <sorin.ionescu@gmail.com>."
|
||||||
|
fi
|
||||||
|
|
||||||
|
remove_archive=1
|
||||||
|
if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
|
||||||
|
remove_archive=0
|
||||||
|
shift
|
||||||
|
fi
|
||||||
|
|
||||||
|
while (( $# > 0 )); do
|
||||||
|
if [[ ! -f "$1" ]]; then
|
||||||
|
echo "extract: '$1' is not a valid file" 1>&2
|
||||||
|
shift
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
success=0
|
||||||
|
file_name="$( basename "$1" )"
|
||||||
|
extract_dir="$( echo "$file_name" | sed "s/\.${1##*.}//g" )"
|
||||||
|
case "$1" in
|
||||||
|
(*.tar.gz|*.tgz) tar xvzf "$1" ;;
|
||||||
|
(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
|
||||||
|
(*.tar.xz|*.txz) tar --xz --help &> /dev/null \
|
||||||
|
&& tar --xz -xvf "$1" \
|
||||||
|
|| xzcat "$1" | tar xvf - ;;
|
||||||
|
(*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \
|
||||||
|
&& tar --lzma -xvf "$1" \
|
||||||
|
|| lzcat "$1" | tar xvf - ;;
|
||||||
|
(*.tar) tar xvf "$1" ;;
|
||||||
|
(*.gz) gunzip "$1" ;;
|
||||||
|
(*.bz2) bunzip2 "$1" ;;
|
||||||
|
(*.xz) unxz "$1" ;;
|
||||||
|
(*.lzma) unlzma "$1" ;;
|
||||||
|
(*.Z) uncompress "$1" ;;
|
||||||
|
(*.zip) unzip "$1" -d $extract_dir ;;
|
||||||
|
(*.rar) unrar e -ad "$1" ;;
|
||||||
|
(*.7z) 7za x "$1" ;;
|
||||||
|
(*.deb)
|
||||||
|
mkdir -p "$extract_dir/control"
|
||||||
|
mkdir -p "$extract_dir/data"
|
||||||
|
cd "$extract_dir"; ar vx "../${1}" > /dev/null
|
||||||
|
cd control; tar xzvf ../control.tar.gz
|
||||||
|
cd ../data; tar xzvf ../data.tar.gz
|
||||||
|
cd ..; rm *.tar.gz debian-binary
|
||||||
|
cd ..
|
||||||
|
;;
|
||||||
|
(*)
|
||||||
|
echo "extract: '$1' cannot be extracted" 1>&2
|
||||||
|
success=1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
(( success = $success > 0 ? $success : $? ))
|
||||||
|
(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
alias x=extract
|
||||||
|
|
||||||
|
# add extract completion function to path
|
||||||
|
fpath=($ZSH/plugins/extract $fpath)
|
||||||
|
autoload -U compinit
|
||||||
|
compinit -i
|
||||||
|
|
||||||
|
|
@ -27,11 +27,15 @@ alias gcp='git cherry-pick'
|
||||||
compdef _git gcp=git-cherry-pick
|
compdef _git gcp=git-cherry-pick
|
||||||
alias glg='git log --stat --max-count=5'
|
alias glg='git log --stat --max-count=5'
|
||||||
compdef _git glg=git-log
|
compdef _git glg=git-log
|
||||||
|
alias glgg='git log --graph --max-count=5'
|
||||||
|
compdef _git glgg=git-log
|
||||||
|
|
||||||
# Git and svn mix
|
# Git and svn mix
|
||||||
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
||||||
compdef git-svn-dcommit-push=git
|
compdef git-svn-dcommit-push=git
|
||||||
|
|
||||||
|
alias gsr='git svn rebase'
|
||||||
|
alias gsd='git svn dcommit'
|
||||||
#
|
#
|
||||||
# Will return the current branch name
|
# Will return the current branch name
|
||||||
# Usage example: git pull origin $(current_branch)
|
# Usage example: git pull origin $(current_branch)
|
||||||
|
|
|
||||||
9
plugins/kate/kate.plugin.zsh
Normal file
9
plugins/kate/kate.plugin.zsh
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
|
||||||
|
# Kate
|
||||||
|
# Start kate always silent
|
||||||
|
alias kate='kate >/dev/null 2>&1'
|
||||||
|
|
||||||
|
function kt () {
|
||||||
|
cd $1
|
||||||
|
kate $1
|
||||||
|
}
|
||||||
5
plugins/osx/_man-preview
Normal file
5
plugins/osx/_man-preview
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
#compdef man-preview
|
||||||
|
#autoload
|
||||||
|
|
||||||
|
_man
|
||||||
|
|
||||||
|
|
@ -1,63 +1,99 @@
|
||||||
alias showfiles='defaults write com.apple.finder AppleShowAllFiles TRUE; killall Finder'
|
# ------------------------------------------------------------------------------
|
||||||
alias hidefiles='defaults write com.apple.finder AppleShowAllFiles FALSE; killall Finder'
|
# FILE: osx.plugin.zsh
|
||||||
|
# DESCRIPTION: oh-my-zsh plugin file.
|
||||||
|
# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com)
|
||||||
|
# VERSION: 1.0.1
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
# Recursively delete .DS_Store files
|
|
||||||
alias rm-dsstore="find . -name '*.DS_Store' -type f -delete"
|
|
||||||
|
|
||||||
function savepath() {
|
|
||||||
pwd > ~/.current_path~
|
|
||||||
}
|
|
||||||
|
|
||||||
function tab() {
|
function tab() {
|
||||||
savepath
|
local command="cd \\\"$PWD\\\""
|
||||||
osascript >/dev/null <<EOF
|
(( $# > 0 )) && command="${command}; $*"
|
||||||
on do_submenu(app_name, menu_name, menu_item, submenu_item)
|
|
||||||
-- bring the target application to the front
|
the_app=$(
|
||||||
tell application app_name
|
osascript 2>/dev/null <<EOF
|
||||||
activate
|
tell application "System Events"
|
||||||
end tell
|
name of first item of (every process whose frontmost is true)
|
||||||
tell application "System Events"
|
end tell
|
||||||
tell process app_name
|
EOF
|
||||||
tell menu bar 1
|
)
|
||||||
tell menu bar item menu_name
|
|
||||||
tell menu menu_name
|
[[ "$the_app" == 'Terminal' ]] && {
|
||||||
tell menu item menu_item
|
osascript 2>/dev/null <<EOF
|
||||||
tell menu menu_item
|
tell application "System Events"
|
||||||
click menu item submenu_item
|
tell process "Terminal" to keystroke "t" using command down
|
||||||
end tell
|
tell application "Terminal" to do script "${command}" in front window
|
||||||
end tell
|
end tell
|
||||||
end tell
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
[[ "$the_app" == 'iTerm' ]] && {
|
||||||
|
osascript 2>/dev/null <<EOF
|
||||||
|
tell application "iTerm"
|
||||||
|
set current_terminal to current terminal
|
||||||
|
tell current_terminal
|
||||||
|
launch session "Default Session"
|
||||||
|
set current_session to current session
|
||||||
|
tell current_session
|
||||||
|
write text "${command}"
|
||||||
end tell
|
end tell
|
||||||
end tell
|
end tell
|
||||||
end tell
|
end tell
|
||||||
end tell
|
EOF
|
||||||
end do_submenu
|
}
|
||||||
|
}
|
||||||
|
|
||||||
do_submenu("Terminal", "Shell", "New Tab", 1)
|
function pfd() {
|
||||||
|
osascript 2>/dev/null <<EOF
|
||||||
|
tell application "Finder"
|
||||||
|
return POSIX path of (target of window 1 as alias)
|
||||||
|
end tell
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
function itab() {
|
function pfs() {
|
||||||
savepath
|
osascript 2>/dev/null <<EOF
|
||||||
osascript >/dev/null <<EOF
|
set output to ""
|
||||||
on do_submenu(app_name, menu_name, menu_item)
|
tell application "Finder" to set the_selection to selection
|
||||||
-- bring the target application to the front
|
set item_count to count the_selection
|
||||||
tell application app_name
|
repeat with item_index from 1 to count the_selection
|
||||||
activate
|
if item_index is less than item_count then set the_delimiter to "\n"
|
||||||
end tell
|
if item_index is item_count then set the_delimiter to ""
|
||||||
tell application "System Events"
|
set output to output & ((item item_index of the_selection as alias)'s POSIX path) & the_delimiter
|
||||||
tell process app_name
|
end repeat
|
||||||
tell menu bar 1
|
|
||||||
tell menu bar item menu_name
|
|
||||||
tell menu menu_name
|
|
||||||
click menu item menu_item
|
|
||||||
end tell
|
|
||||||
end tell
|
|
||||||
end tell
|
|
||||||
end tell
|
|
||||||
end tell
|
|
||||||
end do_submenu
|
|
||||||
|
|
||||||
do_submenu("iTerm", "Shell", "New Tab")
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function cdf() {
|
||||||
|
cd "$(pfd)"
|
||||||
|
}
|
||||||
|
|
||||||
|
function pushdf() {
|
||||||
|
pushd "$(pfd)"
|
||||||
|
}
|
||||||
|
|
||||||
|
function quick-look() {
|
||||||
|
(( $# > 0 )) && qlmanage -p $* &>/dev/null &
|
||||||
|
}
|
||||||
|
|
||||||
|
function man-preview() {
|
||||||
|
man -t "$@" | open -f -a Preview
|
||||||
|
}
|
||||||
|
|
||||||
|
function trash() {
|
||||||
|
local trash_dir="${HOME}/.Trash"
|
||||||
|
local temp_ifs=$IFS
|
||||||
|
IFS=$'\n'
|
||||||
|
for item in "$@"; do
|
||||||
|
if [[ -e "$item" ]]; then
|
||||||
|
item_name="$(basename $item)"
|
||||||
|
if [[ -e "${trash_dir}/${item_name}" ]]; then
|
||||||
|
mv -f "$item" "${trash_dir}/${item_name} $(date "+%H-%M-%S")"
|
||||||
|
else
|
||||||
|
mv -f "$item" "${trash_dir}/"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS=$temp_ifs
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,23 @@
|
||||||
# Path to your oh-my-zsh configuration.
|
# Path to your oh-my-zsh configuration.
|
||||||
export ZSH=$HOME/.oh-my-zsh
|
ZSH=$HOME/.oh-my-zsh
|
||||||
|
|
||||||
# Set name of the theme to load.
|
# Set name of the theme to load.
|
||||||
# Look in ~/.oh-my-zsh/themes/
|
# Look in ~/.oh-my-zsh/themes/
|
||||||
# Optionally, if you set this to "random", it'll load a random theme each
|
# Optionally, if you set this to "random", it'll load a random theme each
|
||||||
# time that oh-my-zsh is loaded.
|
# time that oh-my-zsh is loaded.
|
||||||
export ZSH_THEME="robbyrussell"
|
ZSH_THEME="robbyrussell"
|
||||||
|
|
||||||
# Set to this to use case-sensitive completion
|
# Set to this to use case-sensitive completion
|
||||||
# export CASE_SENSITIVE="true"
|
# CASE_SENSITIVE="true"
|
||||||
|
|
||||||
# Comment this out to disable weekly auto-update checks
|
# Comment this out to disable weekly auto-update checks
|
||||||
# export DISABLE_AUTO_UPDATE="true"
|
# DISABLE_AUTO_UPDATE="true"
|
||||||
|
|
||||||
# Uncomment following line if you want to disable colors in ls
|
# Uncomment following line if you want to disable colors in ls
|
||||||
# export DISABLE_LS_COLORS="true"
|
# DISABLE_LS_COLORS="true"
|
||||||
|
|
||||||
# Uncomment following line if you want to disable autosetting terminal title.
|
# Uncomment following line if you want to disable autosetting terminal title.
|
||||||
# export DISABLE_AUTO_TITLE="true"
|
# DISABLE_AUTO_TITLE="true"
|
||||||
|
|
||||||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
|
|
|
||||||
14
themes/dpoggi.zsh-theme
Normal file
14
themes/dpoggi.zsh-theme
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
|
||||||
|
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
||||||
|
|
||||||
|
PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m\
|
||||||
|
%{$reset_color%}:%{$fg[magenta]%}%~\
|
||||||
|
$(git_prompt_info) \
|
||||||
|
%{$fg[red]%}%(!.#.»)%{$reset_color%} '
|
||||||
|
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
|
||||||
|
RPS1='${return_code}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}○%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}⚡%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%})%{$reset_color%}"
|
||||||
|
|
@ -3,8 +3,22 @@
|
||||||
|
|
||||||
local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
|
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 '
|
function my_git_prompt_info() {
|
||||||
|
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
|
||||||
|
GIT_STATUS=$(git_prompt_status)
|
||||||
|
[[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS"
|
||||||
|
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(my_git_prompt_info)%{$reset_color%}%B»%b '
|
||||||
RPS1="${return_code}"
|
RPS1="${return_code}"
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
|
||||||
|
ZSH_THEME_GIT_PROMPT_ADDED="+"
|
||||||
|
ZSH_THEME_GIT_PROMPT_MODIFIED="*"
|
||||||
|
ZSH_THEME_GIT_PROMPT_RENAMED="~"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DELETED="!"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNMERGED="?"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ RPROMPT='[%*]'
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B"
|
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_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} "
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}"
|
ZSH_THEME_GIT_PROMPT_DIRTY="*"
|
||||||
|
|
||||||
# LS colors, made with http://geoff.greer.fm/lscolors/
|
# LS colors, made with http://geoff.greer.fm/lscolors/
|
||||||
export LSCOLORS="Gxfxcxdxbxegedabagacad"
|
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:'
|
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:*.patch=00;34:*.o=00;32:*.so=01;35:*.ko=01;31:*.la=00;33'
|
||||||
|
|
|
||||||
18
themes/superjarin.zsh-theme
Normal file
18
themes/superjarin.zsh-theme
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
|
||||||
|
JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
|
||||||
|
|
||||||
|
# Grab the current filepath, use shortcuts: ~/Desktop
|
||||||
|
# Append the current git branch, if in a git repository
|
||||||
|
JARIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%} <%{$fg[magenta]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
|
||||||
|
# Do nothing if the branch is clean (no changes).
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}>"
|
||||||
|
|
||||||
|
# Add a yellow ✗ if the branch is dirty
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}> %{$fg[yellow]%}✗"
|
||||||
|
|
||||||
|
# Put it all together!
|
||||||
|
PROMPT="$JARIN_CURRENT_RUBY_ $JARIN_CURRENT_LOCA_ "
|
||||||
|
|
||||||
9
themes/terminalparty.zsh-theme
Normal file
9
themes/terminalparty.zsh-theme
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
PROMPT='%{$fg[green]%} %% '
|
||||||
|
# RPS1='%{$fg[blue]%}%~%{$reset_color%} '
|
||||||
|
RPS1='%{$fg[white]%}%2~$(git_prompt_info) %{$fg_bold[blue]%}%m%{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[yellow]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ⚡%{$fg[yellow]%}"
|
||||||
|
|
||||||
107
themes/wedisagree.zsh-theme
Normal file
107
themes/wedisagree.zsh-theme
Normal file
|
|
@ -0,0 +1,107 @@
|
||||||
|
# On a mac with snow leopard, for nicer terminal colours:
|
||||||
|
|
||||||
|
# - Install SIMBL: http://www.culater.net/software/SIMBL/SIMBL.php
|
||||||
|
# - Download'Terminal-Colours': http://bwaht.net/code/TerminalColours.bundle.zip
|
||||||
|
# - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist)
|
||||||
|
# - Open Terminal preferences. Go to Settings -> Text -> More
|
||||||
|
# - Change default colours to your liking.
|
||||||
|
#
|
||||||
|
# Here are the colours from Textmate's Monokai theme:
|
||||||
|
#
|
||||||
|
# Black: 0, 0, 0
|
||||||
|
# Red: 229, 34, 34
|
||||||
|
# Green: 166, 227, 45
|
||||||
|
# Yellow: 252, 149, 30
|
||||||
|
# Blue: 196, 141, 255
|
||||||
|
# Magenta: 250, 37, 115
|
||||||
|
# Cyan: 103, 217, 240
|
||||||
|
# White: 242, 242, 242
|
||||||
|
|
||||||
|
# Thanks to Steve Losh: http://stevelosh.com/blog/2009/03/candy-colored-terminal/
|
||||||
|
|
||||||
|
# The prompt
|
||||||
|
|
||||||
|
PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
|
||||||
|
|
||||||
|
# The right-hand prompt
|
||||||
|
|
||||||
|
RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}'
|
||||||
|
|
||||||
|
# Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
|
||||||
|
# %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%}
|
||||||
|
|
||||||
|
# local time, color coded by last return code
|
||||||
|
time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
|
||||||
|
time_disabled="%{$fg[green]%}%*%{$reset_color%}"
|
||||||
|
time=$time_enabled
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=" ☁ %{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%} ☂" # Ⓓ
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" # ⓣ
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ☀" # Ⓞ
|
||||||
|
|
||||||
|
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]%} ♒" # ⓤ ⑊
|
||||||
|
|
||||||
|
# More symbols to choose from:
|
||||||
|
# ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
|
||||||
|
# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵ ⩶ ⨠
|
||||||
|
# ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟ ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ
|
||||||
|
|
||||||
|
# Determine if we are using a gemset.
|
||||||
|
function rvm_gemset() {
|
||||||
|
GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
|
||||||
|
if [[ -n $GEMSET ]]; then
|
||||||
|
echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# 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 "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
||||||
|
elif [ "$MINUTES" -gt 60 ]; then
|
||||||
|
echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
||||||
|
else
|
||||||
|
echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
||||||
|
echo "($(rvm_gemset)$COLOR~|"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue