1
0
Fork 0

Merge remote-tracking branch 'upstream/master'

pull/988/head
Juozas Valenčius 9 years ago
commit 41851284ff

5
.gitmodules vendored

@ -12,7 +12,10 @@
url = https://github.com/davidjrice/prezto_powerline.git
[submodule "modules/prompt/external/agnoster"]
path = modules/prompt/external/agnoster
url = https://gist.github.com/3712874.git
url = https://github.com/agnoster/agnoster-zsh-theme.git
[submodule "modules/prompt/functions/pure"]
path = modules/prompt/external/pure
url = https://github.com/sindresorhus/pure.git
[submodule "modules/autosuggestions/external"]
path = modules/autosuggestions/external
url = https://github.com/tarruda/zsh-autosuggestions

@ -10,6 +10,11 @@ Archive
Provides functions to list and extract archives.
Autosuggestions
---------------
Integrates zsh-autosuggestions into Prezto.
Command-Not-Found
-----------------

@ -8,6 +8,7 @@
local remove_archive
local success
local file_name
local file_path
local extract_dir
if (( $# == 0 )); then
@ -36,6 +37,7 @@ while (( $# > 0 )); do
success=0
file_name="${1:t}"
file_path="${1:A}"
extract_dir="${file_name:r}"
case "$1:l" in
(*.tar.gz|*.tgz) tar xvzf "$1" ;;
@ -60,10 +62,10 @@ while (( $# > 0 )); do
(*.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 "$extract_dir"; ar vx "${file_path}" > /dev/null
cd control; tar xvf ../control.tar.*
cd ../data; tar xvf ../data.tar.*
cd ..; rm control.tar.* data.tar.* debian-binary
cd ..
;;
(*)

@ -0,0 +1,53 @@
Autosuggestions
---------------
Integrates zsh-autosuggestions into Prezto.
Autosuggestions
===============
Integrates [zsh-autosuggestions][1] into Prezto, which implements the
[Fish shell][2]'s autosuggestions feature, where the user can type in any part
of a previously entered command and Zsh suggests commands as you type based on
history and completions.
If this module is used in conjuncture with the *syntax-highlighting* module, it
must be loaded **after** it.
If this module is used in conjuncture with the *history-substring-search*
module, it must be loaded **after** it.
Contributors
------------
New features and bug fixes should be submitted to the [zsh-autosuggestions][1]
project according to its rules and regulations. This module will be synchronized
against it.
Settings
--------
### Highlighting
If colors are enabled, *autosuggestions* will automatically highlight
positive results.
To enable highlighting for this module only, add the following line to
*zpreztorc*:
zstyle ':prezto:module:autosuggestions' color 'yes'
To set the query found color, add the following line to *zpreztorc*:
zstyle ':prezto:module:autosuggestions:color' found ''
Authors
-------
*The authors of this module should be contacted via the [issue tracker][3].*
- [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/tarruda/zsh-autosuggestions
[2]: http://fishshell.com
[3]: https://github.com/sorin-ionescu/prezto/issues

@ -0,0 +1 @@
Subproject commit f0a745576ff69fa608421ee7214d4cd77b43e62f

@ -0,0 +1,35 @@
#
# Integrates zsh-autosuggestions into Prezto.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
#
# Load dependencies.
pmodload 'editor'
# Source module files.
source "${0:h}/external/zsh-autosuggestions.zsh" || return 1
#
# Highlighting
#
# Set highlight color, default 'fg=8'.
zstyle -s ':prezto:module:autosuggestions:color' found \
'ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE' || ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
# Disable highlighting.
if ! zstyle -t ':prezto:module:autosuggestions' color; then
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE=''
fi
#
# Key Bindings
#
if [[ -n "$key_info" ]]; then
# vi
bindkey -M viins "$key_info[Control]F" vi-forward-word
bindkey -M viins "$key_info[Control]E" vi-add-eol
fi

@ -1 +1 @@
Subproject commit 68c949470eaa87c5d67080d32fb2b69c8b837eb4
Subproject commit 3a2bb8781d32d05d1bf05deeeb476beb651e8272

@ -15,7 +15,7 @@ Aliases
- `dnfr` removes package(s).
- `dnfs` searches for a package.
- `dnfu` updates packages.
- `dnfU` upgrates packages.
- `dnfU` upgrades packages.
Authors
-------

@ -30,6 +30,9 @@ export GPG_TTY="$(tty)"
# Integrate with the SSH module.
if grep 'enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
# Load required functions.
autoload -Uz add-zsh-hook
# Override the ssh-agent environment file default path.
_ssh_agent_env="$_gpg_agent_env"

@ -1 +1 @@
Subproject commit c4a83561a12b898ff7145856d0e6ae50757e28ba
Subproject commit 7a4b54b708ab88e0421097614f1acaa7a973c795

@ -1 +1 @@
Subproject commit 04212522f39f43998d001b4a94b05856f010a54b
Subproject commit fb4c37dad3c5cbdebca61a8ff5545397c11d450f

@ -1 +1 @@
Subproject commit 3dc574190071ef59054f6d693132410b37aa3ae4
Subproject commit 7044c1986e2f6b15eec27a03651207fccb0a2fbe

@ -15,7 +15,7 @@ Aliases
- `yumr` removes package(s).
- `yums` searches for a package.
- `yumu` updates packages.
- `yumU` upgrates packages.
- `yumU` upgrades packages.
Authors
-------

@ -34,6 +34,13 @@ zstyle ':prezto:load' pmodule \
'completion' \
'prompt'
#
# Autosuggestions
#
# Set the query found color.
# zstyle ':prezto:module:autosuggestions:color' found ''
#
# Editor
#
@ -121,6 +128,7 @@ zstyle ':prezto:module:prompt' theme 'sorin'
# 'main' \
# 'brackets' \
# 'pattern' \
# 'line' \
# 'cursor' \
# 'root'
#

Loading…
Cancel
Save