diff --git a/system/fontdir.nix b/system/fontdir.nix
index adb6cd64df0..42a1360cdb3 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -1,54 +1,54 @@
 args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs rec {
-		src = "";/* put a fetchurl here */
+  let localDefs = builderDefs rec {
+    src = "";/* put a fetchurl here */
 
-		buildInputs = [mkfontdir mkfontscale ttmkfdir];
-		configureFlags = [];
-		fontDirs = import ./fonts.nix {inherit pkgs config;};
-		installPhase = FullDepEntry ("
-		list='';
-		for i in ${toString fontDirs} ; do
-			if [ -d \$i/ ]; then
-				list=\"\$list \$i\";
-			fi;
-		done
-		list=\$(find \$list -name fonts.dir);
-		fontDirs='';
-		for i in \$list ; do
-			fontDirs=\"\$fontDirs \$(dirname \$i)\";
-		done;
-		mkdir -p \$out/share/X11-fonts/; 
-		for i in \$(find \$fontDirs -type f -o -type l); do
-			j=\${i##*/}
-			if ! test -e \$out/share/X11-fonts/\${j}; then
-				ln -s \$i \$out/share/X11-fonts/\${j};
-			fi;
-		done;
-		cd \$out/share/X11-fonts/
-		rm fonts.dir
-		rm fonts.scale
-		rm fonts.alias
-		mkfontdir
-		mkfontscale
-		mv fonts.scale fonts.scale.old
-		mv fonts.dir fonts.dir.old
-		ttmkfdir
-		cat fonts.scale.old >> fonts.scale
-		cat fonts.dir.old >> fonts.dir
-		rm fonts.dir.old
-		rm fonts.scale.old
-		cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
-	") ["minInit" "addInputs"];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
+    buildInputs = [mkfontdir mkfontscale ttmkfdir];
+    configureFlags = [];
+    fontDirs = import ./fonts.nix {inherit pkgs config;};
+    installPhase = FullDepEntry ("
+    list='';
+    for i in ${toString fontDirs} ; do
+      if [ -d \$i/ ]; then
+        list=\"\$list \$i\";
+      fi;
+    done
+    list=\$(find \$list -name fonts.dir);
+    fontDirs='';
+    for i in \$list ; do
+      fontDirs=\"\$fontDirs \$(dirname \$i)\";
+    done;
+    mkdir -p \$out/share/X11-fonts/; 
+    for i in \$(find \$fontDirs -type f -o -type l); do
+      j=\${i##*/}
+      if ! test -e \$out/share/X11-fonts/\${j}; then
+        ln -s \$i \$out/share/X11-fonts/\${j};
+      fi;
+    done;
+    cd \$out/share/X11-fonts/
+    rm fonts.dir
+    rm fonts.scale
+    rm fonts.alias
+    mkfontdir
+    mkfontscale
+    mv fonts.scale fonts.scale.old
+    mv fonts.dir fonts.dir.old
+    ttmkfdir
+    cat fonts.scale.old >> fonts.scale
+    cat fonts.dir.old >> fonts.dir
+    rm fonts.dir.old
+    rm fonts.scale.old
+    cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
+  ") ["minInit" "addInputs"];
+  } null; /* null is a terminator for sumArgs */
+  in with localDefs;
 stdenv.mkDerivation rec {
-	name = "X11-fonts";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[installPhase doForceShare doPropagate]);
-	meta = {
-		description = "
-		Directory to contain all X11 fonts requested.
+  name = "X11-fonts";
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs 
+      [installPhase doForceShare doPropagate]);
+  meta = {
+    description = "
+    Directory to contain all X11 fonts requested.
 ";
-	};
+  };
 }
diff --git a/system/options.nix b/system/options.nix
index af8217ff9af..a5e51a68ae6 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -653,10 +653,10 @@
 
       allowEveryone = mkOption {
         default = false;
-	description = ''
-	  Whether to make /var/spool/at{jobs,spool} writeable 
-	  by everyone (and sticky).
-	'';
+        description = ''
+          Whether to make /var/spool/at{jobs,spool} writeable 
+          by everyone (and sticky).
+        '';
       };
     };
 
@@ -1487,7 +1487,7 @@
       
       contextXML = mkOption {
         default = "";
-	description = "Location of the context.xml to use. Leave empty to use the default.";
+        description = "Location of the context.xml to use. Leave empty to use the default.";
       };
     };
 
@@ -1707,23 +1707,23 @@
 
       writeEnable = mkOption {
         default = false;
-	description = "
-	  Whether any write activity is permitted to users.
-	";
+        description = "
+          Whether any write activity is permitted to users.
+        ";
       };
 
       anonymousUploadEnable = mkOption {
         default = false;
-	description = "
-	  Whether any uploads are permitted to anonymous users.
-	";
+        description = "
+          Whether any uploads are permitted to anonymous users.
+        ";
       };
 
       anonymousMkdirEnable = mkOption {
         default = false;
-	description = "
-	  Whether mkdir is permitted to anonymous users.
-	";
+        description = "
+          Whether mkdir is permitted to anonymous users.
+        ";
       };
     };