From c7927ea61730bd6d8a283078d89dffdca08535cd Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Thu, 12 Nov 2009 22:02:20 +0100
Subject: Merge stuff into .zshrc

---
 etc/aliases/x | 49 -------------------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 etc/aliases/x

(limited to 'etc/aliases/x')

diff --git a/etc/aliases/x b/etc/aliases/x
deleted file mode 100644
index 1a41cc3..0000000
--- a/etc/aliases/x
+++ /dev/null
@@ -1,49 +0,0 @@
-## vim:ft=zsh
-
-# feh etc if X is running, x for startx otherwise
-if pgrep -x Xorg &> /dev/null; then
-
-	# quiet and verbose can actually be used together here.
-	# quiet = suppress non-critical errors, verbose = show progress bars
-	alias feh='feh --quiet --verbose'
-
-	# Alias structure:
-	# feh[theme][recursive?][slide-delay?]
-	# theme = [f]ullscreen | [i]ndex | [j]ust | [t]humbnail
-	# recursive: r for recursive, nothing otherwise
-	# slide-delay:
-	#     none   - no slideshow
-	#     number - slideshow, $number seconds per image
-	#     x      - slideshow, seconds will be specified on commandline
-	#              (like "fehfrx 7 .")
-	# the themes are defined in .fehrc
-	alias fehf='feh -Tfull' # Fullscreen
-	alias fehfr='feh -Tfull --recursive'
-	alias fehi='feh .fehindex.jpg'
-	alias fehj='feh -Tjust' # Screensaver-like
-	alias fehjr='feh -Tjust --recursive'
-	for i in {5,10,15,20}; {
-		alias fehj$i="feh -Tjust --slideshow-delay $i"
-		alias fehf$i="feh -Tfull --slideshow-delay $i"
-		alias fehjr$i="feh -Tjust --slideshow-delay $i --recursive"
-		alias fehfr$i="feh -Tfull --slideshow-delay $i --recursive"
-	}
-	alias fehjx='feh -Tjust --slideshow-delay'
-	alias fehfx='feh -Tfull --slideshow-delay'
-	alias fehjrx='feh -Tjust --recursive --slideshow-delay'
-	alias fehfrx='feh -Tfull --recursive --slideshow-delay'
-	alias feht='feh -Tthumbnail' # List thumbnails
-	alias fehtr='feh -Tthumbnail --recursive'
-
-	# Automatically upload screenshot plzkthx
-	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'
-else
-	# start x and log out immediately
-	alias x='unsetopt bg_nice; startx &! exit'
-fi
-- 
cgit v1.2.3