From 36ae7b21412053eb17e79d53127adc33e50aa4f0 Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer@protonmail.com>
Date: Sun, 26 May 2024 00:00:14 +0200
Subject: [PATCH] Stabilize system module

---
 hosts/nixos-test/default.nix       |  2 +-
 modules/system/default.nix         |  2 +-
 modules/system/keymaps/default.nix | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hosts/nixos-test/default.nix b/hosts/nixos-test/default.nix
index 84ed6f2..66cd68b 100644
--- a/hosts/nixos-test/default.nix
+++ b/hosts/nixos-test/default.nix
@@ -50,7 +50,7 @@
     system = {
       bluetooth.enable = true;
       gamingKernel.enable = true;
-      # keymaps.layout = "fr";
+      keymaps.layout = "us";
       nvidia.enable = true;
       pipewire.enable = true;
       plymouth.enable = true;
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 9a96ef3..6a98756 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ./bluetooth
     ./gamingKernel
-    # ./keymaps
+    ./keymaps
     ./nvidia
     ./pipewire
     ./plymouth
diff --git a/modules/system/keymaps/default.nix b/modules/system/keymaps/default.nix
index 03be9c4..50fa838 100644
--- a/modules/system/keymaps/default.nix
+++ b/modules/system/keymaps/default.nix
@@ -12,8 +12,12 @@ in
       description = ''
         Set key layout (fr, us)
       '';
-      type = types.string;
+      type = types.str;
     };
   };
-  config = (import ./${cfg.layout}.nix {});
-}
\ No newline at end of file
+  config = mkMerge [
+    (mkIf (cfg.layout == "fr") (import ./fr.nix {}))
+    (mkIf (cfg.layout == "us") (import ./us.nix {}))
+  ];
+}
+