mirror of
https://github.com/NaomiAmethyst/dots.git
synced 2025-08-05 16:48:38 +00:00
cleaned up export statements, should be a bit easier to deal with now
This commit is contained in:
parent
1e7d1ae9e5
commit
a1711bf65f
2 changed files with 18 additions and 16 deletions
|
@ -1,5 +1,3 @@
|
||||||
for wrap in cle rlfe rlwrap ; do
|
for wrap in cle rlfe rlwrap ; do
|
||||||
if (which $wrap &> /dev/null) ; then
|
(which $wrap &> /dev/null) && alias ocaml="$wrap ocaml"
|
||||||
alias ocaml="$wrap ocaml"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
30
zshrc
30
zshrc
|
@ -61,11 +61,11 @@ unsetopt HIST_BEEP
|
||||||
unsetopt EXTENDED_HISTORY
|
unsetopt EXTENDED_HISTORY
|
||||||
|
|
||||||
# colors
|
# colors
|
||||||
if ( which dircolors &> /dev/null ) ; then
|
for dircolors in gdircolors dircolors ; do
|
||||||
eval $(dircolors -b $([ -f /etc/DIR_COLORS ] && echo "/etc/DIR_COLORS"))
|
if (which $dircolors &> /dev/null) ; then
|
||||||
elif ( which gdircolors &> /dev/null ) ; then
|
eval $($dircolors -b $([ -f /etc/DIR_COLORS ] && echo "/etc/DIR_COLORS")) && break
|
||||||
eval $(gdircolors -b $([ -f /etc/DIR_COLORS ] && echo "/etc/DIR_COLORS"))
|
fi
|
||||||
fi
|
done
|
||||||
|
|
||||||
# terminal fallback stuff
|
# terminal fallback stuff
|
||||||
function fix_term
|
function fix_term
|
||||||
|
@ -107,9 +107,15 @@ function fix_terminfo_db
|
||||||
( which lesspipe &> /dev/null ) && eval $(lesspipe)
|
( which lesspipe &> /dev/null ) && eval $(lesspipe)
|
||||||
export LESS='-iR'
|
export LESS='-iR'
|
||||||
|
|
||||||
( which less &> /dev/null ) && export PAGER='less'
|
export PAGER
|
||||||
|
for PAGER in less more pg ; do
|
||||||
|
(which $PAGER &> /dev/null) && break
|
||||||
|
done
|
||||||
|
|
||||||
( which vim &> /dev/null ) && export EDITOR='vim'
|
export EDITOR
|
||||||
|
for EDITOR in vim elvis vile nvi vi ; do
|
||||||
|
(which $EDITOR &> /dev/null) && break
|
||||||
|
done
|
||||||
|
|
||||||
# aliases
|
# aliases
|
||||||
alias cd..='cd ..'
|
alias cd..='cd ..'
|
||||||
|
@ -141,11 +147,9 @@ case `uname -s` in
|
||||||
alias grep='ggrep -d skip --color=auto'
|
alias grep='ggrep -d skip --color=auto'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (which slocate &> /dev/null) ; then
|
for locate in glocate slocate ; do
|
||||||
alias locate='slocate'
|
(which $locate &> /dev/null) && alias locate=$locate
|
||||||
elif (which glocate &> /dev/null) ; then
|
done
|
||||||
alias locate='glocate'
|
|
||||||
fi
|
|
||||||
|
|
||||||
fix_terminfo_db "/opt/csw"
|
fix_terminfo_db "/opt/csw"
|
||||||
;;
|
;;
|
||||||
|
@ -154,7 +158,7 @@ esac
|
||||||
|
|
||||||
export TERM=$(fix_term $TERM)
|
export TERM=$(fix_term $TERM)
|
||||||
|
|
||||||
if [[ $TERM == *256* ]] && (infocmp screen-256color-bce &> /dev/null) ; then
|
if [[ $TERM == *256* ]] && (infocmp screen-256color-bce &> /dev/null) ; then
|
||||||
export SCREEN_COLOR="-256color"
|
export SCREEN_COLOR="-256color"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue