diff --git a/modules/home/default.nix b/modules/home/default.nix
index 8ba3a8d..4dcfc35 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -23,6 +23,7 @@
     ./gtk
     ./htop
     ./jq
+    ./keyboard
     ./mail
     ./mpv
     ./nix
diff --git a/modules/home/x/keyboard/default.nix b/modules/home/keyboard/default.nix
similarity index 50%
rename from modules/home/x/keyboard/default.nix
rename to modules/home/keyboard/default.nix
index 40af800..2216a08 100644
--- a/modules/home/x/keyboard/default.nix
+++ b/modules/home/keyboard/default.nix
@@ -1,8 +1,12 @@
 { config, lib, ... }:
 let
-  cfg = config.my.home.x;
+  cfg = config.my.home.keyboard;
 in
 {
+  options.my.home.keyboard = with lib; {
+    enable = my.mkDisableOption "keyboard configuration";
+  };
+
   config = lib.mkIf cfg.enable {
     home.keyboard = {
       layout = "fr";
diff --git a/modules/home/x/default.nix b/modules/home/x/default.nix
index 0312bc4..c320e52 100644
--- a/modules/home/x/default.nix
+++ b/modules/home/x/default.nix
@@ -3,10 +3,6 @@ let
   cfg = config.my.home.x;
 in
 {
-  imports = [
-    ./keyboard
-  ];
-
   options.my.home.x = with lib; {
     enable = mkEnableOption "X server configuration";
   };