Added some more structure and comments to the alias definitions

4 files changed, 26 insertions, 12 deletions

diff --git a/etc/aliases/debian b/etc/aliases/debian
index 4e43639..1ca5e2d 100644
--- a/etc/aliases/debian
+++ b/etc/aliases/debian
@@ -7,6 +7,7 @@ alias afse='apt-file search'
 alias apse='aptitude search'
 
 # Show package information
+alias acp='apt-cache policy'
 alias acsh='apt-cache show'
 alias afsh='apt-file show'
 alias apsh='aptitude show'
@@ -43,5 +44,3 @@ alias agsrc='apt-get source'
 
 # Configure packages
 salias dprc='dpkg-reconfigure'
-
-alias acp='apt-cache policy'
diff --git a/etc/aliases/default b/etc/aliases/default
index f5e82e9..476fb46 100644
--- a/etc/aliases/default
+++ b/etc/aliases/default
@@ -29,6 +29,7 @@ linux: alias ls='ls -Fh --color=auto' ||
 # I often use it for just *viewing* things, which works fine without root
 alias ifconfig='/sbin/ifconfig'
 
+# With these settings, mx and host do basically the same, but whatever
 alias host='host -a'
 alias mx='mx -aZ'
 
@@ -41,18 +42,18 @@ linux: salias netstat='netstat --program --all --tcp --extend' ||
 [[ -n $SSH_CONNECTION ]] && check_com -c ncdu && alias ncdu='ncdu -q'
 
 alias cal='cal -m'
-alias cp='cp -i'
 alias fbi='fbi -readahead'
-alias feh='feh --quiet --verbose'
+
+# I keep accidently overwriting files
+alias cp='cp -i'
+alias mv='mv -i'
 
 # find does globbing itself
 alias find='noglob find'
 
-# Show manuals in all sections
+# Show all available manuals (all sections)
 alias man='man -a'
 
-alias mv='mv -i'
-
 # BSD style
 alias ps='ps aux'
 
diff --git a/etc/aliases/suffix b/etc/aliases/suffix
index 0d8eaa0..d86d8a4 100644
--- a/etc/aliases/suffix
+++ b/etc/aliases/suffix
@@ -30,11 +30,11 @@ emul_app='wine'
 web_app='x-www-browser'
 
 # part 2: create the aliases
-for meta in $filetypes; do
-	for format in $(eval echo -n "$"${meta}_formats); do 
+for meta in $filetypes; {
+	for format in $(eval echo -n "$"${meta}_formats); {
 		eval alias -s $format="$"${meta}_app
-	done
+	}
 	unset ${meta}_{formats,app}
-done
+}
 
 unset filetypes meta format
diff --git a/etc/aliases/x b/etc/aliases/x
index 7fa5c96..7242c61 100644
--- a/etc/aliases/x
+++ b/etc/aliases/x
@@ -2,7 +2,21 @@
 
 # feh etc if X is running, x for startx otherwise
 if pidof X &> /dev/null; then
-	## feh
+
+	# 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'