1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-07-01 20:59:26 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
d196c6a15a Add verbose flag to Git branch listing
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-02-17 22:15:41 -05:00
11 changed files with 33 additions and 76 deletions

3
.gitmodules vendored
View File

@ -7,6 +7,3 @@
[submodule "modules/completion/external"] [submodule "modules/completion/external"]
path = modules/completion/external path = modules/completion/external
url = https://github.com/zsh-users/zsh-completions.git url = https://github.com/zsh-users/zsh-completions.git
[submodule "modules/opp/external"]
path = modules/opp/external
url = https://github.com/hchbaw/opp.zsh.git

View File

@ -32,8 +32,8 @@ alias g='git'
# Branch (b) # Branch (b)
alias gb='git branch' alias gb='git branch'
alias gbc='git checkout -b' alias gbc='git checkout -b'
alias gbl='git branch -v' alias gbl='git branch -vv'
alias gbL='git branch -av' alias gbL='git branch -avv'
alias gbx='git branch -d' alias gbx='git branch -d'
alias gbX='git branch -D' alias gbX='git branch -D'
alias gbm='git branch -m' alias gbm='git branch -m'

View File

@ -348,13 +348,13 @@ function git-info {
# Format added. # Format added.
if (( added > 0 )); then if (( added > 0 )); then
zstyle -s ':prezto:module:git:info:added' format 'added_format' zstyle -s ':prezto:module:git:info:added' format 'added_format'
zformat -f added_formatted "$added_format" "a:$added" zformat -f added_formatted "$added_format" "a:$added_format"
fi fi
# Format deleted. # Format deleted.
if (( deleted > 0 )); then if (( deleted > 0 )); then
zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format' zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format'
zformat -f deleted_formatted "$deleted_format" "d:$deleted" zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
fi fi
# Format modified. # Format modified.

View File

@ -1,19 +0,0 @@
VIM text objects
========================
Integrates [opp][1] into Prezto, which implements [vim text objects][2] right into vim mode of prezto.
Due to some conflicts with prezto loading, opp will get compiled during initial run.
Authors
-------
*The authors of this module should be contacted via the [issue tracker][3].*
- [Takeshi Banse](https://github.com/hchbaw)
[1]: https://github.com/hchbaw/opp.zsh
[2]: http://blog.carbonfive.com/2011/10/17/vim-text-objects-the-definitive-guide/
[3]: https://github.com/hchbaw/opp.zsh/issues?state=open

View File

@ -1,20 +0,0 @@
# Vim's text-objects-ish for zsh.
# Author: Takeshi Banse <takebi@laafc.net>
# License: Public Domain
# Thank you very much, Bram Moolenaar!
# I want to use the Vim's text-objects in zsh.
if [[ ! -f ${0:h}/functions/opp.zwc ]] ||
[[ ! -f ${0:h}/functions/opp-install.zwc ]]; then
(
. "${0:h}/external/opp.zsh"
. "${0:h}/external/opp/surround.zsh"
. "${0:h}/external/opp/textobj-between.zsh"
opp-zcompile "${0:h}/external/opp.zsh" ${0:h}/functions > /dev/null
)
fpath+=${0:h}/functions > /dev/null
. ${0:h}/functions/opp-install
autoload opp
fi
opp-install

View File

@ -16,12 +16,9 @@ elif (( $+commands[pyenv] )); then
eval "$(pyenv init -)" eval "$(pyenv init -)"
# Prepend PEP 370 per user site packages directory, which defaults to # Prepend PEP 370 per user site packages directory, which defaults to
# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The # ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
# path can be overridden using PYTHONUSERBASE.
else else
if [[ -n "$PYTHONUSERBASE" ]]; then if [[ "$OSTYPE" == darwin* ]]; then
path=($PYTHONUSERBASE/bin $path)
elif [[ "$OSTYPE" == darwin* ]]; then
path=($HOME/Library/Python/*/bin(N) $path) path=($HOME/Library/Python/*/bin(N) $path)
else else
# This is subject to change. # This is subject to change.

View File

@ -20,9 +20,6 @@ home directory.
Since RVM is loaded into the shell and is known to override shell commands, it Since RVM is loaded into the shell and is known to override shell commands, it
may conflict with shell scripts. may conflict with shell scripts.
Load this module as late as possible when using RVM since RVM will complain if
it is not first in `$PATH`.
rbenv rbenv
----- -----

View File

@ -15,7 +15,7 @@ fi
# Auto Start # Auto Start
# #
if [[ -z "$STY" && -z "$EMACS" && -z "$VIM" ]] && ( \ if [[ -z "$STY" ]] && ( \
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) || ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \ ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
); then ); then

View File

@ -20,15 +20,12 @@ following line to *zpreztorc*:
zstyle ':prezto:module:tmux:auto-start' remote 'yes' zstyle ':prezto:module:tmux:auto-start' remote 'yes'
In both cases, it will create a background session named _prezto_ if the tmux In both cases, it will create a background session named _#Prezto_ and attach
server is not started. every new shell to it.
With `auto-start` enabled, you may want to control how multiple sessions are To avoid keeping open sessions, this module sets `destroy-unattached off` on
managed. The `destroy-unattached` option of tmux controls if the unattached the background session and `destroy-unattached on` on every other session
sessions must be kept alive, making sessions available for later use, configured (global setting).
in *tmux.conf*:
set-option -g destroy-unattached [on | off]
Aliases Aliases
------- -------
@ -44,7 +41,7 @@ connected** to be displayed, which can be fixed by installing
[reattach-to-user-namespace][3], available in [Homebrew][4], and adding the [reattach-to-user-namespace][3], available in [Homebrew][4], and adding the
following to *tmux.conf*: following to *tmux.conf*:
set-option -g default-command "reattach-to-user-namespace -l $SHELL -l" set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
Furthermore, tmux is known to cause **kernel panics** on Mac OS X. A discussion Furthermore, tmux is known to cause **kernel panics** on Mac OS X. A discussion
about this and Prezto has already been [opened][2]. about this and Prezto has already been [opened][2].
@ -57,7 +54,6 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
- [Colin Hebert](https://github.com/ColinHebert) - [Colin Hebert](https://github.com/ColinHebert)
- [Georges Discry](https://github.com/gdiscry) - [Georges Discry](https://github.com/gdiscry)
- [Xavier Cambar](https://github.com/xcambar)
[1]: http://tmux.sourceforge.net [1]: http://tmux.sourceforge.net
[2]: https://github.com/sorin-ionescu/prezto/issues/62 [2]: https://github.com/sorin-ionescu/prezto/issues/62

View File

@ -5,7 +5,6 @@
# Sorin Ionescu <sorin.ionescu@gmail.com> # Sorin Ionescu <sorin.ionescu@gmail.com>
# Colin Hebert <hebert.colin@gmail.com> # Colin Hebert <hebert.colin@gmail.com>
# Georges Discry <georges@discry.be> # Georges Discry <georges@discry.be>
# Xavier Cambar <xcambar@gmail.com>
# #
# Return if requirements are not found. # Return if requirements are not found.
@ -17,22 +16,31 @@ fi
# Auto Start # Auto Start
# #
if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \ if [[ -z "$TMUX" ]] && ( \
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) || ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \ ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
); then ); then
tmux start-server tmux_session='#Prezto'
# Create a 'prezto' session if no session has been defined in tmux.conf. if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
if ! tmux has-session 2> /dev/null; then # Ensure that tmux server is started.
tmux_session='prezto' tmux start-server
tmux \
new-session -d -s "$tmux_session" \; \ # Disable the destruction of unattached sessions globally.
set-option -t "$tmux_session" destroy-unattached off &> /dev/null tmux set-option -g destroy-unattached off &> /dev/null
# Create a new session.
tmux new-session -d -s "$tmux_session"
# Disable the destruction of the new, unattached session.
tmux set-option -t "$tmux_session" destroy-unattached off &> /dev/null
# Enable the destruction of unattached sessions globally to prevent
# an abundance of open, detached sessions.
tmux set-option -g destroy-unattached on &> /dev/null
fi fi
# Attach to the 'prezto' session or to the last session used. exec tmux new-session -t "$tmux_session"
exec tmux attach-session
fi fi
# #

View File

@ -152,3 +152,4 @@ zstyle ':prezto:module:prompt' theme 'sorin'
# Auto start a session when Zsh is launched in a SSH connection. # Auto start a session when Zsh is launched in a SSH connection.
# zstyle ':prezto:module:tmux:auto-start' remote 'yes' # zstyle ':prezto:module:tmux:auto-start' remote 'yes'