projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/github/pr/130'
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
4ddd4f9
..
8ff4dde
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-481,6
+481,7
@@
setopt unset
# setting some default values
NOCOR=${NOCOR:-0}
# setting some default values
NOCOR=${NOCOR:-0}
+NOETCHOSTS=${NOETCHOSTS:-0}
NOMENU=${NOMENU:-0}
NOPRECMD=${NOPRECMD:-0}
COMMAND_NOT_FOUND=${COMMAND_NOT_FOUND:-0}
NOMENU=${NOMENU:-0}
NOPRECMD=${NOPRECMD:-0}
COMMAND_NOT_FOUND=${COMMAND_NOT_FOUND:-0}
@@
-893,7
+894,7
@@
function grmlcomp () {
if is42 ; then
[[ -r ~/.ssh/config ]] && _ssh_config_hosts=(${${(s: :)${(ps:\t:)${${(@M)${(f)"$(<$HOME/.ssh/config)"}:#Host *}#Host }}}:#*[*?]*}) || _ssh_config_hosts=()
[[ -r ~/.ssh/known_hosts ]] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
if is42 ; then
[[ -r ~/.ssh/config ]] && _ssh_config_hosts=(${${(s: :)${(ps:\t:)${${(@M)${(f)"$(<$HOME/.ssh/config)"}:#Host *}#Host }}}:#*[*?]*}) || _ssh_config_hosts=()
[[ -r ~/.ssh/known_hosts ]] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
- [[ -r /etc/hosts ]] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
+ [[ -r /etc/hosts ]] &&
[[ "$NOETCHOSTS" -eq 0 ]] &&
: ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
else
_ssh_config_hosts=()
_ssh_hosts=()
else
_ssh_config_hosts=()
_ssh_hosts=()
@@
-901,14
+902,7
@@
function grmlcomp () {
fi
local localname
fi
local localname
- if check_com hostname ; then
- localname=$(hostname)
- elif check_com hostnamectl ; then
- localname=$(hostnamectl --static)
- else
- localname="$(uname -n)"
- fi
-
+ localname="$(uname -n)"
hosts=(
"${localname}"
"$_ssh_config_hosts[@]"
hosts=(
"${localname}"
"$_ssh_config_hosts[@]"
@@
-2579,7
+2573,7
@@
function grml_reset_screen_title () {
# see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
[[ ${NOTITLE:-} -gt 0 ]] && return 0
case $TERM in
# see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
[[ ${NOTITLE:-} -gt 0 ]] && return 0
case $TERM in
- (xterm*|rxvt*|alacritty)
+ (xterm*|rxvt*|alacritty
|foot
)
set_title ${(%):-"%n@%m: %~"}
;;
esac
set_title ${(%):-"%n@%m: %~"}
;;
esac
@@
-2616,7
+2610,7
@@
function grml_cmd_to_screen_title () {
function grml_control_xterm_title () {
case $TERM in
function grml_control_xterm_title () {
case $TERM in
- (xterm*|rxvt*|alacritty)
+ (xterm*|rxvt*|alacritty
|foot
)
set_title "${(%):-"%n@%m:"}" "$2"
;;
esac
set_title "${(%):-"%n@%m:"}" "$2"
;;
esac
@@
-2683,6
+2677,11
@@
else
alias l='command ls -l'
fi
alias l='command ls -l'
fi
+# use ip from iproute2 with color support
+if ip --color=auto addr >/dev/null 2>&1; then
+ alias ip='command ip --color=auto'
+fi
+
if [[ -r /proc/mdstat ]]; then
alias mdstat='cat /proc/mdstat'
fi
if [[ -r /proc/mdstat ]]; then
alias mdstat='cat /proc/mdstat'
fi
@@
-3314,7
+3313,14
@@
zrcautoload lookupinit && lookupinit
# variables
# set terminal property (used e.g. by msgid-chooser)
# variables
# set terminal property (used e.g. by msgid-chooser)
-export COLORTERM="yes"
+case "${COLORTERM}" in
+ truecolor)
+ # do not overwrite
+ ;;
+ *)
+ export COLORTERM="yes"
+ ;;
+esac
# aliases
# aliases