aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

zsh: reduce config if TERM == dumb

Browse source 
Fixes TRAMP hangs when connecting to some machines
This commit is contained in:
Henrik Lissner 2019-12-10 14:51:47 -05:00
parent e74fb44280
commit 60e3a4abaa
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
config/zsh/.zshrc
View file

@ -16,17 +16,18 @@ if ! zgen saved; then
zgen save
fi
source $ZDOTDIR/prompt.zsh
source $ZDOTDIR/config.zsh
source $ZDOTDIR/keybinds.zsh
source $ZDOTDIR/completion.zsh
source $ZDOTDIR/aliases.zsh
for file in $XDG_CONFIG_HOME/zsh/rc.d/aliases.*.zsh(N); do
if [[ $TERM != dumb ]]; then
source $ZDOTDIR/prompt.zsh
source $ZDOTDIR/keybinds.zsh
source $ZDOTDIR/completion.zsh
source $ZDOTDIR/aliases.zsh
for file in $XDG_CONFIG_HOME/zsh/rc.d/aliases.*.zsh(N); do
source $file
done
done
##
function _cache {
##
function _cache {
command -v "$1" >/dev/null || return 1
local cache_dir="$XDG_CACHE_HOME/${SHELL##*/}"
local cache="$cache_dir/$1"
@ -36,24 +37,25 @@ function _cache {
"$@" >$cache
fi
source $cache || rm -f $cache
}
}
# fd > find
if command -v fd >/dev/null; then
# fd > find
if command -v fd >/dev/null; then
export FZF_DEFAULT_OPTS="--reverse --ansi"
export FZF_DEFAULT_COMMAND="fd ."
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
export FZF_ALT_C_COMMAND="fd -t d . $HOME"
fi
_cache fasd --init posix-alias zsh-{hook,{c,w}comp{,-install}}
_cache direnv hook zsh
##
autoload -Uz compinit && compinit -u -d $ZSH_CACHE/zcompdump
autopair-init
# If you have host-local configuration, this is where you'd put it
[ -f ~/.config/zsh/rc ] && source ~/.config/zsh/rc
fi
_cache fasd --init posix-alias zsh-{hook,{c,w}comp{,-install}}
_cache direnv hook zsh
##
autoload -Uz compinit && compinit -u -d $ZSH_CACHE/zcompdump
autopair-init
# If you have host-local configuration, this is where you'd put it
[ -f ~/.config/zsh/rc ] && source ~/.config/zsh/rc

9
config/zsh/config.zsh
View file

@ -1,6 +1,11 @@
# Stop term/shell echoing back my input
if [[ -n $INSIDE_EMACS ]]; then
# Stop TRAMP (in Emacs) from hanging or term/shell from echoing back commands
if [[ $TERM == dumb || -n $INSIDE_EMACS ]]; then
unsetopt zle
unsetopt prompt_cr
unsetopt prompt_subst
whence -w precmd >/dev/null && unfunction precmd
whence -w preexec >/dev/null && unfunction preexec
PS1='$ '
fi
## General