From 408b8b5725c3e6fff75aef772da248d3e95ff414 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Oct 2013 17:37:45 +0100
Subject: Add lots of missing option types

---
 nixos/modules/config/i18n.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'nixos/modules/config/i18n.nix')

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 5570bb1adf6b..56d541cb9b3b 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -18,16 +18,18 @@ in
 
     i18n = {
       defaultLocale = mkOption {
+        type = types.str;
         default = "en_US.UTF-8";
         example = "nl_NL.UTF-8";
-        description = "
+        description = ''
           The default locale.  It determines the language for program
           messages, the format for dates and times, sort order, and so on.
           It also determines the character set, such as UTF-8.
-        ";
+        '';
       };
 
       supportedLocales = mkOption {
+        type = types.listOf types.str;
         default = ["all"];
         example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"];
         description = ''
@@ -40,22 +42,23 @@ in
       };
 
       consoleFont = mkOption {
+        type = types.str;
         default = "lat9w-16";
         example = "LatArCyrHeb-16";
-        description = "
+        description = ''
           The font used for the virtual consoles.  Leave empty to use
           whatever the <command>setfont</command> program considers the
           default font.
-        ";
+        '';
       };
 
       consoleKeyMap = mkOption {
+        type = types.str;
         default = "us";
         example = "fr";
-        description = "
+        description = ''
           The keyboard mapping table for the virtual consoles.
-        ";
-        type = types.str;
+        '';
       };
 
     };
-- 
cgit 1.4.1