Compare commits

...

4 Commits

4 changed files with 36 additions and 16 deletions

View File

@ -9,6 +9,8 @@ export ZSHZ_DATA="${ZSH_CACHE_DIR}/z"
zinit ice lucid wait'0' depth'1'
zinit light agkozak/zsh-z
zinit snippet OMZP::pj
if [ "$(id -u)" != "0" ] && [[ -n ${DISPLAY+set} ]]; then
zstyle ':notify:*' expire-time 5000
zstyle ':notify:*' command-complete-timeout 20
@ -58,6 +60,8 @@ if command -v fzf > /dev/null 2>&1; then
fi
fi
zinit light zdharma-continuum/zsh-navigation-tools
if command -v git > /dev/null 2>&1; then
GIT_AUTO_FETCH_INTERVAL=3600
zinit snippet OMZL::git.zsh

View File

@ -3,41 +3,38 @@
# Copy this file to 55-agents.user.zsh and modify to your needs
##
# SSH agent
##
# SSH agent #{{{
# if command -v ssh-agent >/dev/null 2>&1; then
# zstyle :omz:plugins:ssh-agent agent-forwarding on
# zstyle :omz:plugins:ssh-agent identities id_rsa
# zstyle :omz:plugins:ssh-agent lifetime 10h
# zinit snippet OMZP::ssh-agent
# fi
#}}}
##
# GPG agent
##
# GPG agent #{{{
# if command -v gpg-agent >/dev/null 2>&1; then
# zinit snippet OMZP::gpg-agent
# if command -v gpg-conf >/dev/null 2>&1; then
# gpgconf --create-socketdir
# fi
# fi
#}}}
##
# Keychain
##
# Keychain #{{{
# if command -v keychain >/dev/null 2>&1; then
# zstyle :omz:plugins:keychain identities id_rsa 01234567
# zstyle :omz:plugins:keychain options --quiet --inherit any-once --noask --nocolor --gpg2 --absolute --dir ~/.cache/keychain
# zstyle :omz:plugins:keychain options --quiet --inherit any-once --noask --nocolor --absolute --dir ~/.cache/keychain
# zstyle :omz:plugins:keychain agents gpg,ssh
# zinit snippet OMZP::keychain
# fi
#}}}
# Вариант только для ssh-agent
# Keychain: вариант только для ssh-agent #{{{
# if command -v keychain >/dev/null 2>&1; then
# zstyle :omz:plugins:keychain identities id_rsa
# zstyle :omz:plugins:keychain options --quiet --inherit any-once --noask --nocolor
# zstyle :omz:plugins:keychain agents ssh
# zinit snippet OMZP::keychain
# fi
#}}}

View File

@ -51,6 +51,12 @@ if [[ -z ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE+set} ]]; then
zinit wait'1' lucid light-mode depth'1' for \
atload"bindkey '^K' history-search-multi-word" \
zdharma-continuum/history-search-multi-word
else
function magic-ctrl-k {
if ! (( $#BUFFER )) && [[ "$CONTEXT" == start ]]; then znt-history-widget; fi
}
zle -N magic-ctrl-k
bindkey '^K' magic-ctrl-k
#elif [ ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE} = "1" ]; then
# zinit wait'2' lucid light-mode depth'1' for \
# atload"bindkey '^K' history-search-multi-word" \

View File

@ -1,20 +1,33 @@
# shellcheck shell=bash
# vim: ft=sh
# [Esc] [Esc] вместо Ctrl+G
# [Esc] [Esc]
bindkey '\e\e' send-break
# Navi
if command -v navi > /dev/null 2>&1; then
zinit snippet https://github.com/denisidoro/navi/blob/master/shell/navi.plugin.zsh
bindkey '^G' _navi_widget
function magic-ctrl-g {
if ! (( $#BUFFER )) && [[ "$CONTEXT" == start ]]; then _navi_widget; fi
}
zle -N magic-ctrl-g
bindkey '^G' magic-ctrl-g
fi
# FZF #{{{
bindkey "^F" fzf-file-widget # Ctrl+F file search
function magic-ctrl-f {
if ! (( $#BUFFER )) && [[ "$CONTEXT" == start ]]; then fzf-file-widget; fi
}
zle -N magic-ctrl-f
bindkey '^F' magic-ctrl-f
bindkey "^[[A" fzf-history-widget # Up
bindkey "^[[B" fzf-history-widget # Down
bindkey "${terminfo[kcuu1]}" fzf-history-widget # Up
bindkey "${terminfo[kcud1]}" fzf-history-widget # Down
#}}}
function magic-ctrl-z {
if ! (( $#BUFFER )) && [[ "$CONTEXT" == start ]]; then znt-kill-widget; fi
}
zle -N magic-ctrl-z
bindkey '^Z' magic-ctrl-z