diff options
| author | Stefan Ritter <xeno@thehappy.de> | 2010-08-04 04:07:09 +0200 |
|---|---|---|
| committer | Stefan Ritter <xeno@thehappy.de> | 2010-08-04 04:07:09 +0200 |
| commit | 63aea52348ac915bf8f855f7dd21a19b53c493b7 (patch) | |
| tree | 780cf332abf79a686d8933b703863020c4046f84 | |
| parent | 551216d6dee123a65f9f5735075095ed6a06b57c (diff) | |
| parent | d413da93da29e22be75d328acf7d8bd3da019285 (diff) | |
Merge branch 'master' of git@fucktheforce.de:xeno
| -rw-r--r-- | vim/vimrc | 2 | ||||
| -rw-r--r-- | xorg/xdefaults | 5 | ||||
| -rw-r--r-- | zsh/zshrc | 58 |
3 files changed, 57 insertions, 8 deletions
@@ -1,5 +1,5 @@ syntax on -colorscheme desert256 +colorscheme slate filetype plugin indent on set t_Co=88 " 88 colors diff --git a/xorg/xdefaults b/xorg/xdefaults index 660bd13..a54ee42 100644 --- a/xorg/xdefaults +++ b/xorg/xdefaults @@ -1,5 +1,6 @@ # Font -*font: -xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-* +#*font: -xos4-terminus-*-r-*-*-12-*-*-*-*-*-*-* +*font: xft:DejaVu Sans Mono:size=8 # General Settings URxvt*buffered: true @@ -54,7 +55,7 @@ URxvt*foreground: #ffffff #URxvt*color9: #D76666 #URxvt*color10: #B5DF8D #URxvt*color11: #FF0000 -#URxvt*color12: #729FCF +URxvt*color12: #729FCF #URxvt*color13: #FFD28F #URxvt*color14: #69C8B1 #URxvt*color15: #9AC4DD @@ -1,3 +1,5 @@ +#w +#w #PUSER=%{$(echo -n '\e[0;37m')%}%n #PATKI=%{$(echo -n '\e[0;37m')%}@ #PHOST=%{$(echo -n '\e[1;33m')%}%m @@ -34,10 +36,7 @@ autoload zmv alias c="clear && fortune" -if [ "$HOST" = "galahad" ] || [ "$HOST" = "goliath" ] || [ "$HOST" = "papin" ]; then - alias ls="ls --color=auto" -fi - +alias ls="ls --color=auto" alias l="ls -lah" alias mkdir="mkdir -p" alias rmrf="rm -rf" @@ -66,7 +65,7 @@ alias purge="sudo apt-get --purge autoremove" alias svn-uscan='uscan --verbose --force-download --rename --repack --destdir=../tarballs' alias svn-bp='svn-buildpackage --svn-builder=pdebuild --svn-ignore-new' alias gendebpool='dpkg-scanpackages -m . /dev/null | gzip -9c > Packages.gz' -alias git-bp='git-buildpackage --git-ignore-new --git-pristine-tar --git-upstream-branch=upstream --git-debian-branch=master --git-builder=pdebuild --debbuildopts "-i"' +alias git-bp='git-buildpackage --git-ignore-new --git-upstream-branch=upstream --git-debian-branch=master --git-builder=pdebuild --debbuildopts "-i"' alias sfnv='uscan --verbose --no-symlink --rename' alias -g C='| wc -l' @@ -117,3 +116,52 @@ cp_p() } END { print "" }' total_size=$(stat -c '%s' "${1}") count=0 } + +fip() { + SUBNET="" + if [[ $1 =~ ^[a-z][0-9][0-9][0-9]$ ]]; then + if [ "$(echo $1 | cut -c 1)" = "a" ]; then + SUBNET='amber' + elif [ "$(echo $1 | cut -c 1)" = "b" ]; then + SUBNET='blue' + elif [ "$(echo $1 | cut -c 1)" = "c" ]; then + SUBNET='cyan' + elif [ "$(echo $1 | cut -c 1)" = "g" ]; then + SUBNET='green' + elif [ "$(echo $1 | cut -c 1)" = "i" ]; then + SUBNET='indigo' + elif [ "$(echo $1 | cut -c 1)" = "j" ]; then + SUBNET='jade' + elif [ "$(echo $1 | cut -c 1)" = "k" ]; then + SUBNET='khaki' + elif [ "$(echo $1 | cut -c 1)" = "l" ]; then + SUBNET='lemmon' + elif [ "$(echo $1 | cut -c 1)" = "m" ]; then + SUBNET='magenta' + elif [ "$(echo $1 | cut -c 1)" = "o" ]; then + SUBNET='orange' + elif [ "$(echo $1 | cut -c 1)" = "p" ]; then + SUBNET='purple' + elif [ "$(echo $1 | cut -c 1)" = "r" ]; then + SUBNET='red' + elif [ "$(echo $1 | cut -c 1)" = "s" ]; then + SUBNET='silver' + elif [ "$(echo $1 | cut -c 1)" = "u" ]; then + SUBNET='umbra' + elif [ "$(echo $1 | cut -c 1)" = "w" ]; then + SUBNET='white' + elif [ "$(echo $1 | cut -c 1)" = "y" ]; then + SUBNET='yellow' + else + echo "Error: Unknown subnet" + fi + + if [ $SUBNET ]; then + ping $1.$SUBNET.fastwebserver.de | grep from + fi + else + echo "Syntax error: need char + 3 integer!" + fi +} + +cd ~/ |