INFOPATH fix; the info.nix module should not set the INFOPATH variable in bashrc,

because the bashrc already cares on that, even taking into account all the usual
nixos profiles.

As a side change, I changed a tab to spaces in bashrc.


svn path=/nixos/trunk/; revision=21439

modules/programs/bash/bashrc.sh

@@ -34,7 +34,7 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # KDE/Gnome stuff.
     export KDEDIRS=$i:$KDEDIRS
-	export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
 done

modules/programs/info.nix

@@ -33,9 +33,4 @@ in
 
 {
   environment.systemPackages = [infoWrapper];
-  
-  environment.shellInit =
-    ''
-      export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info  
-    '';
 }