summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-01-06 16:05:31 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2010-01-06 16:05:31 +0100
commitf5023dc758fee503e8c4db00bded24d8f8773f71 (patch)
tree1d5b14e82d684e9c7cb75082939b859727cb22b5 /etc
parentf95ebfc5d2b0c93ee1d84ea741c0764cf87478bb (diff)
zshrc: Cleanup / minor updates
Diffstat (limited to 'etc')
-rw-r--r--etc/rc23
1 files changed, 5 insertions, 18 deletions
diff --git a/etc/rc b/etc/rc
index 2c6412f..65ff487 100644
--- a/etc/rc
+++ b/etc/rc
@@ -13,9 +13,6 @@ alias 'linux:'='[[ $system == linux ]] &&'
if [[ $system == linux ]] {
[[ -f /etc/debian_version ]] && distro=debian
- [[ -f /etc/gentoo-release ]] && distro=gentoo
- [[ -f /etc/arch-release ]] && distro=arch
- [[ -f /etc/redhat-release ]] && distro=redhat
}
# }}}
@@ -63,7 +60,6 @@ unsetopt beep
if [[ -d ~/var/cache/zsh ]] {
ZCACHEDIR=~/var/cache/zsh
} else {
- zrc_info "~/var/cache/zsh does not exist, using ~/.zsh-cache instead"
mkdir -p ~/.zsh-cache
ZCACHEDIR=~/.zsh-cache
}
@@ -144,13 +140,14 @@ export LS_COLORS
# {{{ Functions
autoload -U compinit
-autoload zargs
+autoload zargs zmv
# own functions
if [[ -e $ZDIR/functions ]] {
autoload $ZDIR/functions/*(:t)
} else {
- zrc_info "No functions dir found, assuming standalone mode"
+ # No cool extra stuff
+ zrc_info "Running in standalone mode"
# rtab is tracked in functions/, so it may not be present everywhere.
# However, the prompt assumes the presence of a 'rtab' function.
function rtab {
@@ -179,7 +176,7 @@ function dirinfo {
# if we're running in screen, we're the only one writing into the prompt
# -> no trailing whitespace
- if [[ $TERM == screen ]] {
+ if [[ $TERM == screen* ]] {
echo ${string% }
} else {
echo $string
@@ -257,7 +254,7 @@ rps=(
PS1="${ps[host]} ${ps[dir]} ${ps[sign]} ${ps[screen]}"
-if [[ $TERM == screen ]] {
+if [[ $TERM == screen* ]] {
RPS1="${rps[start_screen]}${rps[dirinfo]}${rps[end_screen]}"
} else {
RPS1="${rps[start_always]}${rps[dirinfo]}${rps[time]}${rps[end_always]}"
@@ -342,16 +339,11 @@ linux: alias ls='ls -h --color=auto' ||
alias exec='exec '
alias sudo='sudo '
-alias mx='mx -aZ'
-
# Only TCP/TCP6, not sockets and such
linux: salias netstat='netstat --program --all --tcp --extend' ||
salias netstat='netstat -atp tcp'
-# less frequent updates when running ncdu via ssh
-[[ -n $SSH_CONNECTION && -n $commands[ncdu] ]] && alias ncdu='ncdu -q'
-
alias bc='bc -l'
alias fbi='fbi -readahead'
@@ -371,8 +363,6 @@ alias man='man -a'
# ps -C foo is better than ps aux | fgrep foo ;-)
alias ps='ps -F'
-alias tilp='kdesudo "tilp --calc=ti84+ --cable=DirectLink"'
-
# Don't collapse trees
alias todo='noglob todo -f +children'
# }}}
@@ -501,9 +491,6 @@ if [[ -e /tmp/.x-started ]] { #{{{
alias putscreen='put $(screenshot)'
- # Useful when a beamer is connected to my laptop
- alias rplayer='mplayer -vo x11 -zoom -vf scale=1024:-2'
-
# show current weather
alias weather='feh http://www.bredeney-wetter.de/aktuell.gif'
} #}}}