about summary refs log tree commit diff
path: root/machines/mmrnmhrm.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2013-01-28 22:34:41 +0100
committeraszlig <aszlig@redmoonstudios.org>2013-02-07 06:43:51 +0100
commit62c141c00631f31eec30448b14658dea513899c5 (patch)
treecea042891e8d36f669f800e72d8b73290faff01b /machines/mmrnmhrm.nix
parent4fef01ea063354f095f5583c5d1fcedc967d9e87 (diff)
Factor out kconf generator into lib/default.nix.
This should get rid of the duplication already marked with XXX and of course
should make the machine-specific configuration way easier to read.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines/mmrnmhrm.nix')
-rw-r--r--machines/mmrnmhrm.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix
index ad875fd3..259d7c98 100644
--- a/machines/mmrnmhrm.nix
+++ b/machines/mmrnmhrm.nix
@@ -1,6 +1,7 @@
 {config, pkgs, ...}:
 
 with pkgs.lib;
+with import ../lib;
 
 {
   require = singleton ../common.nix;
@@ -10,18 +11,7 @@ with pkgs.lib;
       version = pkgs.kernelSourceAszlig.version;
       src = pkgs.kernelSourceAszlig.src;
 
-      configfile = let
-        isNumber = c: elem c ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"];
-        mkValue = val:
-          if val == "" then "\"\""
-          else if val == "y" || val == "m" || val == "n" then val
-          else if all isNumber (stringToCharacters val) then val
-          else if substring 0 2 val == "0x" then val
-          else "\"${val}\"";
-        mkConfigLine = key: val: "${key}=${mkValue val}";
-        mkConf = cfg: concatStringsSep "\n" (mapAttrsToList mkConfigLine cfg);
-      in pkgs.writeText "aszlig.kconf" (mkConf (import ./mmrnmhrm-kconf.nix));
-
+      configfile = generateKConf (import ./mmrnmhrm-kconf.nix);
       allowImportFromDerivation = true;
     };
   in rec {