mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-07-01 09:19:25 +00:00
Compare commits
1 Commits
pull/556-p
...
pull/533-g
Author | SHA1 | Date | |
---|---|---|---|
d196c6a15a |
@ -32,8 +32,8 @@ alias g='git'
|
||||
# Branch (b)
|
||||
alias gb='git branch'
|
||||
alias gbc='git checkout -b'
|
||||
alias gbl='git branch -v'
|
||||
alias gbL='git branch -av'
|
||||
alias gbl='git branch -vv'
|
||||
alias gbL='git branch -avv'
|
||||
alias gbx='git branch -d'
|
||||
alias gbX='git branch -D'
|
||||
alias gbm='git branch -m'
|
||||
|
@ -30,10 +30,6 @@ Perlbrew
|
||||
An alternative to the above is to use [Perlbrew][2], which allows for the
|
||||
management of multiple, isolated Perl installations in the home directory.
|
||||
|
||||
You can specify the perlbrew location so the environment is automatically loaded.
|
||||
|
||||
zstyle ':prezto:module:perl:perlbrew' location '/path/to/perlbrew'
|
||||
|
||||
Aliases
|
||||
-------
|
||||
|
||||
|
@ -29,13 +29,6 @@ if [[ "$OSTYPE" == darwin* ]]; then
|
||||
|
||||
unset perl_path
|
||||
unset cache_file
|
||||
|
||||
# Perlbrew
|
||||
zstyle -s ':prezto:module:perl:perlbrew' location '_perlbrew_root'
|
||||
if [[ -s "${_perlbrew_root}/etc/bashrc" ]]; then
|
||||
export PERLBREW_ROOT="${_perlbrew_root}"
|
||||
source "${_perlbrew_root}/etc/bashrc"
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
|
@ -20,9 +20,6 @@ home directory.
|
||||
Since RVM is loaded into the shell and is known to override shell commands, it
|
||||
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
|
||||
-----
|
||||
|
||||
|
@ -15,7 +15,7 @@ fi
|
||||
# Auto Start
|
||||
#
|
||||
|
||||
if [[ -z "$STY" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
|
||||
if [[ -z "$STY" ]] && ( \
|
||||
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
|
||||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
|
||||
); then
|
||||
|
@ -16,11 +16,11 @@ fi
|
||||
# Auto Start
|
||||
#
|
||||
|
||||
if [[ -z "$TMUX" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
|
||||
if [[ -z "$TMUX" ]] && ( \
|
||||
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
|
||||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
|
||||
); then
|
||||
tmux_session='prezto'
|
||||
tmux_session='#Prezto'
|
||||
|
||||
if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
|
||||
# Ensure that tmux server is started.
|
||||
|
Reference in New Issue
Block a user