From 2ddda472c45d11c991d53e7400fffdaf40217978 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Apr 2011 13:45:16 +0000
Subject: [PATCH] Put vim on the live cd in place of nvi

svn path=/nixos/trunk/; revision=26679
---
 doc/manual/installation.xml | 2 +-
 modules/profiles/base.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index cf57bcfaf01..9b87b40ccaa 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -152,7 +152,7 @@ $ nixos-option --install</screen>
     write a description of the configuration that you want to be built and
     activated.  The configuration is specified in a Nix expression and must
     be stored <emphasis>on the target file system</emphasis>.  The text
-    editors <command>nano</command> and <command>vi</command> are
+    editors <command>nano</command> and <command>vim</command> are
     available.</para>
 
     <para>You need to specify a root file system in
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index e8c583f7693..4cf39867ec6 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -85,7 +85,7 @@
     pkgs.dar # disk archiver
 
     # Some editors.
-    pkgs.nvi
+    pkgs.vim
     pkgs.bvi # binary editor
     pkgs.joe
   ];